Changeset 25915

Timestamp:

Dec 10, 2013, 11:46:03 AM (11 years ago)

Author:

mistic100

Message:

various minor issues

Location:

extensions/AdminTools

Files:

• include/MultiView.class.php (modified) (6 diffs)
• include/events.inc.php (modified) (3 diffs)
• main.inc.php (modified) (1 diff)

extensions/AdminTools/include/MultiView.class.php

@@ -212 +212 @@
     }
   }
-  
+
   /**
    * Mark browser session cache for deletion
@@ -222 +222 @@
     $conf['multiview_invalidate_cache'] = true;
   }
-  
+
   /**
    * Register custom API methods
@@ -229 +229 @@
   {
     $service = &$arr[0];
-    
+
     $service->addMethod(
       'multiView.getData',
@@ -239 +239 @@
       );
   }
-  
+
   /**
    * API method
@@ -247 +247 @@
   {
     global $conf;
-    
+
     // get users
     $query = '
@@ -277 +277 @@
         );
     }
-    
+
     conf_delete_param('multiview_invalidate_cache');
-    
+
     return $out;
   }

extensions/AdminTools/include/events.inc.php

@@ -9 +9 @@
 {
   global $MultiView, $conf, $template, $page, $user, $picture;
+
+  if (script_basename() == 'picture' and empty($picture['current']))
+  {
+    return;
+  }
 
   $url_root = get_root_url();
@@ -186 +191 @@
   global $page, $conf, $MultiView, $user, $picture;
 
+  if (!isset($_GET['delete']) and !isset($_POST['action']) and $_POST['action'] != 'quick_edit')
+  {
+    return;
+  }
+
   $query = 'SELECT added_by FROM '. IMAGES_TABLE .' WHERE id = '. $page['image_id'] .';';
   list($added_by) = pwg_db_fetch_row(pwg_query($query));
 
-  if (!$MultiView->is_admin() && $user['id'] != $added_by)
+  if (!$MultiView->is_admin() and $user['id'] != $added_by)
   {
     return;
@@ -215 +225 @@
   }
 
-  if (@$_POST['action'] == 'quick_edit')
+  if ($_POST['action'] == 'quick_edit')
   {
     include_once(PHPWG_ROOT_PATH . 'admin/include/functions.php');

extensions/AdminTools/main.inc.php

@@ -15 +15 @@
 // | Plugin constants                                               |
 // +-----------------------------------------------------------------------+
-defined('ADMINTOOLS_ID') or define('ADMINTOOLS_ID', basename(dirname(__FILE__)));
-define('ADMINTOOLS_PATH' ,   PHPWG_PLUGINS_PATH . ADMINTOOLS_ID . '/');
-// define('ADMINTOOLS_ADMIN',   get_root_url() . 'admin.php?page=plugin-' . ADMINTOOLS_ID);
-define('ADMINTOOLS_VERSION', 'auto');
+define('ADMINTOOLS_ID',       basename(dirname(__FILE__)));
+define('ADMINTOOLS_PATH' ,    './plugins/' . ADMINTOOLS_ID . '/');
+// define('ADMINTOOLS_ADMIN',    get_root_url() . 'admin.php?page=plugin-' . ADMINTOOLS_ID);
+define('ADMINTOOLS_VERSION',  'auto');