X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=plugins%2Fauth_remote%2Finit.php;h=f0da1afc8b51ee9d0dc685f5b19d46a291d60ff6;hb=6322ac79a020ab584d412d782d62b2ee77d7c6cf;hp=7e4638fb2b9ac67a638be1e9bb95ec6b5cdcd316;hpb=aca75cb5cb323535099c7aef46a78ea3cec082f2;p=tt-rss.git diff --git a/plugins/auth_remote/init.php b/plugins/auth_remote/init.php index 7e4638fb..f0da1afc 100644 --- a/plugins/auth_remote/init.php +++ b/plugins/auth_remote/init.php @@ -1,7 +1,6 @@ link = $host->get_link(); $this->host = $host; - $this->base = new Auth_Base($this->link); + $this->base = new Auth_Base(); $host->add_hook($host::HOOK_AUTH_USER, $this); } function get_login_by_ssl_certificate() { - $cert_serial = db_escape_string($this->link, get_ssl_certificate_id()); + $cert_serial = db_escape_string( get_ssl_certificate_id()); if ($cert_serial) { - $result = db_query($this->link, "SELECT login FROM ttrss_user_prefs, ttrss_users + $result = db_query( "SELECT login FROM ttrss_user_prefs, ttrss_users WHERE pref_name = 'SSL_CERT_SERIAL' AND value = '$cert_serial' AND owner_uid = ttrss_users.id"); if (db_num_rows($result) != 0) { - return db_escape_string($this->link, db_fetch_result($result, 0, "login")); + return db_escape_string( db_fetch_result($result, 0, "login")); } } @@ -38,10 +36,10 @@ class Auth_Remote extends Plugin implements IAuthModule { function authenticate($login, $password) { - $try_login = db_escape_string($this->link, $_SERVER["REMOTE_USER"]); + $try_login = db_escape_string( $_SERVER["REMOTE_USER"]); // php-cgi - if (!$try_login) $try_login = db_escape_string($this->link, $_SERVER["REDIRECT_REMOTE_USER"]); + if (!$try_login) $try_login = db_escape_string( $_SERVER["REDIRECT_REMOTE_USER"]); if (!$try_login) $try_login = $this->get_login_by_ssl_certificate(); # if (!$try_login) $try_login = "test_qqq"; @@ -60,15 +58,15 @@ class Auth_Remote extends Plugin implements IAuthModule { // update user name $fullname = $_SERVER['HTTP_USER_NAME'] ? $_SERVER['HTTP_USER_NAME'] : $_SERVER['AUTHENTICATE_CN']; if ($fullname){ - $fullname = db_escape_string($this->link, $fullname); - db_query($this->link, "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " . + $fullname = db_escape_string( $fullname); + db_query( "UPDATE ttrss_users SET full_name = '$fullname' WHERE id = " . $user_id); } // update user mail $email = $_SERVER['HTTP_USER_MAIL'] ? $_SERVER['HTTP_USER_MAIL'] : $_SERVER['AUTHENTICATE_MAIL']; if ($email){ - $email = db_escape_string($this->link, $email); - db_query($this->link, "UPDATE ttrss_users SET email = '$email' WHERE id = " . + $email = db_escape_string( $email); + db_query( "UPDATE ttrss_users SET email = '$email' WHERE id = " . $user_id); } }