remove $link

[tt-rss.git] / classes / pref / users.php

diff --git a/classes/pref/users.php b/classes/pref/users.php
index bd2fff735346e624da8a2553132f1001d10fd1d5..a9c3689fdeaf2ca2ebc6136595905cc9e539ea11 100644 (file)
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -21,7 +21,7 @@ class Pref_Users extends Handler_Protected {
 
                        $uid = sprintf("%d", $_REQUEST["id"]);
 
-                       $result = db_query($this->link, "SELECT login,
+                       $result = db_query( "SELECT login,
                                ".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
                                access_level,
                                (SELECT COUNT(int_id) FROM ttrss_user_entries
@@ -41,10 +41,10 @@ class Pref_Users extends Handler_Protected {
 
                        print "<table width='100%'>";
 
-                       $last_login = make_local_datetime($this->link,
+                       $last_login = make_local_datetime(
                                db_fetch_result($result, 0, "last_login"), true);
 
-                       $created = make_local_datetime($this->link,
+                       $created = make_local_datetime(
                                db_fetch_result($result, 0, "created"), true);
 
                        $access_level = db_fetch_result($result, 0, "access_level");
@@ -53,7 +53,7 @@ class Pref_Users extends Handler_Protected {
                        print "<tr><td>".__('Registered')."</td><td>$created</td></tr>";
                        print "<tr><td>".__('Last logged in')."</td><td>$last_login</td></tr>";
 
-                       $result = db_query($this->link, "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
+                       $result = db_query( "SELECT COUNT(id) as num_feeds FROM ttrss_feeds
                                WHERE owner_uid = '$uid'");
 
                        $num_feeds = db_fetch_result($result, 0, "num_feeds");
@@ -64,7 +64,7 @@ class Pref_Users extends Handler_Protected {
 
                        print "<h1>".__('Subscribed feeds')."</h1>";
 
-                       $result = db_query($this->link, "SELECT id,title,site_url FROM ttrss_feeds
+                       $result = db_query( "SELECT id,title,site_url FROM ttrss_feeds
                                WHERE owner_uid = '$uid' ORDER BY title");
 
                        print "<ul class=\"userFeedList\">";
@@ -105,14 +105,14 @@ class Pref_Users extends Handler_Protected {
                function edit() {
                        global $access_level_names;
 
-                       $id = db_escape_string($this->link, $_REQUEST["id"]);
+                       $id = db_escape_string( $_REQUEST["id"]);
                        print "<form id=\"user_edit_form\" onsubmit='return false'>";
 
                        print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
                        print "<input type=\"hidden\" name=\"op\" value=\"pref-users\">";
                        print "<input type=\"hidden\" name=\"method\" value=\"editSave\">";
 
-                       $result = db_query($this->link, "SELECT * FROM ttrss_users WHERE id = '$id'");
+                       $result = db_query( "SELECT * FROM ttrss_users WHERE id = '$id'");
 
                        $login = db_fetch_result($result, 0, "login");
                        $access_level = db_fetch_result($result, 0, "access_level");
@@ -181,10 +181,10 @@ class Pref_Users extends Handler_Protected {
                }
 
                function editSave() {
-                       $login = db_escape_string($this->link, trim($_REQUEST["login"]));
-                       $uid = db_escape_string($this->link, $_REQUEST["id"]);
+                       $login = db_escape_string( trim($_REQUEST["login"]));
+                       $uid = db_escape_string( $_REQUEST["id"]);
                        $access_level = (int) $_REQUEST["access_level"];
-                       $email = db_escape_string($this->link, trim($_REQUEST["email"]));
+                       $email = db_escape_string( trim($_REQUEST["email"]));
                        $password = $_REQUEST["password"];
 
                        if ($password) {
@@ -195,42 +195,42 @@ class Pref_Users extends Handler_Protected {
                                $pass_query_part = "";
                        }
 
-                       db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
+                       db_query( "UPDATE ttrss_users SET $pass_query_part login = '$login',
                                access_level = '$access_level', email = '$email', otp_enabled = false
                                WHERE id = '$uid'");
 
                }
 
                function remove() {
-                       $ids = explode(",", db_escape_string($this->link, $_REQUEST["ids"]));
+                       $ids = explode(",", db_escape_string( $_REQUEST["ids"]));
 
                        foreach ($ids as $id) {
                                if ($id != $_SESSION["uid"] && $id != 1) {
-                                       db_query($this->link, "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
-                                       db_query($this->link, "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
-                                       db_query($this->link, "DELETE FROM ttrss_users WHERE id = '$id'");
+                                       db_query( "DELETE FROM ttrss_tags WHERE owner_uid = '$id'");
+                                       db_query( "DELETE FROM ttrss_feeds WHERE owner_uid = '$id'");
+                                       db_query( "DELETE FROM ttrss_users WHERE id = '$id'");
                                }
                        }
                }
 
                function add() {
 
-                       $login = db_escape_string($this->link, trim($_REQUEST["login"]));
+                       $login = db_escape_string( trim($_REQUEST["login"]));
                        $tmp_user_pwd = make_password(8);
                        $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
                        $pwd_hash = encrypt_password($tmp_user_pwd, $salt, true);
 
-                       $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
+                       $result = db_query( "SELECT id FROM ttrss_users WHERE
                                login = '$login'");
 
                        if (db_num_rows($result) == 0) {
 
-                               db_query($this->link, "INSERT INTO ttrss_users
+                               db_query( "INSERT INTO ttrss_users
                                        (login,pwd_hash,access_level,last_login,created, salt)
                                        VALUES ('$login', '$pwd_hash', 0, null, NOW(), '$salt')");
 
 
-                               $result = db_query($this->link, "SELECT id FROM ttrss_users WHERE
+                               $result = db_query( "SELECT id FROM ttrss_users WHERE
                                        login = '$login' AND pwd_hash = '$pwd_hash'");
 
                                if (db_num_rows($result) == 1) {
@@ -240,7 +240,7 @@ class Pref_Users extends Handler_Protected {
                                        print format_notice(T_sprintf("Added user <b>%s</b> with password <b>%s</b>",
                                                $login, $tmp_user_pwd));
 
-                                       initialize_user($this->link, $new_uid);
+                                       initialize_user( $new_uid);
 
                                } else {
 
@@ -304,8 +304,8 @@ class Pref_Users extends Handler_Protected {
                }
 
                function resetPass() {
-                       $uid = db_escape_string($this->link, $_REQUEST["id"]);
-                       Pref_Users::resetUserPassword($this->link, $uid, true);
+                       $uid = db_escape_string( $_REQUEST["id"]);
+                       Pref_Users::resetUserPassword( $uid, true);
                }
 
                function index() {
@@ -317,7 +317,7 @@ class Pref_Users extends Handler_Protected {
 
                        print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-                       $user_search = db_escape_string($this->link, $_REQUEST["search"]);
+                       $user_search = db_escape_string( $_REQUEST["search"]);
 
                        if (array_key_exists("search", $_REQUEST)) {
                                $_SESSION["prefs_user_search"] = $user_search;
@@ -332,7 +332,7 @@ class Pref_Users extends Handler_Protected {
                                        __('Search')."</button>
                                </div>";
 
-                       $sort = db_escape_string($this->link, $_REQUEST["sort"]);
+                       $sort = db_escape_string( $_REQUEST["sort"]);
 
                        if (!$sort || $sort == "undefined") {
                                $sort = "login";
@@ -381,7 +381,7 @@ class Pref_Users extends Handler_Protected {
                                $user_search_query = "";
                        }
 
-                       $result = db_query($this->link, "SELECT
+                       $result = db_query( "SELECT
                                        id,login,access_level,email,
                                        ".SUBSTRING_FOR_DATE."(last_login,1,16) as last_login,
                                        ".SUBSTRING_FOR_DATE."(created,1,16) as created
@@ -416,8 +416,8 @@ class Pref_Users extends Handler_Protected {
 
                                $line["login"] = htmlspecialchars($line["login"]);
 
-                               $line["created"] = make_local_datetime($this->link, $line["created"], false);
-                               $line["last_login"] = make_local_datetime($this->link, $line["last_login"], false);
+                               $line["created"] = make_local_datetime( $line["created"], false);
+                               $line["last_login"] = make_local_datetime( $line["last_login"], false);
 
                                print "<td align='center'><input onclick='toggleSelectRow2(this);'
                                        dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"