Changeset 6613 for extensions/virtualAutoGrant/virtual_categories_granted_to_creator.php

Timestamp:

Jun 27, 2010, 10:37:23 PM (14 years ago)

Author:

vdigital

Message:

Fix: some issues with globals and access by ref
Next: Add missing translations + Set "who can read" on non API cases

File:

• extensions/virtualAutoGrant/virtual_categories_granted_to_creator.php (modified) (6 diffs)

extensions/virtualAutoGrant/virtual_categories_granted_to_creator.php

@@ -11 +11 @@
   add_event_handler('get_admin_plugin_menu_links', 'VAG_set_private');
   function VAG_set_private($menu) {
-    global $page;
+    global $page, $conf;
     if ( isset($page['page']) and $page['page'] != 'site_manager' )
       $conf['newcat_default_status'] = 'private';
@@ -22 +22 @@
   add_event_handler('get_admin_plugin_menu_links', 'VAG_set_public');
   function VAG_set_public($menu) {
-    global $page;
+    global $page, $conf;
     if ( isset($page['page']) and $page['page'] != 'site_manager' )
       $conf['newcat_default_status'] = 'public';
@@ -35 +35 @@
   function VAG_grant_to_prepare($menu) {
     global $conf, $page, $vag;
-    if ( !isset($page['page']) or $page['page'] == 'site_manager' ) return false;
+    if ( !isset($page['page']) or $page['page'] == 'site_manager' ) return false; # Not Virtual
     list($max_id) = pwg_db_fetch_row(pwg_query('SELECT MAX(id) FROM '.CATEGORIES_TABLE . ';'));
     $vag['lastcat before'] == $max_id;
@@ -54 +54 @@
         mass_inserts(USER_ACCESS_TABLE, array('user_id','cat_id'), $insert);
       }
+      // To do set level
     }
   }
 } 
 
-// API cases : Just do it (even in Admin Photos Add case or other plugins cases)  
+// API cases : Just do it   
 if ( !function_exists( 'VAG_set_private_by_API' ) ) {
         add_event_handler('invalidate_user_cache', 'VAG_set_private_by_API', 20);
@@ -64 +65 @@
         function  VAG_set_private_by_API($full) {
     if ( !function_exists( 'ws_categories_add' ) ) return false; // That isn't an API request
-          global $user, $conf, $vag;
-    if ( $_REQUEST['method'] == 'pwg.categories.add' ) {
+          global $user, $conf;
+    $vag = & $conf['virtual_AutoGrant'];
+    if ( isset($_REQUEST['method']) and $_REQUEST['method'] == 'pwg.categories.add' ) {
       list($inserted_id) = pwg_db_fetch_row(pwg_query('SELECT MAX(id) FROM '.CATEGORIES_TABLE
       . ' WHERE name = \'' .pwg_db_real_escape_string($_REQUEST['name']) . '\' AND site_id IS NULL;'));
@@ -80 +82 @@
     }
     // "Who can see" management ( only for API, Synchro or old HTTP management on gallery side are ignored )
-    if ( $_REQUEST['method'] == 'pwg.images.add' and isset($_REQUEST['original_sum']) 
+    if ( isset($_REQUEST['method']) and $_REQUEST['method'] == 'pwg.images.add' and isset($_REQUEST['original_sum']) 
         and $vag['set_who_can_see'] == 1 ) {
       # image to update