Changeset 27388

Timestamp:

Feb 16, 2014, 8:39:19 AM (10 years ago)

Author:

rvelices

Message:

more query2array and remove unnecessary tests in often called url functions

Location:

trunk

Files:

• comments.php (modified) (7 diffs)
• include/functions_url.inc.php (modified) (10 diffs)
• include/functions_user.inc.php (modified) (8 diffs)

trunk/comments.php

@@ -70 +70 @@
       $is_inserted = true;
     }
-    
+
     $items_number_new[] = $number;
   }
@@ -89 +89 @@
              'clause' => '1=1') // stupid but generic
   );
-  
+
 trigger_action('loc_begin_comments');
 
@@ -266 +266 @@
           $_POST['key']
           );
-        
+
         switch ($comment_action)
         {
@@ -282 +282 @@
         }
       }
-      
+
       $edit_comment = $_GET['edit'];
     }
@@ -438 +438 @@
   WHERE id IN ('.implode(',', $element_ids).')
 ;';
-  $elements = hash_from_query($query, 'id');
+  $elements = query2array($query, 'id');
 
   // retrieving category informations
-  $query = 'SELECT id, name, permalink, uppercats 
+  $query = 'SELECT id, name, permalink, uppercats
   FROM '.CATEGORIES_TABLE.'
   WHERE id IN ('.implode(',', $category_ids).')';
-  $categories = hash_from_query($query, 'id');
+  $categories = query2array($query, 'id');
 
   foreach ($comments as $comment)
@@ -468 +468 @@
         )
       );
-      
+
     $email = null;
     if (!empty($comment['user_email']))
@@ -489 +489 @@
       'CONTENT'=>trigger_event('render_comment_content',$comment['content']),
       );
-      
+
     if (is_admin())
     {

trunk/include/functions_url.inc.php

@@ -133 +133 @@
 
   $url_before_params = $url;
-  
+
   $url.= make_section_in_url($params);
   $url = add_well_known_params_in_url($url, $params);
@@ -141 +141 @@
     $url = get_absolute_root_url( url_is_remote($url) );
   }
-  
+
   return $url;
 }
@@ -216 +216 @@
 {
   global $conf;
-
-  isset($params['image_id']) or fatal_error('make_picture_url: image_id is a required parameter');
 
   $url = get_root_url().'picture';
@@ -338 +336 @@
       else
       {
-        is_array($params['category']) or trigger_error(
-            'make_section_in_url wrong type for category', E_USER_WARNING
-            );
-        is_numeric($params['category']['id']) or trigger_error(
-            'make_section_in_url category id not numeric', E_USER_WARNING
-            );
         isset($params['category']['name']) or trigger_error(
             'make_section_in_url category name not set', E_USER_WARNING
@@ -371 +363 @@
     case 'tags' :
     {
-      if (!isset($params['tags']) or count($params['tags']) == 0)
-      {
-        fatal_error('make_section_in_url: require at least one tag');
-      }
-
       $section_string.= '/tags';
 
@@ -404 +391 @@
     case 'search' :
     {
-      isset($params['search']) or fatal_error('make_section_in_url: require a search identifier');
       $section_string.= '/search/'.$params['search'];
       break;
@@ -410 +396 @@
     case 'list' :
     {
-      isset($params['list']) or fatal_error('make_section_in_url: require a list of items');
       $section_string.= '/list/'.implode(',', $params['list']);
       break;
@@ -471 +456 @@
           else
           {
-            $maybe_permalinks[] = 
+            $maybe_permalinks[] =
                 $maybe_permalinks[count($maybe_permalinks)-1]
                 . '/' . $tokens[$current_token];
@@ -679 +664 @@
     $params['download'] = null;
   }
-  
+
   return add_url_params(get_root_url().'action.php', $params);
 }
@@ -813 +798 @@
 
   $vars = array_diff_key($vars, array_flip($rejects));
-  
+
   return '?' . http_build_query($vars, '', $escape ? '&' : '&');
 }

trunk/include/functions_user.inc.php

@@ -427 +427 @@
   WHERE category_id NOT IN ('.$userdata['forbidden_categories'].')
     AND level>'.$userdata['level'];
-      $forbidden_ids = array_from_query($query, 'id');
+      $forbidden_ids = query2array($query,null, 'id');
 
       if ( empty($forbidden_ids) )
@@ -545 +545 @@
     ).'
 ;';
-  $authorizeds = array_from_query($query, 'image_id');
+  $authorizeds = query2array($query,null, 'image_id');
 
   $query = '
@@ -552 +552 @@
   WHERE user_id = '.$user['id'].'
 ;';
-  $favorites = array_from_query($query, 'image_id');
+  $favorites = query2array($query,null, 'image_id');
 
   $to_deletes = array_diff($favorites, $authorizeds);
@@ -585 +585 @@
   WHERE status = \'private\'
 ;';
-  $private_array = array_from_query($query, 'id');
+  $private_array = query2array($query,null, 'id');
 
   // retrieve category ids directly authorized to the user
@@ -593 +593 @@
   WHERE user_id = '.$user_id.'
 ;';
-  $authorized_array = array_from_query($query, 'cat_id');
+  $authorized_array = query2array($query,null, 'cat_id');
 
   // retrieve category ids authorized to the groups the user belongs to
@@ -605 +605 @@
     array_merge(
       $authorized_array,
-      array_from_query($query, 'cat_id')
+      query2array($query,null, 'cat_id')
       );
 
@@ -623 +623 @@
   WHERE visible = \'false\'
 ;';
-    $result = pwg_query($query);
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $forbidden_array[] = $row['id'];
-    }
+    $forbidden_array = array_merge($forbidden_array, query2array($query, null, 'id') );
     $forbidden_array = array_unique($forbidden_array);
   }
@@ -869 +865 @@
         $level = max( $conf['available_permission_levels'] );
       }
-      else if (($user_id == $conf['guest_id']) or
+      elseif (($user_id == $conf['guest_id']) or
                ($user_id == $conf['default_user_id']))
       {