remove $link

[tt-rss.git] / include / labels.php

diff --git a/include/labels.php b/include/labels.php
index 655b51555e219698932c39974ad5e56cc8aa62cc..fc23fca935ce63f511600978fae8d70232a6f33c 100644 (file)
--- a/include/labels.php
+++ b/include/labels.php
@@ -1,6 +1,6 @@
 <?php
-       function label_find_id($link, $label, $owner_uid) {
-               $result = db_query($link,
+       function label_find_id( $label, $owner_uid) {
+               $result = db_query(
                        "SELECT id FROM ttrss_labels2 WHERE caption = '$label'
                                AND owner_uid = '$owner_uid' LIMIT 1");
 
@@ -11,12 +11,12 @@
                }
        }
 
-       function get_article_labels($link, $id, $owner_uid = false) {
+       function get_article_labels( $id, $owner_uid = false) {
                $rv = array();
 
                if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-               $result = db_query($link, "SELECT label_cache FROM
+               $result = db_query( "SELECT label_cache FROM
                        ttrss_user_entries WHERE ref_id = '$id' AND owner_uid = " .
                        $owner_uid);
 
@@ -33,7 +33,7 @@
                        }
                }
 
-               $result = db_query($link,
+               $result = db_query(
                        "SELECT DISTINCT label_id,caption,fg_color,bg_color
                                FROM ttrss_labels2, ttrss_user_labels2
                        WHERE id = label_id
@@ -48,16 +48,16 @@
                }
 
                if (count($rv) > 0)
-                       label_update_cache($link, $owner_uid, $id, $rv);
+                       label_update_cache( $owner_uid, $id, $rv);
                else
-                       label_update_cache($link, $owner_uid, $id, array("no-labels" => 1));
+                       label_update_cache( $owner_uid, $id, array("no-labels" => 1));
 
                return $rv;
        }
 
 
-       function label_find_caption($link, $label, $owner_uid) {
-               $result = db_query($link,
+       function label_find_caption( $label, $owner_uid) {
+               $result = db_query(
                        "SELECT caption FROM ttrss_labels2 WHERE id = '$label'
                                AND owner_uid = '$owner_uid' LIMIT 1");
 
@@ -68,10 +68,10 @@
                }
        }
 
-       function get_all_labels($link, $owner_uid) {
+       function get_all_labels( $owner_uid) {
                $rv = array();
 
-               $result = db_query($link, "SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
+               $result = db_query( "SELECT fg_color, bg_color, caption FROM ttrss_labels2 WHERE owner_uid = " . $owner_uid);
 
                while ($line = db_fetch_assoc($result)) {
                        array_push($rv, $line);
@@ -80,50 +80,50 @@
                return $rv;
        }
 
-       function label_update_cache($link, $owner_uid, $id, $labels = false, $force = false) {
+       function label_update_cache( $owner_uid, $id, $labels = false, $force = false) {
 
                if ($force)
-                       label_clear_cache($link, $id);
+                       label_clear_cache( $id);
 
                if (!$labels)
-                       $labels = get_article_labels($link, $id);
+                       $labels = get_article_labels( $id);
 
-               $labels = db_escape_string($link, json_encode($labels));
+               $labels = db_escape_string( json_encode($labels));
 
-               db_query($link, "UPDATE ttrss_user_entries SET
+               db_query( "UPDATE ttrss_user_entries SET
                        label_cache = '$labels' WHERE ref_id = '$id' AND  owner_uid = '$owner_uid'");
 
        }
 
-       function label_clear_cache($link, $id) {
+       function label_clear_cache( $id) {
 
-               db_query($link, "UPDATE ttrss_user_entries SET
+               db_query( "UPDATE ttrss_user_entries SET
                        label_cache = '' WHERE ref_id = '$id'");
 
        }
 
-       function label_remove_article($link, $id, $label, $owner_uid) {
+       function label_remove_article( $id, $label, $owner_uid) {
 
-               $label_id = label_find_id($link, $label, $owner_uid);
+               $label_id = label_find_id( $label, $owner_uid);
 
                if (!$label_id) return;
 
-               $result = db_query($link,
+               $result = db_query(
                        "DELETE FROM ttrss_user_labels2
                        WHERE
                                label_id = '$label_id' AND
                                article_id = '$id'");
 
-               label_clear_cache($link, $id);
+               label_clear_cache( $id);
        }
 
-       function label_add_article($link, $id, $label, $owner_uid) {
+       function label_add_article( $id, $label, $owner_uid) {
 
-               $label_id = label_find_id($link, $label, $owner_uid);
+               $label_id = label_find_id( $label, $owner_uid);
 
                if (!$label_id) return;
 
-               $result = db_query($link,
+               $result = db_query(
                        "SELECT
                                article_id FROM ttrss_labels2, ttrss_user_labels2
                        WHERE
@@ -133,66 +133,66 @@
                        LIMIT 1");
 
                if (db_num_rows($result) == 0) {
-                       db_query($link, "INSERT INTO ttrss_user_labels2
+                       db_query( "INSERT INTO ttrss_user_labels2
                                (label_id, article_id) VALUES ('$label_id', '$id')");
                }
 
-               label_clear_cache($link, $id);
+               label_clear_cache( $id);
 
        }
 
-       function label_remove($link, $id, $owner_uid) {
+       function label_remove( $id, $owner_uid) {
                if (!$owner_uid) $owner_uid = $_SESSION["uid"];
 
-               db_query($link, "BEGIN");
+               db_query( "BEGIN");
 
-               $result = db_query($link, "SELECT caption FROM ttrss_labels2
+               $result = db_query( "SELECT caption FROM ttrss_labels2
                        WHERE id = '$id'");
 
                $caption = db_fetch_result($result, 0, "caption");
 
-               $result = db_query($link, "DELETE FROM ttrss_labels2 WHERE id = '$id'
+               $result = db_query( "DELETE FROM ttrss_labels2 WHERE id = '$id'
                        AND owner_uid = " . $owner_uid);
 
-               if (db_affected_rows($link, $result) != 0 && $caption) {
+               if (db_affected_rows( $result) != 0 && $caption) {
 
                        /* Remove access key for the label */
 
                        $ext_id = LABEL_BASE_INDEX - 1 - $id;
 
-                       db_query($link, "DELETE FROM ttrss_access_keys WHERE
+                       db_query( "DELETE FROM ttrss_access_keys WHERE
                                feed_id = '$ext_id' AND owner_uid = $owner_uid");
 
                        /* Remove cached data */
 
-                       db_query($link, "UPDATE ttrss_user_entries SET label_cache = ''
+                       db_query( "UPDATE ttrss_user_entries SET label_cache = ''
                                WHERE label_cache LIKE '%$caption%' AND owner_uid = " . $owner_uid);
 
                }
 
-               db_query($link, "COMMIT");
+               db_query( "COMMIT");
        }
 
-       function label_create($link, $caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
+       function label_create( $caption, $fg_color = '', $bg_color = '', $owner_uid = false) {
 
                if (!$owner_uid) $owner_uid = $_SESSION['uid'];
 
-               db_query($link, "BEGIN");
+               db_query( "BEGIN");
 
                $result = false;
 
-               $result = db_query($link, "SELECT id FROM ttrss_labels2
+               $result = db_query( "SELECT id FROM ttrss_labels2
                        WHERE caption = '$caption' AND owner_uid = $owner_uid");
 
                if (db_num_rows($result) == 0) {
-                       $result = db_query($link,
+                       $result = db_query(
                                "INSERT INTO ttrss_labels2 (caption,owner_uid,fg_color,bg_color)
                                        VALUES ('$caption', '$owner_uid', '$fg_color', '$bg_color')");
 
-                       $result = db_affected_rows($link, $result) != 0;
+                       $result = db_affected_rows( $result) != 0;
                }
 
-               db_query($link, "COMMIT");
+               db_query( "COMMIT");
 
                return $result;
        }