Changeset 1750

Timestamp:

Jan 24, 2007, 6:07:08 AM (17 years ago)

Author:

rvelices

Message:

• plugins with own independent scripts work now (cookie_path and url root are

correct)

• prepare a bit some url functions so that later we can fully embed pwg in

scripts located outside pwg

• remove some unnecessary language strings

Location:

trunk

Files:

• feed.php (modified) (8 diffs)
• include/common.inc.php (modified) (3 diffs)
• include/functions_session.inc.php (modified) (1 diff)
• include/functions_url.inc.php (modified) (3 diffs)
• include/picture_comment.inc.php (modified) (2 diffs)
• language/en_UK.iso-8859-1/common.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/common.lang.php (modified) (1 diff)
• notification.php (modified) (1 diff)
• register.php (modified) (1 diff)
• ws.php (modified) (2 diffs, 1 prop)

trunk/feed.php

@@ -89 +89 @@
 // +-----------------------------------------------------------------------+
 
-// clean $user array (include/user.inc.php has been executed)
-$user = array();
+$feed_id= isset($_GET['feed']) ? $_GET['feed'] : '';
+$image_only=isset($_GET['image_only']);
 
 // echo '<pre>'.generate_key(50).'</pre>';
-if (isset($_GET['feed'])
-    and preg_match('/^[A-Za-z0-9]{50}$/', $_GET['feed']))
+if ( !empty($feed_id) )
 {
   $query = '
-SELECT uf.user_id AS id,
-       ui.status,
-       uf.last_check,
-       u.'.$conf['user_fields']['username'].' AS username
-  FROM '.USER_FEED_TABLE.' AS uf
-    INNER JOIN '.USER_INFOS_TABLE.' AS ui
-      ON ui.user_id = uf.user_id
-    INNER JOIN '.USERS_TABLE.' AS u
-      ON u.'.$conf['user_fields']['id'].' = uf.user_id
-  WHERE uf.id = \''.$_GET['feed'].'\'
+SELECT user_id,
+       last_check
+  FROM '.USER_FEED_TABLE.'
+  WHERE id = \''.$feed_id.'\'
 ;';
-  $user = mysql_fetch_array(pwg_query($query));
-}
-
-if ( empty($user) )
-{
-  page_not_found('Unknown/missing feed identifier');
-}
-
-$user['forbidden_categories'] = calculate_permissions($user['id'],
-                                                      $user['status']);
-if ('' == $user['forbidden_categories'])
-{
-  $user['forbidden_categories'] = '0';
+  $feed_row = mysql_fetch_assoc(pwg_query($query));
+  if ( empty($feed_row) )
+  {
+    page_not_found('Unknown/missing feed identifier');
+  }
+  if ($feed_row['user_id']!=$user['id'])
+  { // new user
+    $user = array();
+    $user = build_user( $feed_row['user_id'], true );
+  }
+}
+else
+{
+  $image_only = true;
+  if (!$user['is_the_guest'])
+  {// auto session was created - so switch to guest
+    $user = array();
+    $user = build_user( $conf['guest_id'], true );
+  }
 }
 
@@ -127 +126 @@
 include_once(PHPWG_ROOT_PATH.'include/feedcreator.class.php');
 
-$base_url = get_host_url().cookie_path();
-if ( strrpos($base_url, '/') !== strlen($base_url)-1 )
-{
-  $base_url .= '/';
-}
-$page['root_path']=$base_url;
+set_make_full_url();
 
 $rss = new UniversalFeedCreator();
@@ -145 +139 @@
 // +-----------------------------------------------------------------------+
 
