Changeset 11741 for extensions/user_tags/include

Timestamp:

Jul 14, 2011, 4:01:17 PM (13 years ago)

Author:

nikrou

Message:

Make plugin works as expected using webservice.

Location:

extensions/user_tags/include

Files:

• autoload.inc.php (copied) (copied from extensions/user_tags/public.php) (1 diff)
• constants.inc.php (modified) (1 diff)
• default_values.inc.php (modified) (1 diff)
• t4u_admin_action.inc.php (deleted)
• t4u_config.class.php (modified) (4 diffs)
• t4u_content.class.php (modified) (2 diffs)
• t4u_ws.class.php (added)

extensions/user_tags/include/autoload.inc.php

@@ -20 +20 @@
 // +-----------------------------------------------------------------------+
 
-if (!defined('PHPWG_ROOT_PATH')) {
-  die('Hacking attempt!');
+global $__t4u_autoload;
+$__t4u_autoload['t4u_Ws'] = T4U_PLUGIN_ROOT . '/include/t4u_ws.class.php';
+$__t4u_autoload['t4u_Config'] = T4U_PLUGIN_ROOT . '/include/t4u_config.class.php';
+$__t4u_autoload['t4u_Content'] = T4U_PLUGIN_ROOT . '/include/t4u_content.class.php';
+
+
+if (function_exists('spl_autoload_register')) {
+  spl_autoload_register('t4u_autoload');
+} else {
+  function __autoload($name) {
+    t4u_autoload($name);
+  }
 }
 
-if (!empty($_GET['action']) && in_array($_GET['action'], array('add', 'get'))) {
-  include_once T4U_PLUGIN_ROOT . "/include/t4u_admin_action.inc.php";
+function t4u_autoload($name) {
+  global $__t4u_autoload;
+
+  if (!empty($__t4u_autoload[$name])) {
+    require_once $__t4u_autoload[$name];
+  }
 }
-
-include_once T4U_PLUGIN_ROOT . "/include/t4u_content.class.php";
-
-$public_content = new t4u_Content($plugin_config);
-add_event_handler('render_element_content', 
-                  array($public_content, 'render_element_content'),
-                  EVENT_HANDLER_PRIORITY_NEUTRAL,
-                  2
-                  );
-?>

extensions/user_tags/include/constants.inc.php

@@ -26 +26 @@
 define('T4U_IMGS', PHPWG_PLUGINS_PATH . basename(T4U_PLUGIN_ROOT). '/imgs');
 define('T4U_JS', PHPWG_PLUGINS_PATH . basename(T4U_PLUGIN_ROOT). '/js');
+define('T4U_WS', 'user_tags.tags.');
 ?>

extensions/user_tags/include/default_values.inc.php

@@ -21 +21 @@
 
 $default_values = array();
-$default_values['t4u_permission_add'] = null;
-$default_values['t4u_permission_delete'] = null;
+$default_values['t4u_permission_update'] = null;
 ?>

extensions/user_tags/include/t4u_config.class.php

@@ -22 +22 @@
 class t4u_Config
 {
-    private 
-      $config = array(), 
-      $plugin_dir;
+  private $config = array();
+  protected static $instance; 
 
   public function __construct($plugin_dir, $plugin_name) {
@@ -35 +34 @@
 
     if (!file_exists($this->get_config_filename())) {
+      $this->setDefaults();
       $this->save_config();
     }
   }
+
+  public static function getInstance() { 
+    if (!isset(self::$instance)) { 
+      self::$instance = new t4u_Config(T4U_PLUGIN_ROOT, T4U_PLUGIN_NAME); 
+    } 
+    return self::$instance; 
+  }
+
 
   public function load_config() {
@@ -45 +53 @@
       $this->config = $c;
     }
-    $this->setDefaults();
   }
 
@@ -100 +107 @@
   
   public function getActionUrl($action, $method='POST') {
-    $url = get_root_url().'admin.php?page=plugin';
-    $file = basename($this->plugin_dir) . '/' .'admin.php';
-    if (strtoupper($method)=='POST') {
-        $url .= '&section='.urlencode($file);
-        $url .= '&action='.urlencode($action);
-    } else {
-        $url .= '&section='.$file;
-        $url .= '&action='.$action;
-    }
+    $ws = get_root_url();
+    $ws .= 'ws.php?format=json&method=user_tags.tags.list';
 
-    return $url;
+    /* $url = get_root_url().'admin.php?page=plugin'; */
+    /* $file = basename($this->plugin_dir) . '/' .'admin.php'; */
+    /* if (strtoupper($method)=='POST') { */
+    /*  $url .= '&section='.urlencode($file); */
+    /*  $url .= '&action='.urlencode($action); */
+    /* } else { */
+    /*  $url .= '&section='.$file; */
+    /*  $url .= '&action='.$action; */
+    /* } */
+
+    return $ws;
   }
 

extensions/user_tags/include/t4u_content.class.php

@@ -30 +30 @@
 
     if (!$this->plugin_config->hasPermission('add')) {
-      return false;
+      return $content;
     }
+
+    load_language('plugin.lang', T4U_PLUGIN_LANG);
 
     $template->assign('T4U_JS', T4U_JS);
     $template->assign('T4U_CSS', T4U_CSS);
     $template->assign('T4U_IMGS', T4U_IMGS);
-    $template->assign('T4U_ADD_SCRIPT', $this->plugin_config->getActionUrl('add', 'GET'));
-    $template->assign('T4U_GET_SCRIPT', $this->plugin_config->getActionUrl('get', 'GET'));
+    $template->assign('T4U_PERMISSION_DELETE', $this->plugin_config->hasPermission('delete'));
+    $template->assign('T4U_UPDATE_SCRIPT', get_root_url().'ws.php?format=json&method='.T4U_WS.'update');
+    $template->assign('T4U_UPDATE_METHOD', T4U_WS.'update');
+    $template->assign('T4U_GET_SCRIPT', get_root_url().'ws.php?format=json&method='.T4U_WS.'list');
     $template->assign('T4U_IMAGE_ID', $picture['id']);
     $template->assign('T4U_REFERER', urlencode($picture['url']));
@@ -51 +55 @@
 
     $template->set_filename('add_tags', T4U_TEMPLATE.'/add_tags.tpl');
-    $template->assign_var_from_handle('PLUGIN_PICTURE_BEFORE', 'add_tags');
+
+    $plugin_picture_before = $template->get_template_vars('PLUGIN_PICTURE_BEFORE');
+    $plugin_picture_before .= $template->parse('add_tags', true);
+    $template->append('PLUGIN_PICTURE_BEFORE', $plugin_picture_before);
 
     return $content;