From a8b07fffc8682f594f1e8120cb51bf49a1b3c603 Mon Sep 17 00:00:00 2001 From: xaver <xaver@ispconfig3> Date: Fri, 23 Mar 2012 00:31:33 -0400 Subject: [PATCH] php 5.4 fixes + bugfix interface/web/admin/list/remote_user.list.php ['table_idx'] from userid to remote_userid --- interface/web/mail/mail_user_edit.php | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php index 398bf12..2c1ee3e 100644 --- a/interface/web/mail/mail_user_edit.php +++ b/interface/web/mail/mail_user_edit.php @@ -109,7 +109,7 @@ if($this->dataRecord["quota"] != -1) $app->tpl->setVar("quota",$this->dataRecord["quota"] / 1024 / 1024); // Is autoresponder set? - if ($this->dataRecord['autoresponder'] == 'y') { + if (!empty($this->dataRecord['autoresponder']) && $this->dataRecord['autoresponder'] == 'y') { $app->tpl->setVar("ar_active", 'checked="checked"'); } else { $app->tpl->setVar("ar_active", ''); @@ -175,7 +175,7 @@ $app->uses('getconf'); - $mail_config = $app->getconf->get_server_config($domain["server_id"],'mail'); + $mail_config = $app->getconf->get_server_config(!empty($domain["server_id"]) ? $domain["server_id"] : '','mail'); //* compose the email field if(isset($_POST["email_local_part"]) && isset($_POST["email_domain"])) { @@ -210,7 +210,7 @@ if(!isset($_POST["login"])) $this->dataRecord["login"] = $this->dataRecord["email"]; elseif(strpos($_POST["login"], '@') !== false && $_POST["login"] != $this->dataRecord["email"]) $app->tform->errorMessage .= $app->tform->lng("error_login_email_txt")."<br>"; } else { - $this->dataRecord["login"] = $this->dataRecord["email"]; + $this->dataRecord["login"] = isset($this->dataRecord["email"]) ? $this->dataRecord["email"] : ''; } //* if autoresponder checkbox not selected, do not save dates if (!isset($_POST['autoresponder']) && array_key_exists('autoresponder_start_date', $_POST)) { @@ -287,8 +287,8 @@ // Set the fields for dovecot if(isset($this->dataRecord["email"])) { - $disableimap = ($this->dataRecord["disableimap"])?'y':'n'; - $disablepop3 = ($this->dataRecord["disablepop3"])?'y':'n'; + $disableimap = (isset($this->dataRecord["disableimap"]) && $this->dataRecord["disableimap"])?'y':'n'; + $disablepop3 = (isset($this->dataRecord["disablepop3"]) && $this->dataRecord["disablepop3"])?'y':'n'; $disabledeliver = ($this->dataRecord["postfix"] == 'y')?'n':'y'; $disablesmtp = ($this->dataRecord["postfix"] == 'y')?'n':'y'; -- Gitblit v1.9.1