Changeset 2119 for trunk/include/ws_functions.inc.php

Timestamp:

Oct 4, 2007, 1:36:21 AM (17 years ago)

Author:

rvelices

Message:

• bug 755: admin permalinks page - fix category field sort
• web service functions: 1 fix and 3 optimizations

File:

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

trunk/include/ws_functions.inc.php

@@ -33 +33 @@
 {
   global $conf, $calling_partner_id;
-  
+
   if ( strpos($methodName,'reflection.')===0 )
   { // OK for reflection
     return $res;
   }
-  
+
   if ( !is_autorize_status(ACCESS_GUEST) and
       strpos($methodName,'pwg.session.')!==0 )
@@ -44 +44 @@
     return new PwgError(401, 'Access denied');
   }
-  
+
   if ( !$conf['ws_access_control'] )
   {
@@ -317 +317 @@
       );
   }
-  $where_clauses[] = 'id NOT IN ('.$user['forbidden_categories'].')';
+  $where_clauses[] = get_sql_condition_FandF(
+        array('forbidden_categories' => 'id'),
+        NULL, true
+      );
 
   $query = '
@@ -461 +464 @@
   else
   {
-    $where[] = 'id NOT IN ('.$user['forbidden_categories'].')';
     $where[]= 'user_id='.$user['id'];
   }
@@ -473 +475 @@
   WHERE '. implode('
     AND ', $where);
-  $query .= '
-ORDER BY global_rank';
 
   $result = pwg_query($query);
@@ -513 +513 @@
   $params['image_id'] = (int)$params['image_id'];
   $query = '
-SELECT DISTINCT image_id 
+SELECT DISTINCT image_id
   FROM '.IMAGE_CATEGORY_TABLE.' INNER JOIN '.CATEGORIES_TABLE.' ON category_id=id
-  WHERE commentable="true" 
+  WHERE commentable="true"
     AND image_id='.$params['image_id'].
     get_sql_condition_FandF(
@@ -529 +529 @@
     return new PwgError(WS_ERR_INVALID_PARAM, "Invalid image_id");
   }
-  
+
   include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
-  
+
   $comm = array(
     'author' => trim( stripslashes($params['author']) ),
@@ -539 +539 @@
 
   include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
-  
-  $comment_action = insert_user_comment( 
+
+  $comment_action = insert_user_comment(
       $comm, $params['key'], $infos
     );
@@ -551 +551 @@
     case 'validate':
     case 'moderate':
-      $ret = array( 
+      $ret = array(
           'id' => $comm['id'],
           'validation' => $comment_action=='validate',
@@ -557 +557 @@
       return new PwgNamedStruct(
           'comment',
-          $ret, 
-          null, array() 
+          $ret,
+          null, array()
         );
     default:
@@ -600 +600 @@
   FROM '.IMAGE_CATEGORY_TABLE.'
     INNER JOIN '.CATEGORIES_TABLE.' ON category_id = id
-  WHERE image_id = '.$image_row['id'].'
-    AND category_id NOT IN ('.$user['forbidden_categories'].')
+  WHERE image_id = '.$image_row['id'].
+  get_sql_condition_FandF(
+      array( 'forbidden_categories' => 'category_id' ),
+      ' AND'
+    ).'
 ;';
   $result = pwg_query($query);
@@ -668 +671 @@
   //---------------------------------------------------------- related comments
   $related_comments = array();
-  
+
   $where_comments = 'image_id = '.$image_row['id'];
   if ( !is_admin() )
@@ -700 +703 @@
     }
   }
-  
+
   $comment_post_data = null;
-  if ($is_commentable and 
+  if ($is_commentable and
       (!is_a_guest()
         or (is_a_guest() and $conf['comments_forall'] )
@@ -709 +712 @@
   {
     include_once(PHPWG_ROOT_PATH.'include/functions_comment.inc.php');
-    $comment_post_data['author'] = $user['username'];    
+    $comment_post_data['author'] = $user['username'];
     $comment_post_data['key'] = get_comment_post_key($params['image_id']);
   }
@@ -734 +737 @@
   }
   $ret['comments'] = array(
-     WS_XML_ATTRIBUTES => 
+     WS_XML_ATTRIBUTES =>
         array(
           'page' => $params['comments_page'],
@@ -806 +809 @@
     $image_ids = $search_result['items'];
   }
-  
+
   $image_ids = array_slice($image_ids,
     $params['page']*$params['per_page'],
@@ -952 +955 @@
   @include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
   global $conf;
-  
+
   // first build all the tag_ids we are interested in
   $params['tag_id'] = array_map( 'intval',$params['tag_id'] );
@@ -1029 +1032 @@
     while ($row = mysql_fetch_assoc($result))
     {
+      $image = array();
       foreach ( array('id', 'width', 'height', 'hit') as $k )
       {