public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-13 15:25:59 +00:00
Code Issues Releases Wiki Activity

fix blank character after opening bracket in function calls

Browse Source
This commit is contained in:
Andrew Dolgov
2013-04-17 18:34:18 +04:00
parent 72ff013729
commit a42c55f02b
56 changed files with 1399 additions and 1399 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/auth_internal/init.php
View File

@@ -19,12 +19,12 @@ class Auth_Internal extends Plugin implements IAuthModule {
$pwd_hash1 = encrypt_password($password);
$pwd_hash2 = encrypt_password($password, $login);
$login = db_escape_string( $login);
$otp = db_escape_string( $_REQUEST["otp"]);
$login = db_escape_string($login);
$otp = db_escape_string($_REQUEST["otp"]);
if (get_schema_version() > 96) {
if (!defined('AUTH_DISABLE_OTP') || !AUTH_DISABLE_OTP) {
$result = db_query( "SELECT otp_enabled,salt FROM ttrss_users WHERE
$result = db_query("SELECT otp_enabled,salt FROM ttrss_users WHERE
login = '$login'");
if (db_num_rows($result) > 0) {
@@ -74,7 +74,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
if (get_schema_version() > 87) {
$result = db_query( "SELECT salt FROM ttrss_users WHERE
$result = db_query("SELECT salt FROM ttrss_users WHERE
login = '$login'");
if (db_num_rows($result) != 1) {
@@ -92,7 +92,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
// verify and upgrade password to new salt base
$result = db_query( $query);
$result = db_query($query);
if (db_num_rows($result) == 1) {
// upgrade password to MODE2
@@ -100,7 +100,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
$salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$pwd_hash = encrypt_password($password, $salt, true);
db_query( "UPDATE ttrss_users SET
db_query("UPDATE ttrss_users SET
pwd_hash = '$pwd_hash', salt = '$salt' WHERE login = '$login'");
$query = "SELECT id
@@ -128,7 +128,7 @@ class Auth_Internal extends Plugin implements IAuthModule {
pwd_hash = '$pwd_hash2')";
}
$result = db_query( $query);
$result = db_query($query);
if (db_num_rows($result) == 1) {
return db_fetch_result($result, 0, "id");
@@ -138,9 +138,9 @@ class Auth_Internal extends Plugin implements IAuthModule {
}
function check_password($owner_uid, $password) {
$owner_uid = db_escape_string( $owner_uid);
$owner_uid = db_escape_string($owner_uid);
$result = db_query( "SELECT salt,login FROM ttrss_users WHERE
$result = db_query("SELECT salt,login FROM ttrss_users WHERE
id = '$owner_uid'");
$salt = db_fetch_result($result, 0, "salt");
@@ -161,20 +161,20 @@ class Auth_Internal extends Plugin implements IAuthModule {
id = '$owner_uid' AND pwd_hash = '$password_hash'";
}
$result = db_query( $query);
$result = db_query($query);
return db_num_rows($result) != 0;
}
function change_password($owner_uid, $old_password, $new_password) {
$owner_uid = db_escape_string( $owner_uid);
$owner_uid = db_escape_string($owner_uid);
if ($this->check_password($owner_uid, $old_password)) {
$new_salt = substr(bin2hex(get_random_bytes(125)), 0, 250);
$new_password_hash = encrypt_password($new_password, $new_salt, true);
db_query( "UPDATE ttrss_users SET
db_query("UPDATE ttrss_users SET
pwd_hash = '$new_password_hash', salt = '$new_salt', otp_enabled = false
WHERE id = '$owner_uid'");