Changeset 4513

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

Location:

trunk

Files:

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

trunk/include/calendar_weekly.class.php

@@ -55 +55 @@
         ),
       array(
-          'sql'=> pwg_db_get_week($this->date_field)+1,
+          'sql'=> pwg_db_get_week($this->date_field).'+1',
           'labels' => $week_no_labels,
         ),
       array(
-          'sql'=> pwg_db_get_dayofweek($this->date_field)-1,
+          'sql'=> pwg_db_get_dayofweek($this->date_field).'-1',
           'labels' => $lang['day']
         ),

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);
 }

trunk/template-common/scripts.js

@@ -112 +112 @@
                 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)
                 {
@@ -121 +122 @@
                                 {
                                         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]);
+                                        body += "&"+property+"="+encodeURIComponent(parameters[property]);
                         }
                 }
-                this.transport.open(this.options.method, url, this.options.async);
-                this.transport.send(null);
+
+                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);
+                }
         },
 

trunk/template/yoga/picture.tpl

@@ -215 +215 @@
         "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; }

trunk/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),