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

Timestamp:

Dec 18, 2009, 10:12:41 PM (14 years ago)

Author:

rvelices

Message:

merge -r4512 from branch 2.0 to trunk
web method images.setPrivacyLevel (ws_images_setPrivacyLevel) is POST only

File:

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

trunk/include/ws_functions.inc.php

@@ -856 +856 @@
     return new PwgError(401, 'Access denied');
   }
+  if (!$service->isPost())
+  {
+    return new PwgError(405, "This method requires HTTP POST");
+  }
   $params['image_id'] = array_map( 'intval',$params['image_id'] );
   if ( empty($params['image_id']) )
@@ -866 +870 @@
     return new PwgError(WS_ERR_INVALID_PARAM, "Invalid level");
   }
+
   $query = '
 UPDATE '.IMAGES_TABLE.'
@@ -951 +956 @@
   {
     unlink($output_filepath);
-    
+
     if (is_file($output_filepath))
     {
@@ -958 +963 @@
     }
   }
-  
+
   $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';
   $pattern = '/'.$original_sum.'-'.$type.'/';
@@ -983 +988 @@
 
   $i = 0;
-  
+
   foreach ($chunks as $chunk)
   {
@@ -1015 +1020 @@
 
   $upload_dir = dirname($file_path);
-  
+
   if (!is_dir($upload_dir)) {
     umask(0000);
@@ -1102 +1107 @@
   //
   $update = array();
-  
+
   if ('high' == $params['type'])
   {
@@ -1121 +1126 @@
   {
     $update['id'] = $params['image_id'];
-    
+
     include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
     mass_updates(
@@ -1840 +1845 @@
     exit();
   }
-  
+
   $query = '
 SELECT
@@ -1858 +1863 @@
     exit();
   }
-  
+
   $to_update_cat_ids = array();
-    
+
   // in case of replace mode, we first check the existing associations
   $query = '
@@ -1885 +1890 @@
     }
   }
-  
+
   $new_cat_ids = array_diff($cat_ids, $existing_cat_ids);
   if (count($new_cat_ids) == 0)
@@ -1891 +1896 @@
     return true;
   }
-    
+
   if ($search_current_ranks)
   {
@@ -1915 +1920 @@
         $current_rank_of[$cat_id] = 0;
       }
-      
+
       if ('auto' == $rank_on_category[$cat_id])
       {
@@ -1922 +1927 @@
     }
   }
-  
+
   $inserts = array();
-  
+
   foreach ($new_cat_ids as $cat_id)
   {
@@ -1936 +1941 @@
       );
   }
-  
+
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
   mass_inserts(
@@ -1943 +1948 @@
     $inserts
     );
-  
+
   update_category($new_cat_ids);
 }