Changeset 11081 for extensions/user_tags/include/t4u_admin_action.inc.php

Timestamp:

May 27, 2011, 11:02:05 PM (13 years ago)

Author:

nikrou

Message:

Fix incompatibility with piwigo 2.2
Change jquery plugin from fcbkcomplete to tokeninput

File:

• extensions/user_tags/include/t4u_admin_action.inc.php (modified) (2 diffs)

extensions/user_tags/include/t4u_admin_action.inc.php

@@ -25 +25 @@
 
 if (!empty($_GET['action']) && ($_GET['action']=='add') 
-    && isset($_POST['tags']) && $plugin_config->getPermission('add') ) {
+    && isset($_POST['tags']) && $me->getPermission('add')) {
   include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
 
@@ -31 +31 @@
     $_POST['tags'] = array();
   }
-  $tag_ids = get_fckb_tag_ids($_POST['tags']);
+  $tag_ids = __get_tag_ids($_POST['tags']);
   set_tags($tag_ids, $_POST['image_id']);
 
   if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
     header("Content-Type: application/json");
-    $message['info'] = 'Tags updated';
+    $message['info'] = l10n('Tags updated');
 
     echo json_encode($message);
     exit();
   } else {
-    redirect(get_absolute_root_url().$_POST['referer']);
+    redirect(get_root_url().$_POST['referer']);
   }
-} elseif (!empty($_GET['action']) && $_GET['action']=='get' && $plugin_config->getPermission('add') ) {
-  include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
-      
+} elseif (!empty($_GET['action']) && $_GET['action']=='get' && $me->getPermission('add')) {
   $query = '
 SELECT
     id AS tag_id,
     name AS tag_name
-  FROM '.TAGS_TABLE.'
-;';
+  FROM '.TAGS_TABLE;
+
+  if (!empty($_GET['q'])) {
+    $query .= ' WHERE url_name like \'%'.pwg_db_real_escape_string($_GET['q']).'%\';';
+  } else {
+    $query .= ';';
+  }
   header("Content-Type: application/json");
-  echo json_encode(get_fckb_taglist($query));
+  echo json_encode(__get_taglist($query));
   exit();
 }
+
+/*
+ * temporary functions before piwigo 2.3
+ * See admin/include/functions.php in piwigo core
+ */
+function __get_taglist($query) {
+  $result = pwg_query($query);
+
+  $taglist = array();
+  while ($row = pwg_db_fetch_assoc($result)) {
+    $taglist[] = array('name' => $row['tag_name'],
+                       'id' => '~~'.$row['tag_id'].'~~'
+                       );
+  }
+
+  $cmp = create_function('$a,$b', 'return strcasecmp($a[\'name\'], $b[\'name\']);');
+  usort($taglist, $cmp);
+
+  return $taglist;
+}
+
+function __get_tag_ids($raw_tags) {
+  $tag_ids = array();
+  $raw_tags = explode(',',$raw_tags);
+
+  foreach ($raw_tags as $raw_tag) {
+    if (preg_match('/^~~(\d+)~~$/', $raw_tag, $matches)) {
+      $tag_ids[] = $matches[1];
+    } else {
+      $tag_ids[] = tag_id_from_tag_name($raw_tag);
+    }
+  }
+
+  return $tag_ids;
+}
 ?>