Changeset 27038 for extensions/community/main.inc.php

Timestamp:

Jan 29, 2014, 4:17:51 PM (10 years ago)

Author:

plg

Message:

2.6 compatibility: bug fixed on album creation and all "admin_only" methods.
This option was added in Piwigo 2.6 and disturbs the hack in Community that
gives "admin" status to users with upload permission when calling specific
API methods.

Discussion in progress to implement this hack in a cleaner way.

File:

• extensions/community/main.inc.php (modified) (4 diffs)

extensions/community/main.inc.php

@@ -207 +207 @@
 
 
-add_event_handler('ws_invoke_allowed', 'community_switch_user_to_admin', EVENT_HANDLER_PRIORITY_NEUTRAL, 3);
-function community_switch_user_to_admin($res, $methodName, $params)
+add_event_handler('ws_add_methods', 'community_switch_user_to_admin', EVENT_HANDLER_PRIORITY_NEUTRAL+5);
+function community_switch_user_to_admin($arr)
 {
   global $user, $community;
 
+  $service = &$arr[0];
+
   if (is_admin())
   {
-    return $res;
-  }
-  
-  $community = array('method' => $methodName);
+    return;
+  }
+  
+  $community = array('method' => $_REQUEST['method']);
 
   if ('pwg.images.addSimple' == $community['method'])
   {
-    $community['category'] = $params['category'];
+    $community['category'] = $_REQUEST['category'];
   }
   elseif ('pwg.images.add' == $community['method'])
   {
-    $community['category'] = $params['categories'];
-    $community['md5sum'] = $params['original_sum'];
+    $community['category'] = $_REQUEST['categories'];
+    $community['md5sum'] = $_REQUEST['original_sum'];
   }
 
@@ -239 +241 @@
   if (count($user_permissions['upload_categories']) == 0 and !$user_permissions ['create_whole_gallery'])
   {
-    return $res;
+    return;
   }
 
@@ -254 +256 @@
   $methods[] = 'pwg.images.setInfo';
 
-  if (in_array($methodName, $methods))
+  if (in_array($community['method'], $methods))
   {
     $user['status'] = 'admin';
   }
 
-  if ('pwg.categories.add' == $methodName)
-  {
-    if (in_array($params['parent'], $user_permissions['create_categories'])
+  if ('pwg.categories.add' == $community['method'])
+  {
+    if (in_array($_REQUEST['parent'], $user_permissions['create_categories'])
         or $user_permissions['create_whole_gallery'])
     {
@@ -268 +270 @@
   }
 
-  return $res;
+  return;
 }