diff options
| -rw-r--r-- | functions.php | 22 | ||||
| -rw-r--r-- | modules/pref-labels.php | 15 |
2 files changed, 25 insertions, 12 deletions
diff --git a/functions.php b/functions.php index 0fb1fc287..af3dfe809 100644 --- 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()\"> ".__("Create label...")."</li>"; diff --git a/modules/pref-labels.php b/modules/pref-labels.php index c645b12a1..b09a16cf5 100644 --- 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; |