From dfaf4e344fbf637aaf0372e7cdabb939c9ca84b4 Mon Sep 17 00:00:00 2001 From: gilad Date: Sat, 2 Apr 2022 12:40:12 +0300 Subject: [PATCH] mysql to mysqli - php 74 --- csfmanager/csfmanager.php | 18 +++++++++--------- csfmanager/includes/functions.php | 2 +- csfmanager/views/allowedlog_default.php | 10 +++++----- csfmanager/views/allowkeys_default.php | 12 ++++++------ csfmanager/views/broadcast_apply.php | 2 +- csfmanager/views/broadcast_default.php | 2 +- csfmanager/views/broadcast_selectservers.php | 2 +- csfmanager/views/broadcast_send.php | 2 +- csfmanager/views/broadcast_setconfig.php | 2 +- csfmanager/views/firewall_default.php | 2 +- csfmanager/views/firewall_manage.php | 2 +- csfmanager/views/generatekey_default.php | 4 ++-- csfmanager/views/settings_default.php | 2 +- 13 files changed, 31 insertions(+), 31 deletions(-) diff --git a/csfmanager/csfmanager.php b/csfmanager/csfmanager.php index 10309c0..304f71f 100644 --- a/csfmanager/csfmanager.php +++ b/csfmanager/csfmanager.php @@ -331,7 +331,7 @@ function csfmanager_clientarea($vars) { $sql = "SELECT * FROM mod_csfmanager_allow_keys - WHERE key_hash = '" . mysql_escape_string($key) . "' + WHERE key_hash = '" . mysqli_real_escape_string($key) . "' AND key_clicks_remained > 0 AND key_expire > '" . time() . "' AND key_cancelled = 0"; @@ -399,7 +399,7 @@ function csfmanager_clientarea($vars) $now = time(); $sql = "INSERT INTO mod_csfmanager_allow (`clientid`,`serverid`,`ip`,`time`,`expiration`,`reason`) VALUES - ('{$key_details['user_id']}','{$product_details['server_id']}','{$ip}','{$now}','" . ($now + ($allowlength[strtolower($instance->getConfig('allowlength_type'))] * $instance->getConfig('allowlength'))) . "','" . mysql_escape_string($reason) . "')"; + ('{$key_details['user_id']}','{$product_details['server_id']}','{$ip}','{$now}','" . ($now + ($allowlength[strtolower($instance->getConfig('allowlength_type'))] * $instance->getConfig('allowlength'))) . "','" . mysqli_real_escape_string($reason) . "')"; mysql_query($sql); $sql = "UPDATE mod_csfmanager_allow_keys @@ -453,7 +453,7 @@ function csfmanager_clientarea($vars) { $sql = "SELECT * FROM mod_csfmanager_allow_keys - WHERE key_hash = '" . mysql_escape_string($key) . "' + WHERE key_hash = '" . mysqli_real_escape_string($key) . "' AND key_clicks_remained > 0 AND key_expire > '" . time() . "' AND key_cancelled = 0"; @@ -806,7 +806,7 @@ function csfmanager_clientarea($vars) $now = time(); $sql = "INSERT INTO mod_csfmanager_allow (`clientid`,`serverid`,`ip`,`time`,`expiration`,`reason`) VALUES - ('{$uid}','{$product_details['server_id']}','{$ip}','{$now}','" . ($now + ($allowlength[strtolower($instance->getConfig('allowlength_type'))] * $instance->getConfig('allowlength'))) . "','" . mysql_escape_string($reason) . "')"; + ('{$uid}','{$product_details['server_id']}','{$ip}','{$now}','" . ($now + ($allowlength[strtolower($instance->getConfig('allowlength_type'))] * $instance->getConfig('allowlength'))) . "','" . mysqli_real_escape_string($reason) . "')"; mysql_query($sql); } else @@ -849,13 +849,13 @@ function csfmanager_clientarea($vars) if($submit) { - $fullname = trim(mysql_escape_string(csfmanager::request_var('fullname', ''))); + $fullname = trim(mysqli_real_escape_string(csfmanager::request_var('fullname', ''))); if($fullname && $email && csfmanager::csfValidateEmail($email)) { $sql = "SELECT key_id FROM mod_csfmanager_allow_keys - WHERE key_email = '" . mysql_escape_string($email) . "' + WHERE key_email = '" . mysqli_real_escape_string($email) . "' AND key_clicks_remained > 0 AND key_expire > '" . time() . "' AND user_id = '{$product_details['client_id']}' @@ -1053,7 +1053,7 @@ function csfmanager_clientarea($vars) $output['allowedips'][$ip_details['id']]['time'] = date("d/m/Y H:i", $ip_details['time']); $output['allowedips'][$ip_details['id']]['expiration'] = date("d/m/Y H:i", $ip_details['expiration']); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $output['allowkeys'] = array(); @@ -1072,7 +1072,7 @@ function csfmanager_clientarea($vars) $output['allowkeys'][$key_details['key_id']]['key_expired'] = ($key_details['key_expire'] <= time()); } - mysql_free_result($result); + mysqli_fetch_assoc($result); break; } @@ -1122,7 +1122,7 @@ function csfmanager_clientarea($vars) { $output['services'][] = $product_details; } - mysql_free_result($result); + mysqli_fetch_assoc($result); $tplfile = 'csfmanagerproducts'; } diff --git a/csfmanager/includes/functions.php b/csfmanager/includes/functions.php index 2ded550..dbc4354 100644 --- a/csfmanager/includes/functions.php +++ b/csfmanager/includes/functions.php @@ -25,7 +25,7 @@ function __construct() $this->config[$config_details['name']] = $config_details['value']; } - mysql_free_result($result); + mysqli_fetch_assoc($result); $this->_loadLanguage(); } diff --git a/csfmanager/views/allowedlog_default.php b/csfmanager/views/allowedlog_default.php index 982d296..8f192ef 100644 --- a/csfmanager/views/allowedlog_default.php +++ b/csfmanager/views/allowedlog_default.php @@ -39,10 +39,10 @@ public function _default() LEFT JOIN tblservers as s ON s.id = a.serverid WHERE a.expiration > '" . time() . "' - " . (trim($search['clientname']) ? "AND UPPER(CONCAT_WS(' ', c.firstname, c.lastname)) LIKE UPPER('%" . mysql_escape_string(trim($search['clientname'])) . "%')" : '') . " + " . (trim($search['clientname']) ? "AND UPPER(CONCAT_WS(' ', c.firstname, c.lastname)) LIKE UPPER('%" . mysqli_real_escape_string(trim($search['clientname'])) . "%')" : '') . " " . (intval($search['server']) ? "AND s.id = '" . intval($search['server']) . "'" : '') . " - " . (trim($search['ip']) ? "AND a.ip LIKE '%" . mysql_escape_string(trim($search['ip'])) . "%'" : '') . " - " . (trim($search['reason']) ? "AND a.reason LIKE '%" . mysql_escape_string(trim($search['reason'])) . "%'" : '') . " + " . (trim($search['ip']) ? "AND a.ip LIKE '%" . mysqli_real_escape_string(trim($search['ip'])) . "%'" : '') . " + " . (trim($search['reason']) ? "AND a.reason LIKE '%" . mysqli_real_escape_string(trim($search['reason'])) . "%'" : '') . " ORDER BY a.time DESC"; $result = mysql_query($sql); @@ -53,7 +53,7 @@ public function _default() { $output['data']['list'][] = array_merge($allow_details, array('time' => date("d/m/Y H:i", $allow_details['time']), 'expiration' => date("d/m/Y H:i", $allow_details['expiration']))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $output['data']['current_page'] = (($start / $limit) + 1); $output['data']['total_pages'] = ceil(abs($output['data']['total'] / $limit)); @@ -72,7 +72,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); return $output; } diff --git a/csfmanager/views/allowkeys_default.php b/csfmanager/views/allowkeys_default.php index 3b2f547..38acaa9 100644 --- a/csfmanager/views/allowkeys_default.php +++ b/csfmanager/views/allowkeys_default.php @@ -51,11 +51,11 @@ public function _default() ON s.id = k.server_id WHERE key_id > 0 " . ($status_query ? "AND {$status_query}" : '') . " - " . (trim($search['clientname']) ? "AND UPPER(CONCAT_WS(' ', c.firstname, c.lastname)) LIKE UPPER('%" . mysql_escape_string(trim($search['clientname'])) . "%')" : '') . " + " . (trim($search['clientname']) ? "AND UPPER(CONCAT_WS(' ', c.firstname, c.lastname)) LIKE UPPER('%" . mysqli_real_escape_string(trim($search['clientname'])) . "%')" : '') . " " . (intval($search['server']) ? "AND s.id = '" . intval($search['server']) . "'" : '') . " - " . (trim($search['recipient']) ? "AND k.key_recipient LIKE '%" . mysql_escape_string(trim($search['recipient'])) . "%'" : '') . " - " . (trim($search['email']) ? "AND k.key_email LIKE '%" . mysql_escape_string(trim($search['email'])) . "%'" : '') . " - " . (trim($search['key']) ? "AND k.key_hash LIKE '%" . mysql_escape_string(trim($search['key'])) . "%'" : '') . " + " . (trim($search['recipient']) ? "AND k.key_recipient LIKE '%" . mysqli_real_escape_string(trim($search['recipient'])) . "%'" : '') . " + " . (trim($search['email']) ? "AND k.key_email LIKE '%" . mysqli_real_escape_string(trim($search['email'])) . "%'" : '') . " + " . (trim($search['key']) ? "AND k.key_hash LIKE '%" . mysqli_real_escape_string(trim($search['key'])) . "%'" : '') . " ORDER BY k.key_id DESC"; $result = mysql_query($sql); @@ -67,7 +67,7 @@ public function _default() { $output['data']['list'][] = array_merge($key_details, array('key_expire_date' => date("d/m/Y H:i", $key_details['key_expire']))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $output['data']['current_page'] = (($start / $limit) + 1); $output['data']['total_pages'] = ceil(abs($output['data']['total'] / $limit)); @@ -85,7 +85,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); return $output; } diff --git a/csfmanager/views/broadcast_apply.php b/csfmanager/views/broadcast_apply.php index 964cdad..c74c8c1 100644 --- a/csfmanager/views/broadcast_apply.php +++ b/csfmanager/views/broadcast_apply.php @@ -43,7 +43,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $config_vars = csfmanager::request_var('configVars', array()); diff --git a/csfmanager/views/broadcast_default.php b/csfmanager/views/broadcast_default.php index d8b7ca6..0a043cd 100644 --- a/csfmanager/views/broadcast_default.php +++ b/csfmanager/views/broadcast_default.php @@ -33,7 +33,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); return $output; } diff --git a/csfmanager/views/broadcast_selectservers.php b/csfmanager/views/broadcast_selectservers.php index 99ec4d1..e918d16 100644 --- a/csfmanager/views/broadcast_selectservers.php +++ b/csfmanager/views/broadcast_selectservers.php @@ -33,7 +33,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $templateserver = csfmanager::request_var('templateserver', 0); diff --git a/csfmanager/views/broadcast_send.php b/csfmanager/views/broadcast_send.php index 0a0019d..34b8c04 100644 --- a/csfmanager/views/broadcast_send.php +++ b/csfmanager/views/broadcast_send.php @@ -57,7 +57,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); if(!isset($output['data']['servers'][$server_id])) { diff --git a/csfmanager/views/broadcast_setconfig.php b/csfmanager/views/broadcast_setconfig.php index 963627d..05e1a63 100644 --- a/csfmanager/views/broadcast_setconfig.php +++ b/csfmanager/views/broadcast_setconfig.php @@ -46,7 +46,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $templateserver = csfmanager::request_var('templateserver', 0); diff --git a/csfmanager/views/firewall_default.php b/csfmanager/views/firewall_default.php index 24f2da9..4ff92c1 100644 --- a/csfmanager/views/firewall_default.php +++ b/csfmanager/views/firewall_default.php @@ -33,7 +33,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); return $output; } diff --git a/csfmanager/views/firewall_manage.php b/csfmanager/views/firewall_manage.php index 4499f24..d955ad5 100644 --- a/csfmanager/views/firewall_manage.php +++ b/csfmanager/views/firewall_manage.php @@ -35,7 +35,7 @@ public function _default() { $servers[$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $server_details = $servers[$server_id]; diff --git a/csfmanager/views/generatekey_default.php b/csfmanager/views/generatekey_default.php index ed6c3ab..99f23cc 100644 --- a/csfmanager/views/generatekey_default.php +++ b/csfmanager/views/generatekey_default.php @@ -34,7 +34,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge($server_details, array('password' => decrypt($server_details['password'], $cc_encryption_hash))); } - mysql_free_result($result); + mysqli_fetch_assoc($result); $output['data']['clients'] = array(); @@ -57,7 +57,7 @@ public function _default() { $output['data']['clients'][$client_details['id']] = $client_details; } - mysql_free_result($result); + mysqli_fetch_assoc($result); return $output; } diff --git a/csfmanager/views/settings_default.php b/csfmanager/views/settings_default.php index a42ae7d..8244f37 100644 --- a/csfmanager/views/settings_default.php +++ b/csfmanager/views/settings_default.php @@ -34,7 +34,7 @@ public function _default() { $output['data']['servers'][$server_details['id']] = array_merge(array('selected' => in_array($server_details['id'], explode(',', $instance->getConfig('servers'))) ? true : false), $server_details); } - mysql_free_result($result); + mysqli_fetch_assoc($result); return $output; }