Changeset 25655 for extensions/AdminTools/include

Timestamp:

Nov 23, 2013, 5:47:04 PM (11 years ago)

Author:

mistic100

Message:

quick edit for album
add language files
force default language for the toolbar
fix $_GET collision
orange save button
fix popup background color

Location:

extensions/AdminTools/include

Files:

• MultiView.class.php (modified) (4 diffs)
• events.inc.php (modified) (8 diffs)

extensions/AdminTools/include/MultiView.class.php

@@ -1 +1 @@
 <?php
-defined('ADMINTOOLS_ID') or die('Hacking attempt!');
+defined('ADMINTOOLS_PATH') or die('Hacking attempt!');
 
 /**
@@ -129 +129 @@
 
       // view_as
-      if (isset($_GET['view_as']))
-      {
-        $this->data['view_as'] = (int)$_GET['view_as'];
+      if (isset($_GET['ato_view_as']))
+      {
+        $this->data['view_as'] = (int)$_GET['ato_view_as'];
       }
       if ($this->data['view_as'] != $user['id'])
@@ -141 +141 @@
 
       // theme
-      if (isset($_GET['theme']))
-      {
-        $this->data['theme'] = $_GET['theme'];
+      if (isset($_GET['ato_theme']))
+      {
+        $this->data['theme'] = $_GET['ato_theme'];
       }
       $user['theme'] = $this->data['theme'];
 
       // lang
-      if (isset($_GET['lang']))
-      {
-        $this->data['lang'] = $_GET['lang'];
+      if (isset($_GET['ato_lang']))
+      {
+        $this->data['lang'] = $_GET['ato_lang'];
       }
       $user['language'] = $this->data['lang'];
 
       // show_queries
-      if (isset($_GET['show_queries']))
-      {
-        $this->data['show_queries'] = (bool)$_GET['show_queries'];
+      if (isset($_GET['ato_show_queries']))
+      {
+        $this->data['show_queries'] = (bool)$_GET['ato_show_queries'];
       }
       $conf['show_queries'] = $this->data['show_queries'];
 
       // debug_l10n
-      if (isset($_GET['debug_l10n']))
-      {
-        $this->data['debug_l10n'] = (bool)$_GET['debug_l10n'];
+      if (isset($_GET['ato_debug_l10n']))
+      {
+        $this->data['debug_l10n'] = (bool)$_GET['ato_debug_l10n'];
       }
       $conf['debug_l10n'] = $this->data['debug_l10n'];
 
       // debug_template
-      if (isset($_GET['debug_template']))
-      {
-        $this->data['debug_template'] = (bool)$_GET['debug_template'];
+      if (isset($_GET['ato_debug_template']))
+      {
+        $this->data['debug_template'] = (bool)$_GET['ato_debug_template'];
       }
       $conf['debug_template'] = $this->data['debug_template'];
 
       // template_combine_files
-      if (isset($_GET['template_combine_files']))
-      {
-        $this->data['template_combine_files'] = (bool)$_GET['template_combine_files'];
+      if (isset($_GET['ato_template_combine_files']))
+      {
+        $this->data['template_combine_files'] = (bool)$_GET['ato_template_combine_files'];
       }
       $conf['template_combine_files'] = $this->data['template_combine_files'];
 
       // no_history
-      if (isset($_GET['no_history']))
-      {
-        $this->data['no_history'] = (bool)$_GET['no_history'];
+      if (isset($_GET['ato_no_history']))
+      {
+        $this->data['no_history'] = (bool)$_GET['ato_no_history'];
       }
       if ($this->data['no_history'])
@@ -201 +201 @@
   public function init()
   {
-    if (isset($_GET['purge_template']))
+    if (isset($_GET['ato_purge_template']))
     {
       global $template;

extensions/AdminTools/include/events.inc.php

@@ -2 +2 @@
 defined('ADMINTOOLS_PATH') or die('Hacking attempt!');
 
+/**
+ * Add main toolbar to current page
+ * @trigger loc_after_page_header
+ */
 function admintools_add_public_controller()
 {
@@ -24 +28 @@
     );
 
+  if (!is_admin())
+  {
+    load_language('admin.lang');
+  }
+
+  switch_lang_to(get_default_language());
+
   // TODO : param to allow owner modification
   if (script_basename() == 'picture')
@@ -86 +97 @@
 
     $tpl_vars['QUICK_EDIT'] = array(
-      'file' => $picture['current']['file'],
+      'img' => $picture['current']['derivatives']['square'],
       'name' => $picture['current']['name'],
       'comment' => $picture['current']['comment'],
@@ -118 +129 @@
         );
     }
+
+    $query = 'SELECT * FROM '.IMAGES_TABLE.' WHERE id = '. $page['category']['representative_picture_id'] .';';
+    $image_infos = pwg_db_fetch_assoc(pwg_query($query));
+
+    $tpl_vars['QUICK_EDIT'] = array(
+      'img' => DerivativeImage::get_one(IMG_SQUARE, $image_infos),
+      'name' => $page['category']['name'],
+      'comment' => $page['category']['comment'],
+      );
   }
 
@@ -134 +154 @@
   include_once(PHPWG_ROOT_PATH.'admin/include/themes.class.php');
   $themes = new themes();
-  foreach (array_keys($themes->fs_themes) as $theme)
-  {
-    $tpl_vars['THEMES'][$theme] = $theme;
+  foreach (array_keys($themes->db_themes_by_id) as $theme)
+  {
+    if (!empty($theme))
+    {
+      $tpl_vars['THEMES'][$theme] = $theme;
+    }
   }
 
@@ -153 +176 @@
   $template->set_filename('ato', realpath(ADMINTOOLS_PATH . 'template/public_controller.tpl'));
   $template->parse('ato');
-}
-
+
+  switch_lang_back();
+}
+
+/**
+ * Disable privacy level switchbox
+ */
 function admintools_remove_privacy($content)
 {
@@ -162 +190 @@
 }
 
+/**
+ * Save picture form
+ * @trigger loc_begin_picture
+ */
 function admintools_save_picture()
 {
@@ -225 +257 @@
   }
 }
+
+/**
+ * Save category form
+ * @trigger loc_begin_index
+ */
+function admintools_save_category()
+{
+  global $page, $conf;
+  
+  if (@$_POST['action'] == 'quick_edit')
+  {
+    $data = array(
+      'name' => $_POST['name'],
+      );
+
+    if ($conf['allow_html_descriptions'])
+    {
+      $data['comment'] = @$_POST['comment'];
+    }
+    else
+    {
+      $data['comment'] = strip_tags(@$_POST['comment']);
+    }
+
+    single_update(
+      CATEGORIES_TABLE,
+      $data,
+      array('id' => $page['category']['id'])
+      );
+      
+    redirect(duplicate_index_url());
+  }
+}