-if ( !isset($_GET['image_only']) )
-{
-  $news = news($user['last_check'], $dbnow, true, true);
+if (!$image_only)
+{
+  $news = news($feed_row['last_check'], $dbnow, true, true);
 
   if (count($news) > 0)
@@ -174 +168 @@
 UPDATE '.USER_FEED_TABLE.'
   SET last_check = \''.$dbnow.'\'
-  WHERE id = \''.$_GET['feed'].'\'
+  WHERE id = \''.$feed_id.'\'
 ;';
     pwg_query($query);
@@ -180 +174 @@
 }
 else
-{ // update the last check to avoid deletion by maintenance task
-  $query = '
-UPDATE '.USER_FEED_TABLE.'
-  SET last_check = \''.$dbnow.'\'
-  WHERE id = \''.$_GET['feed'].'\'
-;';
-  pwg_query($query);
+{
+  if ( !empty($feed_id) )
+  {// update the last check to avoid deletion by maintenance task
+    $query = '
+  UPDATE '.USER_FEED_TABLE.'
+    SET last_check = \''.$dbnow.'\'
+    WHERE id = \''.$feed_id.'\'
+  ;';
+    pwg_query($query);
+  }
 }
 
@@ -196 +193 @@
   $exploded_date = explode_mysqldt($date);
   $item = new FeedItem();
-  $item->title = l10n_dec('%d element added', '%d elements added', $date_detail['nb_elements']);
+  $item->title = l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements']);
   $item->title .= ' ('.$lang['month'][(int)$exploded_date['month']].' '.$exploded_date['day'].')';
   $item->link = make_index_url(
@@ -212 +209 @@
   $item->description .=
         '<li>'
-        .l10n_dec('%d element added', '%d elements added', $date_detail['nb_elements'])
+        .l10n_dec('%d new element', '%d new elements', $date_detail['nb_elements'])
         .' ('
         .'<a href="'.make_index_url(array('section'=>'recent_pics')).'">'
@@ -239 +236 @@
           .get_cat_display_name_cache($cat['uppercats'])
           .' ('.
-          l10n_dec('%d element added',
-                   '%d elements added', $cat['img_count']).')'
+          l10n_dec('%d new element',
+                   '%d new elements', $cat['img_count']).')'
           .'</li>';
   }

trunk/include/common.inc.php

@@ -180 +180 @@
   if ( script_basename() != 'identification' and !is_admin() )
   {
-    //next line required if PATH_INFO (no ? in url) but won't work for scripts outside PWG
-    $page['root_path'] = cookie_path();
     echo $lang['gallery_locked_message']
-      .'<a href="'.get_root_url().'identification.php">.</a>';
+      .'<a href="'.get_absolute_root_url(false).'identification.php">.</a>';
     exit();
   }
@@ -198 +196 @@
     )
 {
-  //next line required if PATH_INFO (no ? in url) but won't work for scripts outside PWG
-  $page['root_path'] = cookie_path();
-  redirect (get_root_url().'identification.php');
+  redirect (get_absolute_root_url(false).'identification.php');
 }
 
@@ -221 +217 @@
   if (count(array_diff($existing, $applied)) > 0)
   {
-    //next line required if PATH_INFO (no ? in url) but won't work for scripts outside PWG
-    $page['root_path'] = cookie_path();
     $header_msgs[] = 'Some database upgrades are missing, '
-      .'<a href="'.get_root_url().'upgrade_feed.php">upgrade now</a>';
+      .'<a href="'.get_absolute_root_url(false).'upgrade_feed.php">upgrade now</a>';
   }
 }

trunk/include/functions_session.inc.php

@@ -112 +112 @@
   }
   $scr = substr($scr,0,strrpos( $scr,'/'));
+
   // add a trailing '/' if needed
-  return ($scr{strlen($scr)-1} == '/') ? $scr : $scr . '/';
+  $scr .= ($scr{strlen($scr)-1} == '/') ? '' : '/';
+  
+  if ( substr(PHPWG_ROOT_PATH,0,3)=='../')
+  { // this is maybe a plugin inside pwg directory
+    // TODO - what if it is an external script outside PWG ?
+    $scr = $scr.PHPWG_ROOT_PATH;
+    while (1)
+    {
+      $new = preg_replace('#[^/]+/\.\.(/|$)#', '', $scr);
+      if ($new==$scr)
+      {
+        break;
+      }
+      $scr=$new;
+    }
+  }
+  return $scr;
 }
 

trunk/include/functions_url.inc.php

@@ -39 +39 @@
   }
   else
