From 8e2e4eb189d26b902c4112f272c14b70fcda1d7b Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Sat, 8 Jun 2019 20:38:54 +0100 Subject: [PATCH] run: composer format --- functions.inc.php | 1 - model/MailboxHandler.php | 3 +-- public/setup.php | 3 +-- public/users/password-recover.php | 1 - tests/bootstrap.php | 1 - 5 files changed, 2 insertions(+), 7 deletions(-) diff --git a/functions.inc.php b/functions.inc.php index 7ef0ff50..92dc1bbf 100644 --- a/functions.inc.php +++ b/functions.inc.php @@ -1542,7 +1542,6 @@ function db_connect() { } return $link; - } /** diff --git a/model/MailboxHandler.php b/model/MailboxHandler.php index f54cddf1..912a2973 100644 --- a/model/MailboxHandler.php +++ b/model/MailboxHandler.php @@ -217,7 +217,6 @@ class MailboxHandler extends PFAHandler { protected function beforestore() { - if (isset($this->values['quota']) && $this->values['quota'] != -1) { $multiplier = Config::read_string('quota_multiplier'); if ($multiplier == 0) { // or empty string, or null, or false... @@ -276,7 +275,7 @@ class MailboxHandler extends PFAHandler { public function set($values) { // See: https://github.com/postfixadmin/postfixadmin/issues/282 - ensure the 'local_part' does not contain an @ sign. $ok = true; - if(isset($values['local_part']) && strpos($values['local_part'], '@')) { + if (isset($values['local_part']) && strpos($values['local_part'], '@')) { $this->errormsg['local_part'] = Config::lang('pCreate_mailbox_local_part_error'); $ok = false; } diff --git a/public/setup.php b/public/setup.php index f044b775..a7e2c42c 100644 --- a/public/setup.php +++ b/public/setup.php @@ -189,8 +189,7 @@ $error_text = null; try { $link = db_connect(); -} -catch(Exception $e) { +} catch (Exception $e) { $error_text = $e->getMessage(); } diff --git a/public/users/password-recover.php b/public/users/password-recover.php index c2a6d429..54d14b57 100644 --- a/public/users/password-recover.php +++ b/public/users/password-recover.php @@ -39,7 +39,6 @@ if ($context === 'admin' && !Config::read('forgotten_admin_password_reset') || $ } function sendCodebyEmail($to, $username, $code) { - $https = isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on' ? 'https' : 'http'; $_SERVER['REQUEST_SCHEME'] = isset($_SERVER['REQUEST_SCHEME']) ? $_SERVER['REQUEST_SCHEME'] : $https; diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 0bafb9d0..8002a235 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -85,7 +85,6 @@ try { echo "failed to connect to database\n"; echo $e->getMessage(); exit(1); - } require_once(dirname(__FILE__) . '/../public/upgrade.php');