re-format

pull/255/head
David Goodwin 6 years ago
parent 7ed57a0cda
commit 045a19ae33

@ -219,7 +219,7 @@ class MailboxHandler extends PFAHandler {
protected function beforestore() { protected function beforestore() {
if (isset($this->values['quota']) && $this->values['quota'] != -1) { if (isset($this->values['quota']) && $this->values['quota'] != -1) {
$multiplier = Config::read_string('quota_multiplier'); $multiplier = Config::read_string('quota_multiplier');
if($multiplier == 0) { // or empty string, or null, or false... if ($multiplier == 0) { // or empty string, or null, or false...
$multiplier = 1; $multiplier = 1;
} }
$this->values['quota'] = $this->values['quota'] * $multiplier; # convert quota from MB to bytes $this->values['quota'] = $this->values['quota'] * $multiplier; # convert quota from MB to bytes
@ -257,7 +257,7 @@ class MailboxHandler extends PFAHandler {
if (Config::bool('password_expiration')) { if (Config::bool('password_expiration')) {
if(!empty($this->values['password']) && !empty($this->values['password2']) && $this->values['password'] == $this->values['password2']) { if (!empty($this->values['password']) && !empty($this->values['password2']) && $this->values['password'] == $this->values['password2']) {
$domain_dirty = $this->domain_from_id(); $domain_dirty = $this->domain_from_id();
$domain = trim($domain_dirty, "`'"); // naive assumption it is ' escaping. $domain = trim($domain_dirty, "`'"); // naive assumption it is ' escaping.
$password_expiration_value = (int)get_password_expiration_value($domain); $password_expiration_value = (int)get_password_expiration_value($domain);

@ -559,8 +559,7 @@ abstract class PFAHandler {
} else { } else {
$result = db_update($this->db_table, $this->id_field, $this->id, $db_values, array('created', 'modified'), true); $result = db_update($this->db_table, $this->id_field, $this->id, $db_values, array('created', 'modified'), true);
} }
} } catch (PDOException $e) {
catch(PDOException $e) {
$this->errormsg[] = Config::lang_f($this->msg['store_error'], $this->label); $this->errormsg[] = Config::lang_f($this->msg['store_error'], $this->label);
return false; return false;
} }

Loading…
Cancel
Save