Changeset 25817 for extensions/AdminTools/include

Timestamp:

Dec 7, 2013, 6:43:09 PM (10 years ago)

Author:

mistic100

Message:

load tags,themes,users,languages list in AJAX + move javascript code to external file

Location:

extensions/AdminTools/include

Files:

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

extensions/AdminTools/include/MultiView.class.php

@@ -212 +212 @@
     }
   }
+  
+  /**
+   * Register custom API methods
+   */
+  public static function register_ws($arr)
+  {
+    $service = &$arr[0];
+    
+    $service->addMethod(
+      'multiView.getData',
+      array('MultiView', 'ws_get_data'),
+      array(),
+      'AdminTools private method.',
+      null,
+      array('admin_only' => true, 'hidden' => true)
+      );
+  }
+  
+  /**
+   * API method
+   * Return full list of users, themes and languages
+   */
+  public static function ws_get_data($params)
+  {
+    global $conf;
+    
+    // get users
+    $query = '
+SELECT
+  '.$conf['user_fields']['id'].' AS id,
+  '.$conf['user_fields']['username'].' AS username
+FROM '.USERS_TABLE.'
+  ORDER BY CONVERT('.$conf['user_fields']['username'].', CHAR)
+;';
+    $out['users'] = array_from_query($query);
+
+    // get themes
+    include_once(PHPWG_ROOT_PATH.'admin/include/themes.class.php');
+    $themes = new themes();
+    foreach (array_keys($themes->db_themes_by_id) as $theme)
+    {
+      if (!empty($theme))
+      {
+        $out['themes'][] = $theme;
+      }
+    }
+
+    // get languages
+    foreach (get_languages() as $code => $name)
+    {
+      $out['languages'][] = array(
+        'id' => $code,
+        'name' => $name,
+        );
+    }
+    
+    return $out;
+  }
 }

extensions/AdminTools/include/events.inc.php

@@ -81 +81 @@
       );
 
-    // gets tags
+    // gets tags (full available list is loaded in ajax)
     $query = '
 SELECT id, name
@@ -89 +89 @@
 ;';
     $tag_selection = get_taglist($query);
-
-    $query = '
-SELECT id, name
-  FROM '.TAGS_TABLE.'
-;';
-    $tags = get_taglist($query, false);
 
     $tpl_vars['QUICK_EDIT'] = array(
@@ -105 +99 @@
       'date_creation_time' => substr($picture['current']['date_creation'], 11, 5),
       'tag_selection' =>      $tag_selection,
-      'tags' =>               $tags,
       );
   }
@@ -146 +139 @@
       $tpl_vars['QUICK_EDIT']['img'] = DerivativeImage::get_one(IMG_SQUARE, $image_infos)->get_url();
     }
-  }
-
-
-  // get users
-  $query = '
-SELECT
-  '.$conf['user_fields']['id'].' AS id,
-  '.$conf['user_fields']['username'].' AS username
-FROM '.USERS_TABLE.'
-  ORDER BY CONVERT('.$conf['user_fields']['username'].', CHAR)
-;';
-  $tpl_vars['USERS'] = simple_hash_from_query($query, 'id', 'username');
-
-  // get themes
-  include_once(PHPWG_ROOT_PATH.'admin/include/themes.class.php');
-  $themes = new themes();
-  foreach (array_keys($themes->db_themes_by_id) as $theme)
-  {
-    if (!empty($theme))
-    {
-      $tpl_vars['THEMES'][$theme] = $theme;
-    }
-  }
-
-  // get languages
-  foreach (get_languages() as $code => $name)
-  {
-    $tpl_vars['LANGS'][$code] = $name;
   }