-  {
+  {// TODO - add HERE the possibility to call PWG functions from external scripts
     $root_url = PHPWG_ROOT_PATH;
   }
@@ -53 +53 @@
 
 /**
- * returns the url of the current host (e.g. http://www.toto.com )
- * TODO: if required by someone, treat https case
- */
-function get_host_url()
-{
-  $url = "http://";
-  $url .= $_SERVER['HTTP_HOST'];
-  if ($_SERVER['SERVER_PORT']!=80)
-  {
-    $url .= ':'.$_SERVER['SERVER_PORT'];
-  }
+ * returns the absolute url to the root of PWG
+ * @param boolean with_scheme if false - does not add http://toto.com
+ */
+function get_absolute_root_url($with_scheme=true)
+{
+  // TODO - add HERE the possibility to call PWG functions from external scripts
+  $url = '';
+  if ($with_scheme)
+  {
+    $url .= 'http://'.$_SERVER['HTTP_HOST'];
+    if ($_SERVER['SERVER_PORT']!=80)
+    {
+      $url .= ':'.$_SERVER['SERVER_PORT'];
+    }
+  }
+  $url .= cookie_path();
   return $url;
 }
@@ -420 +425 @@
     }
     $page['save_root_path']['count'] = 1;
-    $page['root_path'] = get_host_url().cookie_path();
+    $page['root_path'] = get_absolute_root_url();
   }
   else

trunk/include/picture_comment.inc.php

@@ -210 +210 @@
       include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
 
-      $del_url = get_host_url().cookie_path()
-        .'comments.php?delete='.$comm['id'];
+      $del_url = get_absolute_root_url().'comments.php?delete='.$comm['id'];
 
       $content =
@@ -222 +221 @@
       {
         $content .=
-          'Validate: '.get_host_url().cookie_path()
+          'Validate: '.get_absolute_root_url()
           .'comments.php?validate='.$comm['id'];
       }

trunk/language/en_UK.iso-8859-1/common.lang.php

@@ -302 +302 @@
 $lang['%d new element'] = '%d new element';
 $lang['%d new elements'] = '%d new elements';
-$lang['%d element added'] = '%d element added';
-$lang['%d elements added'] = '%d elements added';
 $lang['%d new user'] = '%d new user';
 $lang['%d new users'] = '%d new users';
 $lang['%d pictures are also linked to current tags'] = '%d pictures are also linked to current tags';
-$lang['%d pictures'] = '%d pictures';
 $lang['%d waiting element'] = '%d waiting element';
 $lang['%d waiting elements'] = '%d waiting elements';

trunk/language/fr_FR.iso-8859-1/common.lang.php

@@ -302 +302 @@
 $lang['%d new element'] = '%d nouvel élément';
 $lang['%d new elements'] = '%d nouveaux éléments';
-$lang['%d element added'] = '%d élément ajouté';
-$lang['%d elements added'] = '%d éléments ajoutés';
 $lang['%d new user'] = '%d nouvel utilisateur';
 $lang['%d new users'] = '%d nouveaux utilisateurs';
 $lang['%d pictures are also linked to current tags'] = '%d images sont également liées aux tags courants';
-$lang['%d pictures'] = '%d images';
 $lang['%d waiting element'] = '%d élément en attente';
 $lang['%d waiting elements'] = '%d éléments en attente';

trunk/notification.php

@@ -52 +52 @@
 pwg_query($query);
 
-$feed_url=PHPWG_ROOT_PATH.'feed.php?feed='.$page['feed'];
-$feed_image_only_url=$feed_url.'&image_only';
+
+$feed_url=PHPWG_ROOT_PATH.'feed.php';
+if ($user['is_the_guest'])
+{
+  $feed_image_only_url=$feed_url;
+  $feed_url .= '?feed='.$page['feed'];
+}
+else
+{
+  $feed_url .= '?feed='.$page['feed'];
+  $feed_image_only_url=$feed_url.'&image_only';
+}
 
 // +-----------------------------------------------------------------------+

trunk/register.php

@@ -61 +61 @@
       include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
       $username = $_POST['login'];
-      $admin_url = get_host_url().cookie_path()
+      $admin_url = get_absolute_root_url().
         .'admin.php?page=user_list&username='.$username;
 

trunk/ws.php

@@ -5 +5 @@
 // +-----------------------------------------------------------------------+
 // | branch        : BSF (Best So Far)
-// | file          : $URL: svn+ssh://rvelices@svn.gna.org/svn/phpwebgallery/trunk/action.php $
-// | last update   : $Date: 2006-12-21 18:49:12 -0500 (Thu, 21 Dec 2006) $
-// | last modifier : $Author: rvelices $
-// | revision      : $Rev: 1678 $
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Rev$
 // +-----------------------------------------------------------------------+
 // | This program is free software; you can redistribute it and/or modify  |
@@ -178 +178 @@
 }
 
-$page['root_path']=get_host_url().cookie_path();
+set_make_full_url();
 $service->run();