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,
+ $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
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");
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");
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\">";
<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( $_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");
print "<br/>";
print __('Change password to') .
- " <input size=\"20\" onkeypress=\"return filterCR(event, userEditSave)\"
+ " <input type=\"password\" size=\"20\" onkeypress=\"return filterCR(event, userEditSave)\"
name=\"password\">";
print "</div>";
<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( trim($_REQUEST["login"]));
+ $uid = db_escape_string( $_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( trim($_REQUEST["email"]));
+ $password = $_REQUEST["password"];
if ($password) {
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pass_query_part = "";
}
- db_query($this->link, "UPDATE ttrss_users SET $pass_query_part login = '$login',
- access_level = '$access_level', email = '$email', otp_enabled = 'false'
+ 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 = split(",", db_escape_string($_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(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) {
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 {
}
}
- 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");
$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;
$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( $_REQUEST["id"]);
+ Pref_Users::resetUserPassword( $uid, true);
}
function index() {
print "<div id=\"pref-user-toolbar\" dojoType=\"dijit.Toolbar\">";
- $user_search = db_escape_string($_REQUEST["search"]);
+ $user_search = db_escape_string( $_REQUEST["search"]);
if (array_key_exists("search", $_REQUEST)) {
$_SESSION["prefs_user_search"] = $user_search;
__('Search')."</button>
</div>";
- $sort = db_escape_string($_REQUEST["sort"]);
+ $sort = db_escape_string( $_REQUEST["sort"]);
if (!$sort || $sort == "undefined") {
$sort = "login";
if ($user_search) {
- $user_search = split(" ", $user_search);
+ $user_search = explode(" ", $user_search);
$tokens = array();
foreach ($user_search as $token) {
$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
print "<tr class=\"title\">
<td align='center' width=\"5%\"> </td>
- <td width=''><a href=\"#\" onclick=\"updateUsersList('login')\">".__('Login')."</a></td>
- <td width='
20%'><a href=\"#\" onclick=\"updateUsersList('access_level')\">".__('Access Level')."</a></td>
+ <td width='
30%'><a href=\"#\" onclick=\"updateUsersList('login')\">".__('Login')."</a></td>
+ <td width='
30%'><a href=\"#\" onclick=\"updateUsersList('access_level')\">".__('Access Level')."</a></td>
<td width='20%'><a href=\"#\" onclick=\"updateUsersList('created')\">".__('Registered')."</a></td>
<td width='20%'><a href=\"#\" onclick=\"updateUsersList('last_login')\">".__('Last login')."</a></td></tr>";
$uid = $line["id"];
- print "<tr class=\"$class\" id=\"UMRR-$uid\">";
+ print "<tr id=\"UMRR-$uid\">";
$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='toggleSelectRow(this);'
- type=\"checkbox\" id=\"UMCHK-$uid\"></td>";
+ print "<td align='center'><input onclick='toggleSelectRow2(this);'
+ dojoType=\"dijit.form.CheckBox\" type=\"checkbox\"
+ id=\"UMCHK-$uid\"></td>";
$onclick = "onclick='editUser($uid, event)' title='".__('Click to edit')."'";
git.wh0rd.org / tt-rss.git / blobdiff