ShaYmez/FreeSTAR-Status-Engine
1
0
Fork 0
mirror of https://github.com/ShaYmez/FreeSTAR-Status-Engine.git synced 2024-11-23 12:48:39 -05:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vojtěch Sajdl 2018-04-20 16:40:12 +02:00
parent 186fd48666
commit f121211a14
No known key found for this signature in database
GPG Key ID: 082BC82518E5F32E
5 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
classes/constellation.php
View File

@ -18,7 +18,6 @@ class Constellation
* @param Boolean $admin - specifies whether to render admin controls
*/
public function render_incidents($future=false, $offset=0, $limit = 5, $admin = 0){
global $mysqli;
if ($offset<0)
{
$offset = 0;

2
classes/locale-negotiator.php
View File

@ -230,7 +230,7 @@ class LocaleNegotiator
$this->default_language = $default_language;
//Works only if the server supports the locale
//This basically means $accepted_langs[<lang_code>] = "<lang name>";
foreach ($tmp as $key => $value) {
foreach ($tmp as $value) {
$lang = basename($value);
$this->accepted_langs[$lang] = $this->all_locales[$lang];
}

4
classes/service.php
View File

@ -74,7 +74,7 @@ class Service implements JsonSerializable
$stmt = $mysqli->prepare("INSERT INTO services VALUES(NULL,?)");
$stmt->bind_param("s", $name);
$stmt->execute();
$query = $stmt->get_result();
$stmt->get_result();
header("Location: ".WEB_URL."/admin/?do=settings");
}else
{
@ -88,7 +88,7 @@ class Service implements JsonSerializable
*/
public static function delete()
{
global $user;
global $user, $message;
if ($user->get_rank()<=1)
{
global $mysqli;

18
classes/token.php
View File

@ -19,7 +19,7 @@ class Token
$stmt = $mysqli->prepare("INSERT INTO tokens VALUES(?, ?, ?, ?)");
$stmt->bind_param("siis", $token, $id, $expire, $data);
$stmt->execute();
$query = $stmt->get_result();
$stmt->get_result();
return $token;
}
@ -41,6 +41,22 @@ class Token
return $query->fetch_assoc()['count'];
}
/**
* Returns token data
* @param String $token
* @param int $id user ID
* @return String data
*/
public static function get_data($token, $id)
{
global $mysqli;
$stmt = $mysqli->prepare("SELECT data as count FROM tokens WHERE token = ? AND user = ?");
$stmt->bind_param("si", $token, $id);
$stmt->execute();
$query = $stmt->get_result();
return $query->fetch_assoc()['data'];
}
/**
* Deletes token.
* @param String $token

28
classes/user.php
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;