Digitalstack/ZnoteAAC
2
0
Fork 0
mirror of https://github.com/Znote/ZnoteAAC.git synced 2025-10-13 18:04:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix #429 Various warnings

Browse Source 
Rewrote other characters on this account list in characterprofile
Added hash_equal() backport for low PHP versions
Fixed some warnings
This commit is contained in:
Znote
2020-07-08 00:35:45 +02:00
parent 5d9b0f3d00
commit 4b0db861d5
4 changed files with 211 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
engine/function/general.php
View File

@@ -70,10 +70,10 @@ function generate_recovery_key($lenght) {
$tmp = rand(1000, 9000);
$tmp += time();
$tmp = sha1($tmp);
$results = '';
for ($i = 0; $i < $lenght; $i++) $results = $results.''.$tmp[$i];
return $results;
}
@@ -81,7 +81,7 @@ function generate_recovery_key($lenght) {
function calculate_discount($orig, $new) {
$orig = (int)$orig;
$new = (int)$new;
$tmp = '';
if ($new >= $orig) {
if ($new != $orig) {
@@ -122,14 +122,14 @@ function znote_visitors_get_data() {
function znote_visitor_set_data($visitor_data) {
$exist = false;
$ip = getIPLong();
foreach ((array)$visitor_data as $row) {
if ($ip == $row['ip']) {
$exist = true;
$value = $row['value'];
}
}
if ($exist && isset($value)) {
// Update the value
$value++;
@@ -178,7 +178,7 @@ function create_token() {
var_dump($token, $token2);
$_SESSION['token'] = $token2;
#}
echo "<input type=\"hidden\" name=\"token\" value=\"". $_SESSION['token'] ."\" />";
}
function reset_token() {
@@ -393,10 +393,10 @@ function protect_page() {
}
// When function is called, you will be redirected to protect_page and deny access to rest of page, as long as you are not admin.
function admin_only($user_data) {
function admin_only($user_data) {
// Chris way
$gotAccess = is_admin($user_data);
if ($gotAccess == false) {
logged_in_redirect();
exit();
@@ -407,7 +407,7 @@ function is_admin($user_data) {
if (config('ServerEngine') === 'OTHIRE')
return in_array($user_data['id'], config('page_admin_access')) ? true : false;
else
return in_array($user_data['name'], config('page_admin_access')) ? true : false;
return in_array($user_data['name'], config('page_admin_access')) ? true : false;
}
function array_sanitize(&$item) {
@@ -472,7 +472,7 @@ function check_image($image) {
// Last one
if ($path_info['extension'] === 'gif') {
// Resize image
$img = resize_imagex($image_data, 100, 100);
@@ -595,4 +595,19 @@ function random_bytes_compat($length, &$crypto_strong = null) {
}
return $ret;
}
// hash_equals legacy support < 5.6
if(!function_exists('hash_equals')) {
function hash_equals($str1, $str2) {
if(strlen($str1) != strlen($str2)) {
return false;
}
$res = $str1 ^ $str2;
$ret = 0;
for($i = strlen($res) - 1; $i >= 0; $i--) {
$ret |= ord($res[$i]);
}
return !$ret;
}
}
?>

41
engine/function/users.php
View File

@@ -105,28 +105,27 @@ function fetchLatestDeaths_03($rowz = 30, $killers = false) {
// Support list
function support_list() {
$TFS = Config('ServerEngine');
if ($TFS == 'TFS_10') $staffs = mysql_select_multi("SELECT `p`.`id`, `a`.`type` as `group_id`, `p`.`name`, `p`.`account_id` FROM `players` AS `p` INNER JOIN `accounts` AS `a` ON `p`.`account_id` = `a`.`id` WHERE `a`.`type` > 1 ORDER BY `p`.`account_id` DESC, `p`.`group_id` ASC, `p`.`level` ASC;");
else $staffs = mysql_select_multi("SELECT `a`.`type` as `group_id`, `p`.`name`, `p`.`online`, `p`.`account_id` FROM `players` AS `p` INNER JOIN `accounts` AS `a` ON `a`.`id` = `p`.`account_id` WHERE `a`.`type` > 1 ORDER BY `p`.`account_id` DESC, `p`.`group_id` ASC, `p`.`level` ASC;");
foreach($staffs as $k => $v) {
foreach($staffs as $key => $value) {
if($k != $key && $v['account_id'] == $value['account_id']) {
unset($staffs[$k]);
}
}
$TFS = Config('ServerEngine');
if ($TFS == 'TFS_10') $staffs = mysql_select_multi("SELECT `p`.`id`, `a`.`type` as `group_id`, `p`.`name`, `p`.`account_id` FROM `players` AS `p` INNER JOIN `accounts` AS `a` ON `p`.`account_id` = `a`.`id` WHERE `a`.`type` > 1 ORDER BY `p`.`account_id` DESC, `p`.`group_id` ASC, `p`.`level` ASC;");
else $staffs = mysql_select_multi("SELECT `a`.`type` as `group_id`, `p`.`name`, `p`.`online`, `p`.`account_id` FROM `players` AS `p` INNER JOIN `accounts` AS `a` ON `a`.`id` = `p`.`account_id` WHERE `a`.`type` > 1 ORDER BY `p`.`account_id` DESC, `p`.`group_id` ASC, `p`.`level` ASC;");
if ($staffs !== false) {
foreach($staffs as $k => $v) {
foreach($staffs as $key => $value) {
if($k != $key && $v['account_id'] == $value['account_id']) {
unset($staffs[$k]);
}
}
}
$staffs = array_values($staffs);
if ($TFS == 'TFS_10') {
for ($i = 0; $i < count($staffs); $i++) {
// Fix online status on TFS 1.0
$staffs[$i]['online'] = (isset($staffs[$i]['id']) && user_is_online_10($staffs[$i]['id'])) ? 1 : 0;
unset($staffs[$i]['id']);
}
}
}
$staffs = array_values($staffs);
if ($staffs !== false && $TFS == 'TFS_10') {
for ($i = 0; $i < count($staffs); $i++) {
// Fix online status on TFS 1.0
$staffs[$i]['online'] = (isset($staffs[$i]['id']) && user_is_online_10($staffs[$i]['id'])) ? 1 : 0;
unset($staffs[$i]['id']);
}
}
return $staffs;
return $staffs;
}
function support_list03() {