Changeset 13074 for trunk/include/functions_user.inc.php

Timestamp:

Feb 9, 2012, 10:11:34 PM (12 years ago)

Author:

rvelices

Message:

• remove square/thumb from choices on picture
• fix content margin on password register
• purge derivative cache by type of derivative
• session saved infos/messages are not given to the page on html redirections
• shorter/faster code in functions_xxx

File:

• trunk/include/functions_user.inc.php (modified) (18 diffs)

trunk/include/functions_user.inc.php

@@ -74 +74 @@
 {
   global $conf;
-  
+
   if (defined("PHPWG_INSTALLED"))
   {
@@ -106 +106 @@
 
   $SCU_users = array();
-  
+
   $q = pwg_query("
     SELECT ".$conf['user_fields']['username']." AS username
@@ -115 +115 @@
    // $SCU_users is now an associative table where the key is the account as
    // registered in the DB, and the value is this same account, in lower case
-   
+
   $users_found = array_keys($SCU_users, $username_lo);
   // $users_found is now a table of which the values are all the accounts
@@ -131 +131 @@
   if ($login == '')
   {
-    array_push($errors, l10n('Please, enter a login'));
+    $errors[] = l10n('Please, enter a login');
   }
   if (preg_match('/^.* $/', $login))
   {
-    array_push($errors, l10n('login mustn\'t end with a space character'));
+    $errors[] = l10n('login mustn\'t end with a space character');
   }
   if (preg_match('/^ .*$/', $login))
   {
-    array_push($errors, l10n('login mustn\'t start with a space character'));
+    $errors[] = l10n('login mustn\'t start with a space character');
   }
   if (get_userid($login))
   {
-    array_push($errors, l10n('this login is already used'));
+    $errors[] = l10n('this login is already used');
   }
   if ($login != strip_tags($login))
   {
-    array_push($errors, l10n('html tags are not allowed in login'));
+    $errors[] = l10n('html tags are not allowed in login');
   }
   $mail_error = validate_mail_address(null, $mail_address);
   if ('' != $mail_error)
   {
-    array_push($errors, $mail_error);
+    $errors[] = $mail_error;
   }
 
@@ -160 +160 @@
     if ($login_error != '')
     {
-      array_push($errors, $login_error);
+      $errors[] = $login_error;
     }
   }
@@ -206 +206 @@
       while ($row = pwg_db_fetch_assoc($result))
       {
-        array_push
-        (
-          $inserts,
-          array
-          (
+          $inserts[] = array(
             'user_id' => $next_id,
             'group_id' => $row['id']
-          )
-        );
+          );
       }
     }
@@ -401 +396 @@
       if ( empty($forbidden_ids) )
       {
-        array_push( $forbidden_ids, 0 );
+        $forbidden_ids[] = 0;
       }
       $userdata['image_access_type'] = 'NOT IN'; //TODO maybe later
@@ -424 +419 @@
           if ($cat['count_images']==0)
           {
-            array_push($forbidden_ids, $cat['cat_id']);
+            $forbidden_ids[] = $cat['cat_id'];
             unset( $user_cache_cats[$cat['cat_id']] );
           }
@@ -519 +514 @@
   ).'
 ;';
-  $result = pwg_query($query);
-  $authorizeds = array();
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    array_push($authorizeds, $row['image_id']);
-  }
+  $authorizeds = array_from_query($query, 'image_id');
 
   $query = '
@@ -531 +521 @@
   WHERE user_id = '.$user['id'].'
 ;';
-  $result = pwg_query($query);
-  $favorites = array();
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    array_push($favorites, $row['image_id']);
-  }
+  $favorites = array_from_query($query, 'image_id');
 
   $to_deletes = array_diff($favorites, $authorizeds);
-
   if (count($to_deletes) > 0)
   {
@@ -565 +549 @@
 function calculate_permissions($user_id, $user_status)
 {
-  $private_array = array();
-  $authorized_array = array();
-
   $query = '
 SELECT id
@@ -573 +554 @@
   WHERE status = \'private\'
 ;';
-  $result = pwg_query($query);
-  while ($row = pwg_db_fetch_assoc($result))
-  {
-    array_push($private_array, $row['id']);
-  }
+  $private_array = array_from_query($query, 'id');
 
   // retrieve category ids directly authorized to the user
@@ -618 +595 @@
     while ($row = pwg_db_fetch_assoc($result))
     {
-      array_push($forbidden_array, $row['id']);
+      $forbidden_array[] = $row['id'];
     }
     $forbidden_array = array_unique($forbidden_array);
@@ -627 +604 @@
    // where clauses such as "WHERE category_id NOT IN(0)" will always be
    // true.
-    array_push($forbidden_array, 0);
+    $forbidden_array[] = 0;
   }
 
@@ -810 +787 @@
 
   $email = pwg_db_real_escape_string($email);
-  
+
   $query = '
 SELECT
@@ -932 +909 @@
     return $theme;
   }
-  
+
   // let's find the first available theme
   $active_themes = get_pwg_themes();
@@ -1159 +1136 @@
   // we force the session table to be clean
   pwg_session_gc();
-  
+
   global $conf;
   // retrieving the encrypted password of the login submitted
@@ -1352 +1329 @@
 {
   global $user, $conf;
-  
+
   if (is_a_guest())
   {
     return false;
   }
-  
+
   if (!in_array($action, array('delete','edit', 'validate')))
   {