Re #33 - remove bunch of dead code & fix some bugs

This commit is contained in:
Vojtěch Sajdl
2018-04-20 16:40:12 +02:00
parent 186fd48666
commit f121211a14
5 changed files with 31 additions and 22 deletions
+11 -17
View File
@@ -84,12 +84,7 @@ class User
public function toggle()
{
global $mysqli, $message, $user;
$id = $_SESSION['user'];
$stmt = $mysqli->prepare("SELECT permission FROM users WHERE id=?");
$stmt->bind_param("i", $id);
$stmt->execute();
$query = $stmt->get_result();
$permission = $result['permission'];
$id = $_GET['id'];
if ($this->id!=$_SESSION['user'] && $user->get_rank()<=1 && ($user->get_rank()<$this->rank))
{
@@ -274,10 +269,10 @@ class User
*/
public static function restore_session()
{
global $mysqli, $message;
global $message;
$id = $_COOKIE['user'];
$token = $_COOKIE['token'];
$time = time();
if (Token::validate_token($token, $id, "remember"))
{
$year = strtotime('+356 days', time());
@@ -405,7 +400,7 @@ class User
*/
public function change_password($token = false)
{
global $mysqli, $user, $message;
global $mysqli, $message;
$time = time();
$id = $this->id;
if ($_POST['password']!=$_POST['password_repeat'])
@@ -440,9 +435,9 @@ class User
$stmt->execute();
$stmt->close();
$stmt = $mysqli->prepare("DELETE FROM tokens WHERE user = ? AND data = 'remember'");
$stmt->bind_param("d", $id);
$stmt->execute();
$query = $stmt->get_result();
$stmt->bind_param("d", $id);
$stmt->execute();
$query = $stmt->get_result();
User::logout();
}
else{
@@ -466,9 +461,9 @@ class User
$stmt->execute();
$stmt->close();
$stmt = $mysqli->prepare("DELETE FROM tokens WHERE user = ? AND data = 'remember'");
$stmt->bind_param("d", $id);
$stmt->execute();
$query = $stmt->get_result();
$stmt->bind_param("d", $id);
$stmt->execute();
$query = $stmt->get_result();
}
else
{
@@ -517,14 +512,13 @@ class User
* @return void
*/
public function email_link(){
global $mysqli;
global $user;
$email = $_POST['email'];
$time = strtotime('+1 day', time());
$id = $this->id;
$token = Token::add($id, 'email;$email', $time);
$link = WEB_URL."/admin/?do=change-email&id=$id&token=$token";
$to = $email;
$subject = _('Email change').' - '.NAME;