Changeset 4512

Timestamp:

Dec 18, 2009, 10:08:21 PM (14 years ago)

Author:

rvelices

Message:

web method images.setPrivacyLevel (ws_images_setPrivacyLevel) is POST only

Location:

branches/2.0

Files:

• include/ws_functions.inc.php (modified) (20 diffs)
• template-common/scripts.js (modified) (4 diffs)
• template/yoga/picture.tpl (modified) (1 diff)
• ws.php (modified) (4 diffs)

branches/2.0/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.'
@@ -886 +891 @@
   // type {thumb, file, high}
   // position
-  
+
   if (!is_admin() || is_adviser() )
   {
@@ -951 +956 @@
   {
     unlink($output_filepath);
-    
+
     if (is_file($output_filepath))
     {
@@ -958 +963 @@
     }
   }
-  
+
   $upload_dir = PHPWG_ROOT_PATH.'upload/buffer';
   $pattern = '/'.$original_sum.'-'.$type.'/';
   $chunks = array();
-  
+
   if ($handle = opendir($upload_dir))
   {
@@ -983 +988 @@
 
   $i = 0;
-  
+
   foreach ($chunks as $chunk)
   {
     $string = file_get_contents($chunk);
-    
+
     if (function_exists('memory_get_usage')) {
       ws_logfile('[merge_chunks] memory_get_usage on chunk '.++$i.': '.memory_get_usage());
     }
-    
+
     if (!file_put_contents($output_filepath, $string, FILE_APPEND))
     {
@@ -997 +1002 @@
       exit();
     }
-    
+
     unlink($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);
 }
@@ -2002 +2007 @@
       );
   }
-  
+
 }
 
@@ -2012 +2017 @@
     return true;
   }
-  
+
   file_put_contents(
     $conf['ws_log_filepath'],

branches/2.0/template-common/scripts.js

@@ -71 +71 @@
 }
 
+
+function blockToggleDisplay(headerId, contentId)
+{
+        var revHeader = document.getElementById(headerId);
+        var revContent = document.getElementById(contentId);
+
+        if (revContent.style.display == 'none')
+        {
+                revContent.style.display = 'block';
+                revHeader.className = 'instructionBlockHeaderExpanded';
+        }
+        else
+        {
+                revContent.style.display = 'none';
+                revHeader.className = 'instructionBlockHeaderCollapsed';
+        }
+}
 
 
@@ -91 +108 @@
 };
 
-function blockToggleDisplay(headerId, contentId)
-{
-  var revHeader = document.getElementById(headerId);
-  var revContent = document.getElementById(contentId);
-
-  if (revContent.style.display == 'none')
-  {
-    revContent.style.display = 'block';
-    revHeader.className = 'instructionBlockHeaderExpanded';
-  }
-  else
-  {
-    revContent.style.display = 'none';
-    revHeader.className = 'instructionBlockHeaderCollapsed';
-  }
-}
-
 
 PwgWS.prototype = {
@@ -130 +130 @@
                 this.transport.onreadystatechange = this.onStateChange.pwgBind(this);
 
-                var url = this.urlRoot;
-                url += "ws.php?format=json&method="+method;
+                var url = this.urlRoot+"ws.php?format=json";
+
+                var body = "method="+method;
                 if (parameters)
                 {
@@ -139 +140 @@
                                 {
                                         for (var i=0; i<parameters[property].length; i++)
-                                                url += "&"+property+"[]="+encodeURIComponent(parameters[property][i]);
+                                                body += "&"+property+"[]="+encodeURIComponent(parameters[property][i]);
                                 }
                                 else
-                                        url += "&"+property+"="+encodeURIComponent(parameters[property]);
-                        }
-                }
-                this.transport.open(this.options.method, url, this.options.async);
-                this.transport.send(null);
+                                        body += "&"+property+"="+encodeURIComponent(parameters[property]);
+                        }
+                }
+
+                if (this.options.method == "POST" )
+                {
+                        this.transport.open(this.options.method, url, this.options.async);
+                        this.transport.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
+                        this.transport.send(body);
+                }
+                else
+                {
+                        url += "&"+body;
+                        this.transport.open(this.options.method, url, this.options.async);
+                        this.transport.send(null);
+                }
         },
 

branches/2.0/template/yoga/picture.tpl

@@ -216 +216 @@
         "pwg.images.setPrivacyLevel", {image_id: id, level:level} ,
         {
+                method: "POST",
                 onFailure: function(num, text) { selectElement.disabled = false; alert(num + " " + text); },
                 onSuccess: function(result) { selectElement.disabled = false; }

branches/2.0/ws.php

@@ -137 +137 @@
       'level' => array('maxValue'=>$conf['available_permission_levels']),
       ),
-    'sets the privacy levels for the images'
+    'sets the privacy levels for the images (POST method only)'
     );
 
@@ -279 +279 @@
     array(
       'image_id' => array(),
-      
+
       'name' => array('default' => null),
       'author' => array('default' => null),
@@ -298 +298 @@
 <br/><b>multiple_value_mode</b> can be "append" (no change on existing values, add the new values) or "replace" and applies to multiple values properties like tag_ids/categories'
     );
-  
+
   $service->addMethod(
     'pwg.categories.setInfo',
@@ -304 +304 @@
     array(
       'category_id' => array(),
-      
+
       'name' => array('default' => null),
       'comment' => array('default' => null),