Changeset 16012 for extensions/GrumPluginClasses/gpc_ajax.php

Timestamp:

Jun 24, 2012, 9:18:26 PM (12 years ago)

Author:

grum

Message:

feature:2634- compatibility with Piwigo 2.4
+add some objects on js framework

File:

• extensions/GrumPluginClasses/gpc_ajax.php (modified) (9 diffs)

extensions/GrumPluginClasses/gpc_ajax.php

@@ -23 +23 @@
  *  - public.rbuilder.searchExecute
  *  - public.rbuilder.searchGetPage
- *  - public.tagSelector.get
- *  - admin.tagSelector.get
+ *  - public.inputTag.get
+ *  - admin.inputTag.get
  *  - public.contact.sendMsg
  *
@@ -32 +32 @@
 
   define('PHPWG_ROOT_PATH',dirname(dirname(dirname(__FILE__))).'/');
-
+  if(!defined('AJAX_CALL')) define('AJAX_CALL', true);
 
   /*
@@ -38 +38 @@
    */
   if(!isset($_REQUEST['ajaxfct'])) $_REQUEST['ajaxfct']='';
-  if(preg_match('/^admin\./i', $_REQUEST['ajaxfct']))
-  {
-    define('IN_ADMIN', true);
-  }
+  if(preg_match('/^admin\./i', $_REQUEST['ajaxfct'])) define('IN_ADMIN', true);
 
   // the common.inc.php file loads all the main.inc.php plugins files
   include_once(PHPWG_ROOT_PATH.'include/common.inc.php' );
   include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php' );
+  include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCAjax.class.inc.php');
   include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/CommonPlugin.class.inc.php');
-  include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCAjax.class.inc.php');
 
   global $page;
@@ -77 +74 @@
       $tableList=array('result_cache');
       $this->setTablesList($tableList);
-
       $this->loadConfig();
       $this->checkRequest();
@@ -100 +96 @@
            $_REQUEST['ajaxfct']=='admin.categorySelector.getList' or
            $_REQUEST['ajaxfct']=='public.categorySelector.getList' or
-           $_REQUEST['ajaxfct']=='public.tagSelector.get' or
-           $_REQUEST['ajaxfct']=='admin.tagSelector.get' or
+           $_REQUEST['ajaxfct']=='public.inputTag.get' or
+           $_REQUEST['ajaxfct']=='admin.inputTag.get' or
            $_REQUEST['ajaxfct']=='public.contact.sendMsg'
           )
@@ -149 +145 @@
 
         /*
-         * check admin.tagSelector.get values
+         * check admin.inputTag.get values
          */
-        if($_REQUEST['ajaxfct']=="admin.tagSelector.get" or
-           $_REQUEST['ajaxfct']=="public.tagSelector.get")
+        if($_REQUEST['ajaxfct']=="admin.inputTag.get" or
+           $_REQUEST['ajaxfct']=="public.inputTag.get")
         {
           if(!isset($_REQUEST['letters'])) $_REQUEST['ajaxfct']="";
@@ -236 +232 @@
           $result=$this->ajax_gpc_public_CategorySelectorGetList($_REQUEST['filter'], $_REQUEST['galleryRoot'], $_REQUEST['tree']);
           break;
-        case 'admin.tagSelector.get':
-          $result=$this->ajax_gpc_both_TagSelectorGet('admin', $_REQUEST['letters'], $_REQUEST['filter'], $_REQUEST['maxTags'], $_REQUEST['ignoreCase']);
-          break;
-        case 'public.tagSelector.get':
-          $result=$this->ajax_gpc_both_TagSelectorGet('public', $_REQUEST['letters'], $_REQUEST['filter'], $_REQUEST['maxTags'], $_REQUEST['ignoreCase']);
+        case 'admin.inputTag.get':
+          $result=$this->ajax_gpc_both_InputTagGet('admin', $_REQUEST['letters'], $_REQUEST['filter'], $_REQUEST['maxTags'], $_REQUEST['ignoreCase']);
+          break;
+        case 'public.inputTag.get':
+          $result=$this->ajax_gpc_both_InputTagGet('public', $_REQUEST['letters'], $_REQUEST['filter'], $_REQUEST['maxTags'], $_REQUEST['ignoreCase']);
           break;
         case 'public.contact.sendMsg':
@@ -408 +404 @@
      * @return String : json string
      */
-    private function ajax_gpc_both_TagSelectorGet($mode, $letters, $filter, $maxTags, $ignoreCase)
+    private function ajax_gpc_both_InputTagGet($mode, $letters, $filter, $maxTags, $ignoreCase)
     {
       global $user;
@@ -482 +478 @@
 
       return(json_encode($returned));
-    } //ajax_gpc_both_TagSelectorGet
+    } //ajax_gpc_both_InputTagGet