From 4926fced5e18cc5ea71f3c32e695649230667efb Mon Sep 17 00:00:00 2001
From: mistic100 <mistic@piwigo.org>
Date: Sat, 19 Oct 2013 18:17:10 +0000
Subject: replace some mass_updates/inserts by single_update/insert

git-svn-id: http://piwigo.org/svn/trunk@25019 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/tags.php | 42 ++++++++++++------------------------------
 1 file changed, 12 insertions(+), 30 deletions(-)

(limited to 'admin/tags.php')

diff --git a/admin/tags.php b/admin/tags.php
index 02ab03b1c..794514b28 100644
--- a/admin/tags.php
+++ b/admin/tags.php
@@ -129,16 +129,14 @@ SELECT id, name
       }
       else if (!empty($tag_name))
       {
-        mass_inserts(
+        single_insert(
           TAGS_TABLE,
-          array('name', 'url_name'),
           array(
-            array(
-              'name' => $tag_name,
-              'url_name' => trigger_event('render_tag_url', $tag_name),
-              )
+            'name' => $tag_name,
+            'url_name' => trigger_event('render_tag_url', $tag_name),
             )
           );
+
         $query = '
         SELECT id
           FROM '.TAGS_TABLE.'
@@ -146,6 +144,7 @@ SELECT id, name
         ;';
         $destination_tag = array_from_query($query, 'id');
         $destination_tag_id = $destination_tag[0];
+
         $query = '
         SELECT
             image_id
@@ -153,6 +152,7 @@ SELECT id, name
           WHERE tag_id = '.$tag_id.'
         ;';
         $destination_tag_image_ids = array_from_query($query, 'image_id');
+
         $inserts = array();
         foreach ($destination_tag_image_ids as $image_id)
         {
@@ -179,6 +179,7 @@ SELECT id, name
       }
     }
   }
+
   mass_updates(
     TAGS_TABLE,
     array(
@@ -323,34 +324,15 @@ if (isset($_GET['action']) and 'delete_orphans' == $_GET['action'])
 
 if (isset($_POST['add']) and !empty($_POST['add_tag']))
 {
-  $tag_name = $_POST['add_tag'];
-
-  // does the tag already exists?
-  $query = '
-SELECT id
-  FROM '.TAGS_TABLE.'
-  WHERE name = \''.$tag_name.'\'
-;';
-  $existing_tags = array_from_query($query, 'id');
-
-  if (count($existing_tags) == 0)
+  $ret = create_tag($_POST['add_tag']);
+  
+  if (isset($ret['error']))
   {
-    mass_inserts(
-      TAGS_TABLE,
-      array('name', 'url_name'),
-      array(
-        array(
-          'name' => $tag_name,
-          'url_name' => trigger_event('render_tag_url', $tag_name),
-          )
-        )
-      );
-
-    $page['infos'][] = l10n('Tag "%s" was added', stripslashes($tag_name));
+    $page['errors'][] = $ret['error'];
   }
   else
   {
-    $page['errors'][] = l10n('Tag "%s" already exists', stripslashes($tag_name));
+    $page['infos'][] = $ret['info'];
   }
 }
 
-- 
cgit v1.2.3