remove obsolete xml stuff in pref-users infoboxes

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

diff --git a/classes/pref/users.php b/classes/pref/users.php
index 0d7ca3c6e231fd2c599fd260fa6a729cc2894163..891a69a52b68b11759733d0e6de1a5e69ad05c6c 100644 (file)
--- a/classes/pref/users.php
+++ b/classes/pref/users.php
@@ -19,15 +19,8 @@ class Pref_Users extends Handler_Protected {
 
                function userdetails() {
 
-                       header("Content-Type: text/xml");
-                       print "<dlg>";
-
                        $uid = sprintf("%d", $_REQUEST["id"]);
 
-                       print "<title>".__('User details')."</title>";
-
-                       print "<content><![CDATA[";
-
                        $result = db_query($this->link, "SELECT login,
                                ".SUBSTRING_FOR_DATE."(last_login,1,16) AS last_login,
                                access_level,
@@ -106,22 +99,13 @@ class Pref_Users extends Handler_Protected {
                                <button onclick=\"closeInfoBox()\">".__("Close this window").
                                "</button></div>";
 
-                       print "]]></content></dlg>";
-
                        return;
                }
 
                function edit() {
                        global $access_level_names;
 
-                       header("Content-Type: text/xml");
-
-                       $id = db_escape_string($_REQUEST["id"]);
-
-                       print "<dlg id=\"$method\">";
-                       print "<title>".__('User Editor')."</title>";
-                       print "<content><![CDATA[";
-
+                       $id = db_escape_string($this->link, $_REQUEST["id"]);
                        print "<form id=\"user_edit_form\" onsubmit='return false'>";
 
                        print "<input type=\"hidden\" name=\"id\" value=\"$id\">";
@@ -193,17 +177,15 @@ class Pref_Users extends Handler_Protected {
                                <button onclick=\"return userEditCancel()\">".
                                        __('Cancel')."</button></div>";
 
-                       print "]]></content></dlg>";
-
                        return;
                }
 
                function editSave() {
-                       $login = db_escape_string(trim($_REQUEST["login"]));
-                       $uid = db_escape_string($_REQUEST["id"]);
+                       $login = db_escape_string($this->link, trim($_REQUEST["login"]));
+                       $uid = db_escape_string($this->link, $_REQUEST["id"]);
                        $access_level = (int) $_REQUEST["access_level"];
-                       $email = db_escape_string(trim($_REQUEST["email"]));
-                       $password = db_escape_string(trim($_REQUEST["password"]));
+                       $email = db_escape_string($this->link, trim($_REQUEST["email"]));
+                       $password = $_REQUEST["password"];
 
                        if ($password) {
                                $salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
@@ -214,13 +196,13 @@ class Pref_Users extends Handler_Protected {
                        }
 
                        db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
-                               access_level = '$access_level', email = '$email', otp_enabled = 'false'
+                               access_level = '$access_level', email = '$email', otp_enabled = false
                                WHERE id = '$uid'");
 
                }
 
                function remove() {
-                       $ids = split(",", db_escape_string($_REQUEST["ids"]));
+                       $ids = split(",", db_escape_string($this->link, $_REQUEST["ids"]));
 
                        foreach ($ids as $id) {
                                if ($id != $_SESSION["uid"] && $id != 1) {
@@ -233,7 +215,7 @@ class Pref_Users extends Handler_Protected {
 
                function add() {
 
-                       $login = db_escape_string(trim($_REQUEST["login"]));
+                       $login = db_escape_string($this->link, 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);
@@ -270,11 +252,9 @@ class Pref_Users extends Handler_Protected {
                        }
                }
 
-               function resetPass() {
+               static function resetUserPassword($link, $uid, $show_password) {
 
-                       $uid = db_escape_string($_REQUEST["id"]);
-
-                       $result = db_query($this->link, "SELECT login,email
+                       $result = db_query($link, "SELECT login,email
                                FROM ttrss_users WHERE id = '$uid'");
 
                        $login = db_fetch_result($result, 0, "login");
@@ -286,18 +266,18 @@ class Pref_Users extends Handler_Protected {
 
                        $pwd_hash = encrypt_password($tmp_user_pwd, $new_salt, true);
 
-                       db_query($this->link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
+                       db_query($link, "UPDATE ttrss_users SET pwd_hash = '$pwd_hash', salt = '$new_salt'
                                WHERE id = '$uid'");
 
-                       print T_sprintf("Changed password of user <b>%s</b>
-                                to <b>%s</b>", $login, $tmp_user_pwd);
+                       if ($show_password) {
+                               print T_sprintf("Changed password of user <b>%s</b> to <b>%s</b>", $login, $tmp_user_pwd);
+                       } else {
+                               print_notice(T_sprintf("Sending new password of user <b>%s</b> to <b>%s</b>", $login, $email));
+                       }
 
-                       require_once 'lib/phpmailer/class.phpmailer.php';
+                       require_once 'classes/ttrssmailer.php';
 
                        if ($email) {
-                               print " ";
-                               print T_sprintf("Notifying <b>%s</b>.", $email);
-
                                require_once "lib/MiniTemplator.class.php";
 
                                $tpl = new MiniTemplator;
@@ -313,35 +293,19 @@ class Pref_Users extends Handler_Protected {
 
                                $tpl->generateOutputToString($message);
 
-                               $mail = new PHPMailer();
-
-                               $mail->PluginDir = "lib/phpmailer/";
-                               $mail->SetLanguage("en", "lib/phpmailer/language/");
+                               $mail = new ttrssMailer();
 
-                               $mail->CharSet = "UTF-8";
-
-                               $mail->From = SMTP_FROM_ADDRESS;
-                               $mail->FromName = SMTP_FROM_NAME;
-                               $mail->AddAddress($email, $login);
-
-                               if (SMTP_HOST) {
-                                       $mail->Host = SMTP_HOST;
-                                       $mail->Mailer = "smtp";
-                                       $mail->SMTPAuth = SMTP_LOGIN != '';
-                                       $mail->Username = SMTP_LOGIN;
-                                       $mail->Password = SMTP_PASSWORD;
-                               }
-
-                               $mail->IsHTML(false);
-                               $mail->Subject = __("[tt-rss] Password change notification");
-                               $mail->Body = $message;
-
-                               $rc = $mail->Send();
+                               $rc = $mail->quickMail($email, $login,
+                                       __("[tt-rss] Password change notification"),
+                                       $message, false);
 
                                if (!$rc) print_error($mail->ErrorInfo);
                        }
+               }
 
-                       print "</div>";
+               function resetPass() {
+                       $uid = db_escape_string($this->link, $_REQUEST["id"]);
+                       Pref_Users::resetUserPassword($this->link, $uid, true);
                }
 
                function index() {
@@ -353,7 +317,7 @@ class Pref_Users extends Handler_Protected {
 
                        print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
 
-                       $user_search = db_escape_string($_REQUEST["search"]);
+                       $user_search = db_escape_string($this->link, $_REQUEST["search"]);
 
                        if (array_key_exists("search", $_REQUEST)) {
                                $_SESSION["prefs_user_search"] = $user_search;
@@ -368,7 +332,7 @@ class Pref_Users extends Handler_Protected {
                                        __('Search')."</button>
                                </div>";
 
-                       $sort = db_escape_string($_REQUEST["sort"]);
+                       $sort = db_escape_string($this->link, $_REQUEST["sort"]);
 
                        if (!$sort || $sort == "undefined") {
                                $sort = "login";