new function: label_create

diff --git a/functions.php b/functions.php
index 0fb1fc287dd0906184c68ac555f928cfa49f0084..af3dfe809b26493df7e551c93db8a6da1a90e87e 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -6004,6 +6004,28 @@
                db_query($link, "COMMIT");
        }
 
+       function label_create($link, $caption) {
+
+               db_query($link, "BEGIN");
+
+               $result = false;
+
+               $result = db_query($link, "SELECT id FROM ttrss_labels2
+                       WHERE caption = '$caption' AND owner_uid =  ". $_SESSION["uid"]);
+
+               if (db_num_rows($result) == 0) {
+                       $result = db_query($link,
+                               "INSERT INTO ttrss_labels2 (caption,owner_uid) 
+                                       VALUES ('$caption', '".$_SESSION["uid"]."')");
+
+                       $result = db_affected_rows($link, $result) != 0;
+               }
+
+               db_query($link, "COMMIT");
+
+               return $result;
+       }
+
        function print_labels_headlines_dropdown($link, $feed_id) {
                print "<li onclick=\"javascript:addLabel()\">
                        &nbsp;&nbsp;".__("Create label...")."</li>";

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index c645b12a1e0853d9cfc47aff5b1994162fa20899..b09a16cf56568ff21592dc47dd5341416543c506 100644 (file)
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -62,19 +62,10 @@
 
                        if ($caption) {
 
-                               $result = db_query($link, "SELECT id FROM ttrss_labels2
-                                       WHERE caption = '$caption' AND owner_uid =  ". $_SESSION["uid"]);
-
-                               if (db_num_rows($result) == 0) {
-
-                                       $result = db_query($link,
-                                               "INSERT INTO ttrss_labels2 (caption,owner_uid) 
-                                               VALUES ('$caption', '".$_SESSION["uid"]."')");
-
-                                       if (db_affected_rows($link, $result) != 0) {
-                                               print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
-                                       }
+                               if (label_create($link, $caption)) {
+                                       print T_sprintf("Created label <b>%s</b>", htmlspecialchars($caption));
                                }
+
                        }
 
                        return;