Changeset 2029

Timestamp:

Jun 6, 2007, 12:01:15 AM (17 years ago)

Author:

rub

Message:

Resolved issue 0000697: with generic user a author name is necessary to comment picture.

+ Change way to determinate if user is a guest (use functions like is_admin)

Location:

trunk

Files:

• feed.php (modified) (1 diff)
• identification.php (modified) (1 diff)
• include/common.inc.php (modified) (2 diffs)
• include/config_default.inc.php (modified) (2 diffs)
• include/functions.inc.php (modified) (1 diff)
• include/functions_comment.inc.php (modified) (2 diffs)
• include/functions_html.inc.php (modified) (1 diff)
• include/functions_user.inc.php (modified) (5 diffs)
• include/menubar.inc.php (modified) (2 diffs)
• include/page_tail.php (modified) (2 diffs)
• include/picture_comment.inc.php (modified) (5 diffs)
• include/ws_functions.inc.php (modified) (3 diffs)
• notification.php (modified) (2 diffs)
• picture.php (modified) (1 diff)
• profile.php (modified) (2 diffs)
• ws.php (modified) (1 diff)

trunk/feed.php

@@ -92 +92 @@
 {
   $image_only = true;
-  if (!$user['is_the_guest'])
+  if (!is_a_guest())
   {// auto session was created - so switch to guest
     $user = build_user( $conf['guest_id'], true );

trunk/identification.php

@@ -41 +41 @@
 {
   $redirect_to = urldecode($_GET['redirect']);
-  if ( $user['is_the_guest'] )
+  if ( is_a_guest() )
   {
     array_push($errors, l10n('access_forbiden'));

trunk/include/common.inc.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
@@ -166 +165 @@
 // only now we can set the localized username of the guest user (and not in
 // include/user.inc.php)
-if ($user['is_the_guest'])
+if (is_a_guest())
 {
   $user['username'] = $lang['guest'];

trunk/include/config_default.inc.php

@@ -174 +174 @@
 //    'http://phpwebgallery.net' => array('label' => 'PWG website', 'new_window' => false, 'eval_visible' => 'return true;'),
 //    'http://forum.phpwebgallery.net' => array('label' => 'For ADMIN', 'new_window' => true, 'eval_visible' => 'return is_admin();'),
-//    'http://phpwebgallery.net/doc' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return $user[\'is_the_guest\'];'),
+//    'http://phpwebgallery.net/doc' => array('label' => 'For Guest', 'new_window' => true, 'eval_visible' => 'return is_a_guest();'),
 //    'http://download.gna.org/phpwebgallery/' => 
 //      array('label' => 'PopUp', 'new_window' => true, 
@@ -214 +214 @@
 //  $conf['random_index_redirect'] = array(
 //    PHPWG_ROOT_PATH.'index.php?/best_rated' => 'return true;',
-//    PHPWG_ROOT_PATH.'index.php?/recent_pics' => 'return $user[\'is_the_guest\'];',
+//    PHPWG_ROOT_PATH.'index.php?/recent_pics' => 'return is_a_guest();',
 //    PHPWG_ROOT_PATH.'random.php' => '',
 //    PHPWG_ROOT_PATH.'index.php?/categories' => '',

trunk/include/functions.inc.php

@@ -424 +424 @@
     $do_log = false;
   }
-  if ($user['is_the_guest'] and !$conf['history_guest'])
+  if (is_a_guest() and !$conf['history_guest'])
   {
     $do_log = false;

trunk/include/functions_comment.inc.php

@@ -59 +59 @@
 
   // we do here only BASIC spam check (plugins can do more)
-  if ( !$user['is_the_guest'] )
+  if ( !is_a_guest() )
     return $action;
 
@@ -119 +119 @@
   }
 
-  if ( $user['is_the_guest'] )
+  // display author field if the user status is guest or generic
+  if (!is_classic_user())
   {
     if ( empty($comm['author']) )

trunk/include/functions_html.inc.php

@@ -575 +575 @@
       .urlencode(urlencode($_SERVER['REQUEST_URI']));
 
-  if ( isset($user['is_the_guest']) and !$user['is_the_guest'] )
+  if ( isset($user) and !is_a_guest() )
   {
     echo '<div style="text-align:center;">'.$lang['access_forbiden'].'<br />';

trunk/include/functions_user.inc.php

@@ -147 +147 @@
   $user['id'] = $user_id;
   $user = array_merge( $user, getuserdata($user_id, $use_cache) );
-  $user['is_the_guest'] = ($user['id'] == $conf['guest_id']);
-  $user['is_the_default'] = ($user['id'] == $conf['default_user_id']);
 
   // calculation of the number of picture to display per page
@@ -1016 +1014 @@
       $cookie = array('id' => (int)$user_id, 'key' => $key);
       setcookie($conf['remember_me_name'],
-                serialize($cookie),
-                time()+$conf['remember_me_length'],
-                cookie_path()
-              );
-        }
+            serialize($cookie),
+            time()+$conf['remember_me_length'],
+            cookie_path()
+          );
+    }
   }
   else
@@ -1091 +1089 @@
 
 /*
+ * Return user status used in this library
+ * @return string
+*/
+function get_user_status($user_status)
+{
+  global $user;
+
+  if (empty($user_status))
+  {
+    if (isset($user['status']))
+    {
+      $user_status = $user['status'];
+    }
+    else
+    {
+      // swicth to default value
+      $user_status = '';
+    }
+  }
+  return $user_status;
+}
+
+/*
  * Return access_type definition of uuser
  * Test does with user status
@@ -1097 +1118 @@
 function get_access_type_status($user_status='')
 {
-  global $user, $conf;
-
-  if (empty($user_status))
-  {
-    if (isset($user['status']))
-    {
-      $user_status = $user['status'];
-    }
-    else
-    {
-      // swicth to default value
-      $user_status = '';
-    }
-  }
-
-  switch ($user_status)
+  global $conf;
+
+  switch (get_user_status($user_status))
   {
     case 'guest':
@@ -1174 +1182 @@
 
 /*
- * Return if user is an administrator
+ * Return if user is only a guest
+ * @return bool
+*/
+ function is_a_guest($user_status = '')
+{
+  return get_user_status($user_status) == 'guest';
+}
+
+/*
+ * Return if user is, at least, a classic user
+ * @return bool
+*/
+ function is_classic_user($user_status = '')
+{
+  return is_autorize_status(ACCESS_CLASSIC, $user_status);
+}
+
+/*
+ * Return if user is, at least, an administrator
  * @return bool
 */

trunk/include/menubar.inc.php

@@ -164 +164 @@
 //---------------------------------------------------------- special categories
 // favorites categories
-if ( !$user['is_the_guest'] )
+if ( !is_a_guest() )
 {
   $template->assign_block_vars('username', array());
@@ -243 +243 @@
 //--------------------------------------------------------------------- summary
 
-if ($user['is_the_guest'])
+if (is_a_guest())
 {
   $template->assign_block_vars('login', array());

trunk/include/page_tail.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -39 +38 @@
 //--------------------------------------------------------------------- contact
 
-if (!$user['is_the_guest'])
+if (!is_a_guest())
 {
   $template->assign_block_vars(

trunk/include/picture_comment.inc.php

@@ -44 +44 @@
 if ( $page['show_comments'] and isset( $_POST['content'] ) )
 {
-  if ( $user['is_the_guest'] and !$conf['comments_forall'] )
+  if ( is_a_guest() and !$conf['comments_forall'] )
   {
     die ('Session expired');
@@ -62 +62 @@
   {
     case 'moderate':
-      array_push( $infos, $lang['comment_to_validate'] );
+      array_push( $infos, l10n('comment_to_validate') );
     case 'validate':
-      array_push( $infos, $lang['comment_added']);
+      array_push( $infos, l10n('comment_added'));
       break;
     case 'reject': 
@@ -138 +138 @@
         array(
           'COMMENT_AUTHOR' => empty($row['author'])
-            ? $lang['guest']
+            ? l10n('guest')
             : $row['author'],
 
@@ -169 +169 @@
   }
 
-  if (!$user['is_the_guest']
-      or ($user['is_the_guest'] and $conf['comments_forall']))
+  if (!is_a_guest()
+      or (is_a_guest() and $conf['comments_forall']))
   {
     include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
@@ -184 +184 @@
           'CONTENT' => $content
         ));
-    // display author field if the user is not logged in
-    if ($user['is_the_guest'])
+
+    // display author field if the user status is guest or generic
+    if (!is_classic_user())
     {
       $template->assign_block_vars(

trunk/include/ws_functions.inc.php

@@ -703 +703 @@
   $comment_post_data = null;
   if ($is_commentable and 
-      (!$user['is_the_guest']
-        or ($user['is_the_guest'] and $conf['comments_forall'] )
+      (!is_a_guest()
+        or (is_a_guest() and $conf['comments_forall'] )
       )
       )
@@ -885 +885 @@
 {
   global $user, $conf;
-  if (!$user['is_the_guest'])
+  if (!is_a_guest())
   {
     $_SESSION = array();
@@ -903 +903 @@
   global $user, $lang_info;
   $res = array();
-  $res['username'] = $user['is_the_guest'] ? 'guest' : $user['username'];
+  $res['username'] = is_a_guest() ? 'guest' : $user['username'];
   foreach ( array('status', 'template', 'theme', 'language') as $k )
   {

trunk/notification.php

@@ -5 +5 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
 // | file          : $Id$
 // | last update   : $Date$
@@ -54 +53 @@
 
 $feed_url=PHPWG_ROOT_PATH.'feed.php';
-if ($user['is_the_guest'])
+if (is_a_guest())
 {
   $feed_image_only_url=$feed_url;

trunk/picture.php

@@ -579 +579 @@
 
 // favorite manipulation
-if (!$user['is_the_guest'])
+if (!is_a_guest())
 {
   // verify if the picture is already in the favorite of the user

trunk/profile.php

@@ -207 +207 @@
 function load_profile_in_template($url_action, $url_redirect, $userdata)
 {
-  global $template;
+  global $template, $conf;
 
   $template->set_filename('profile_content', 'profile_content.tpl');
@@ -294 +294 @@
   }
 
-  if (!($userdata['is_the_guest'] or $userdata['is_the_default']))
+  if (!(in_array($userdata['id'], array($conf['guest_id'], $conf['default_user_id']))))
   {
     $template->assign_block_vars('not_special_user', array());

trunk/ws.php

@@ -81 +81 @@
       array(
         'image_id' => array(),
-        'author' => array( 'default' => $user['is_the_guest']? 'guest':$user['username']),
+        'author' => array( 'default' => is_a_guest()? 'guest':$user['username']),
         'content' => array(),
         'key' => array(),