Changeset 31031

Timestamp:

Mar 12, 2015, 8:51:21 PM (10 years ago)

Author:

rvelices

Message:

use query2array

File:

• trunk/include/ws_functions/pwg.images.php (modified) (12 diffs)

trunk/include/ws_functions/pwg.images.php

@@ -83 +83 @@
   WHERE id IN ('.implode(',', $cat_ids).')
 ;';
-  $db_cat_ids = array_from_query($query, 'id');
+  $db_cat_ids = query2array($query, null, 'id');
 
   $unknown_cat_ids = array_diff($cat_ids, $db_cat_ids);
@@ -101 +101 @@
   WHERE image_id = '.$image_id.'
 ;';
-  $existing_cat_ids = array_from_query($query, 'category_id');
+  $existing_cat_ids = query2array($query, null, 'category_id');
 
   if ($replace_mode)
@@ -134 +134 @@
   GROUP BY category_id
 ;';
-    $current_rank_of = simple_hash_from_query(
+    $current_rank_of = query2array(
       $query,
       'category_id',
@@ -482 +482 @@
   WHERE '. $where_comments .'
 ;';
-  list($nb_comments) = array_from_query($query, 'nb_comments');
+  list($nb_comments) = query2array($query, null, 'nb_comments');
   $nb_comments = (int)$nb_comments;
 
@@ -1270 +1270 @@
   //   return new PwgError(405, 'The image (file) is missing');
   // }
-  
+
   // file_put_contents('/tmp/plupload.log', "[".date('c')."] ".__FUNCTION__."\n\n", FILE_APPEND);
   // file_put_contents('/tmp/plupload.log', '$_FILES = '.var_export($_FILES, true)."\n", FILE_APPEND);
@@ -1343 +1343 @@
   if (!$chunks || $chunk == $chunks - 1)
   {
-    // Strip the temp .part suffix off 
+    // Strip the temp .part suffix off
     rename("{$filePath}.part", $filePath);
-  
+
     include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
-    
+
     $image_id = add_uploaded_file(
       $filePath,
@@ -1355 +1355 @@
       null // image_id = not provided, this is a new photo
       );
-    
+
     $query = '
 SELECT
@@ -1376 +1376 @@
 
     $category_name = get_cat_display_name_from_id($params['category'][0], null);
-    
+
     return array(
       'image_id' => $image_id,
@@ -1421 +1421 @@
   WHERE md5sum IN (\''. implode("','", $md5sums) .'\')
 ;';
-    $id_of_md5 = simple_hash_from_query($query, 'md5sum', 'id');
+    $id_of_md5 = query2array($query, 'md5sum', 'id');
 
     foreach ($md5sums as $md5sum)
@@ -1432 +1432 @@
     }
   }
-  else if ('filename' == $conf['uniqueness_mode'])
+  elseif ('filename' == $conf['uniqueness_mode'])
   {
     // search among photos the list of photos already added, based on
@@ -1448 +1448 @@
   WHERE file IN (\''. implode("','", $filenames) .'\')
 ;';
-    $id_of_filename = simple_hash_from_query($query, 'file', 'id');
+    $id_of_filename = query2array($query, 'file', 'id');
 
     foreach ($filenames as $filename)
@@ -1503 +1503 @@
     $compare_type = 'high';
   }
-  else if (isset($params['file_sum']))
+  elseif (isset($params['file_sum']))
   {
     $compare_type = 'file';