From 6bff958ab4381f27aba5464bce80290015d4458a Mon Sep 17 00:00:00 2001 From: Miro Rauhala <4082806+mirorauhala@users.noreply.github.com> Date: Sat, 11 Jul 2020 14:20:38 +0300 Subject: [PATCH] =?UTF-8?q?[Web]=C2=A0Clean=20PHP=20code=20by=20removing?= =?UTF-8?q?=20unused=20variables=20(#3646)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [WEB] $lang is not used in this context * [Web] $stmt variable is not used --- data/web/inc/functions.fail2ban.inc.php | 1 - data/web/inc/functions.inc.php | 20 ++++------ data/web/inc/functions.mailq.inc.php | 1 - data/web/inc/functions.presets.inc.php | 1 - data/web/inc/functions.pushover.inc.php | 1 - .../inc/functions.quota_notification.inc.php | 1 - data/web/inc/functions.ratelimit.inc.php | 1 - data/web/inc/init_db.inc.php | 39 +++++++++---------- 8 files changed, 26 insertions(+), 39 deletions(-) diff --git a/data/web/inc/functions.fail2ban.inc.php b/data/web/inc/functions.fail2ban.inc.php index 6e2eb079..066c8d59 100644 --- a/data/web/inc/functions.fail2ban.inc.php +++ b/data/web/inc/functions.fail2ban.inc.php @@ -1,7 +1,6 @@ $msg, 'type' => json_encode($type)); } - if (!empty($log_array)) { + if (!empty($log_array)) { return $log_array; } } @@ -729,7 +729,6 @@ function edit_user_account($_data) { ); } function user_get_alias_details($username) { - global $lang; global $pdo; $data['direct_aliases'] = false; $data['shared_aliases'] = false; @@ -801,7 +800,7 @@ function user_get_alias_details($username) { } return $data; } -function is_valid_domain_name($domain_name) { +function is_valid_domain_name($domain_name) { if (empty($domain_name)) { return false; } @@ -811,7 +810,6 @@ function is_valid_domain_name($domain_name) { && preg_match("/^[^\.]{1,63}(\.[^\.]{1,63})*$/", $domain_name)); } function set_tfa($_data) { - global $lang; global $pdo; global $yubi; global $u2f; @@ -840,7 +838,7 @@ function set_tfa($_data) { ); return false; } - + switch ($_data["tfa_method"]) { case "yubi_otp": $key_id = (!isset($_data["key_id"])) ? 'unidentified' : $_data["key_id"]; @@ -875,7 +873,7 @@ function set_tfa($_data) { try { // We could also do a modhex translation here $yubico_modhex_id = substr($_data["otp_token"], 0, 12); - $stmt = $pdo->prepare("DELETE FROM `tfa` + $stmt = $pdo->prepare("DELETE FROM `tfa` WHERE `username` = :username AND (`authmech` != 'yubi_otp') OR (`authmech` = 'yubi_otp' AND `secret` LIKE :modhex)"); @@ -1042,7 +1040,7 @@ function get_tfa($username = null) { WHERE `username` = :username AND `active` = '1'"); $stmt->execute(array(':username' => $username)); $row = $stmt->fetch(PDO::FETCH_ASSOC); - + switch ($row["authmech"]) { case "yubi_otp": $data['name'] = "yubi_otp"; @@ -1097,7 +1095,6 @@ function get_tfa($username = null) { } function verify_tfa_login($username, $token) { global $pdo; - global $lang; global $yubi; global $u2f; global $tfa; @@ -1105,7 +1102,7 @@ function verify_tfa_login($username, $token) { WHERE `username` = :username AND `active` = '1'"); $stmt->execute(array(':username' => $username)); $row = $stmt->fetch(PDO::FETCH_ASSOC); - + switch ($row["authmech"]) { case "yubi_otp": if (!ctype_alnum($token) || strlen($token) != 44) { @@ -1231,7 +1228,6 @@ function verify_tfa_login($username, $token) { } function admin_api($access, $action, $data = null) { global $pdo; - global $lang; if ($_SESSION['mailcow_cc_role'] != "admin") { $_SESSION['return'][] = array( 'type' => 'danger', @@ -1419,7 +1415,6 @@ function license($action, $data = null) { } } function rspamd_ui($action, $data = null) { - global $lang; if ($_SESSION['mailcow_cc_role'] != "admin") { $_SESSION['return'][] = array( 'type' => 'danger', @@ -1494,7 +1489,7 @@ function get_u2f_registrations($username) { } function get_logs($application, $lines = false) { if ($lines === false) { - $lines = $GLOBALS['LOG_LINES'] - 1; + $lines = $GLOBALS['LOG_LINES'] - 1; } elseif(is_numeric($lines) && $lines >= 1) { $lines = abs(intval($lines) - 1); @@ -1505,7 +1500,6 @@ function get_logs($application, $lines = false) { $to = intval($to); if ($from < 1 || $to < $from) { return false; } } - global $lang; global $redis; global $pdo; if ($_SESSION['mailcow_cc_role'] != "admin") { diff --git a/data/web/inc/functions.mailq.inc.php b/data/web/inc/functions.mailq.inc.php index b980d7c8..23e9fb72 100644 --- a/data/web/inc/functions.mailq.inc.php +++ b/data/web/inc/functions.mailq.inc.php @@ -45,7 +45,6 @@ function mailq($_action, $_data = null) { ); } } - global $lang; if ($_action == 'get') { $mailq_lines = docker('post', 'postfix-mailcow', 'exec', array('cmd' => 'mailq', 'task' => 'list')); $lines = 0; diff --git a/data/web/inc/functions.presets.inc.php b/data/web/inc/functions.presets.inc.php index e1eddbc1..17aaa3fb 100644 --- a/data/web/inc/functions.presets.inc.php +++ b/data/web/inc/functions.presets.inc.php @@ -1,6 +1,5 @@ $key_values) { @list($table_ref, $field_ref) = explode('.', $key_values['ref']); - $fields = "`" . implode("`, `", $key_values) . "`"; $sql .= "FOREIGN KEY `" . $key_name . "` (" . $key_values['col'] . ") REFERENCES `" . $table_ref . "` (`" . $field_ref . "`) ON DELETE " . $key_values['delete'] . " ON UPDATE " . $key_values['update'] . ","; } @@ -1130,31 +1129,31 @@ function init_db_schema() { $stmt = $pdo->query("SELECT NULL FROM `admin`"); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); if ($num_results == 0) { - $stmt = $pdo->query("INSERT INTO `admin` (`username`, `password`, `superadmin`, `created`, `modified`, `active`) + $pdo->query("INSERT INTO `admin` (`username`, `password`, `superadmin`, `created`, `modified`, `active`) VALUES ('admin', '{SSHA256}K8eVJ6YsZbQCfuJvSUbaQRLr0HPLz5rC9IAp0PAFl0tmNDBkMDc0NDAyOTAxN2Rk', 1, NOW(), NOW(), 1)"); - $stmt = $pdo->query("INSERT INTO `domain_admins` (`username`, `domain`, `created`, `active`) + $pdo->query("INSERT INTO `domain_admins` (`username`, `domain`, `created`, `active`) SELECT `username`, 'ALL', NOW(), 1 FROM `admin` WHERE superadmin='1' AND `username` NOT IN (SELECT `username` FROM `domain_admins`);"); - $stmt = $pdo->query("DELETE FROM `admin` WHERE `username` NOT IN (SELECT `username` FROM `domain_admins`);"); + $pdo->query("DELETE FROM `admin` WHERE `username` NOT IN (SELECT `username` FROM `domain_admins`);"); } // Insert new DB schema version - $stmt = $pdo->query("REPLACE INTO `versions` (`application`, `version`) VALUES ('db_schema', '" . $db_version . "');"); + $pdo->query("REPLACE INTO `versions` (`application`, `version`) VALUES ('db_schema', '" . $db_version . "');"); // Fix dangling domain admins - $stmt = $pdo->query("DELETE FROM `admin` WHERE `superadmin` = 0 AND `username` NOT IN (SELECT `username`FROM `domain_admins`);"); - $stmt = $pdo->query("DELETE FROM `da_acl` WHERE `username` NOT IN (SELECT `username`FROM `domain_admins`);"); + $pdo->query("DELETE FROM `admin` WHERE `superadmin` = 0 AND `username` NOT IN (SELECT `username`FROM `domain_admins`);"); + $pdo->query("DELETE FROM `da_acl` WHERE `username` NOT IN (SELECT `username`FROM `domain_admins`);"); // Migrate attributes // pushover - $stmt = $pdo->query("UPDATE `pushover` SET `attributes` = '{}' WHERE `attributes` = '' OR `attributes` IS NULL;"); - $stmt = $pdo->query("UPDATE `pushover` SET `attributes` = JSON_SET(`attributes`, '$.evaluate_x_prio', \"0\") WHERE JSON_EXTRACT(`attributes`, '$.evaluate_x_prio') IS NULL;"); - $stmt = $pdo->query("UPDATE `pushover` SET `attributes` = JSON_SET(`attributes`, '$.only_x_prio', \"0\") WHERE JSON_EXTRACT(`attributes`, '$.only_x_prio') IS NULL;"); + $pdo->query("UPDATE `pushover` SET `attributes` = '{}' WHERE `attributes` = '' OR `attributes` IS NULL;"); + $pdo->query("UPDATE `pushover` SET `attributes` = JSON_SET(`attributes`, '$.evaluate_x_prio', \"0\") WHERE JSON_EXTRACT(`attributes`, '$.evaluate_x_prio') IS NULL;"); + $pdo->query("UPDATE `pushover` SET `attributes` = JSON_SET(`attributes`, '$.only_x_prio', \"0\") WHERE JSON_EXTRACT(`attributes`, '$.only_x_prio') IS NULL;"); // mailbox - $stmt = $pdo->query("UPDATE `mailbox` SET `attributes` = '{}' WHERE `attributes` = '' OR `attributes` IS NULL;"); - $stmt = $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.force_pw_update', \"0\") WHERE JSON_EXTRACT(`attributes`, '$.force_pw_update') IS NULL;"); - $stmt = $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.sogo_access', \"1\") WHERE JSON_EXTRACT(`attributes`, '$.sogo_access') IS NULL;"); - $stmt = $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.mailbox_format', \"maildir:\") WHERE JSON_EXTRACT(`attributes`, '$.mailbox_format') IS NULL;"); - $stmt = $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.quarantine_notification', \"never\") WHERE JSON_EXTRACT(`attributes`, '$.quarantine_notification') IS NULL;"); + $pdo->query("UPDATE `mailbox` SET `attributes` = '{}' WHERE `attributes` = '' OR `attributes` IS NULL;"); + $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.force_pw_update', \"0\") WHERE JSON_EXTRACT(`attributes`, '$.force_pw_update') IS NULL;"); + $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.sogo_access', \"1\") WHERE JSON_EXTRACT(`attributes`, '$.sogo_access') IS NULL;"); + $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.mailbox_format', \"maildir:\") WHERE JSON_EXTRACT(`attributes`, '$.mailbox_format') IS NULL;"); + $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.quarantine_notification', \"never\") WHERE JSON_EXTRACT(`attributes`, '$.quarantine_notification') IS NULL;"); foreach($tls_options as $tls_user => $tls_options) { $stmt = $pdo->prepare("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.tls_enforce_in', :tls_enforce_in), `attributes` = JSON_SET(`attributes`, '$.tls_enforce_out', :tls_enforce_out) @@ -1162,13 +1161,13 @@ function init_db_schema() { $stmt->execute(array(':tls_enforce_in' => $tls_options['tls_enforce_in'], ':tls_enforce_out' => $tls_options['tls_enforce_out'], ':username' => $tls_user)); } // Set tls_enforce_* if still missing (due to deleted attrs for example) - $stmt = $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.tls_enforce_out', \"1\") WHERE JSON_EXTRACT(`attributes`, '$.tls_enforce_out') IS NULL;"); - $stmt = $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.tls_enforce_in', \"1\") WHERE JSON_EXTRACT(`attributes`, '$.tls_enforce_in') IS NULL;"); + $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.tls_enforce_out', \"1\") WHERE JSON_EXTRACT(`attributes`, '$.tls_enforce_out') IS NULL;"); + $pdo->query("UPDATE `mailbox` SET `attributes` = JSON_SET(`attributes`, '$.tls_enforce_in', \"1\") WHERE JSON_EXTRACT(`attributes`, '$.tls_enforce_in') IS NULL;"); // Fix ACL - $stmt = $pdo->query("INSERT INTO `user_acl` (`username`) SELECT `username` FROM `mailbox` WHERE `kind` = '' AND NOT EXISTS (SELECT `username` FROM `user_acl`);"); - $stmt = $pdo->query("INSERT INTO `da_acl` (`username`) SELECT DISTINCT `username` FROM `domain_admins` WHERE `username` != 'admin' AND NOT EXISTS (SELECT `username` FROM `da_acl`);"); + $pdo->query("INSERT INTO `user_acl` (`username`) SELECT `username` FROM `mailbox` WHERE `kind` = '' AND NOT EXISTS (SELECT `username` FROM `user_acl`);"); + $pdo->query("INSERT INTO `da_acl` (`username`) SELECT DISTINCT `username` FROM `domain_admins` WHERE `username` != 'admin' AND NOT EXISTS (SELECT `username` FROM `da_acl`);"); // Fix domain_admins - $stmt = $pdo->query("DELETE FROM `domain_admins` WHERE `domain` = 'ALL';"); + $pdo->query("DELETE FROM `domain_admins` WHERE `domain` = 'ALL';"); if (php_sapi_name() == "cli") { echo "DB initialization completed" . PHP_EOL;