diff --git a/interface/lib/classes/getconf.inc.php b/interface/lib/classes/getconf.inc.php
index a2be834f4161be4cdd7ab9c2b96fec906bb18d9e..1882061daa50c49fcde4da84a7957340c549b956 100644
--- a/interface/lib/classes/getconf.inc.php
+++ b/interface/lib/classes/getconf.inc.php
@@ -35,7 +35,7 @@ class getconf {
public function get_server_config($server_id, $section = '') {
global $app;
- if(!is_array($this->config[$server_id])) {
+ if(!isset($this->config[$server_id])) {
$app->uses('ini_parser');
$server_id = intval($server_id);
$server = $app->db->queryOneRecord('SELECT config FROM server WHERE server_id = '.$server_id);
@@ -47,10 +47,12 @@ class getconf {
public function get_global_config($section = '') {
global $app;
- if(!is_array($this->config['global'])) {
+ if(isset($this->config['global'])) {
$app->uses('ini_parser');
$tmp = $app->db->queryOneRecord('SELECT config FROM sys_ini WHERE sysini_id = 1');
$this->config['global'] = $app->ini_parser->parse_ini_string(stripslashes($tmp['config']));
+ } else {
+ $this->config['global'] = NULL;
}
return ($section == '') ? $this->config['global'] : $this->config['global'][$section];
}
diff --git a/interface/lib/classes/plugin_listview.inc.php b/interface/lib/classes/plugin_listview.inc.php
index 036b1155e226d5ff1f5e7f9aed012cd179c1ae26..30932b90f0946561029fe6ca03b534e8ab1f0de6 100644
--- a/interface/lib/classes/plugin_listview.inc.php
+++ b/interface/lib/classes/plugin_listview.inc.php
@@ -59,11 +59,10 @@ class plugin_listview extends plugin_base {
$listTpl->setVar('theme', $_SESSION['s']['theme']);
// Generate the SQL for searching
+ $sql_where = "";
if($app->listform->listDef["auth"] != 'no') {
- if($_SESSION["s"]["user"]["typ"] == "admin") {
- $sql_where = "";
- } else {
- $sql_where = $app->tform->getAuthSQL('r')." and";
+ if($_SESSION["s"]["user"]["typ"] != "admin") {
+ $sql_where = $app->tform->getAuthSQL('r')." and";
}
}
@@ -87,6 +86,7 @@ class plugin_listview extends plugin_base {
$limits = array('5'=>'5','15'=>'15','25'=>'25','50'=>'50','100'=>'100','999999999' => 'all');
//* create options and set selected, if default -> 15 is selected
+ $options='';
foreach($limits as $key => $val){
$options .= '';
}
diff --git a/interface/web/admin/list/remote_user.list.php b/interface/web/admin/list/remote_user.list.php
index f36af770c8f8031fb94042401845cd45a121fcc1..09f4e3d7ff0937bf6efbf85508cef4454394eb92 100644
--- a/interface/web/admin/list/remote_user.list.php
+++ b/interface/web/admin/list/remote_user.list.php
@@ -7,7 +7,7 @@ $liste['name'] = 'remote_user';
$liste['table'] = 'remote_user';
// Index index field of the database table
-$liste['table_idx'] = 'userid';
+$liste['table_idx'] = 'remote_userid';
// Search Field Prefix
$liste['search_prefix'] = 'search_';
diff --git a/interface/web/mail/mail_transport_edit.php b/interface/web/mail/mail_transport_edit.php
index 614824b08a7d9bffc04f927c09f373cbb02e36fb..c33970eea7e6c259e94b9d8836d8f00525e99b8a 100644
--- a/interface/web/mail/mail_transport_edit.php
+++ b/interface/web/mail/mail_transport_edit.php
@@ -80,9 +80,9 @@ class page_action extends tform_actions {
$rec["type"] = $tmp_parts[0];
}
}
- if(@$tmp_parts[2] != '') {
+ if(!empty($tmp_parts[2])) {
$dest = @$tmp_parts[1].':'.@$tmp_parts[2];
- } elseif($tmp_parts[1] != '') {
+ } elseif(!empty($tmp_parts[1])) {
$dest = $tmp_parts[1];
} else {
$dest = $this->dataRecord["transport"];
diff --git a/interface/web/mail/mail_user_edit.php b/interface/web/mail/mail_user_edit.php
index 398bf12da2b3fd720fbf5ef305816ad4e393405e..2c1ee3e063dfcf408f1e87fb48534d1b34c372c7 100644
--- a/interface/web/mail/mail_user_edit.php
+++ b/interface/web/mail/mail_user_edit.php
@@ -109,7 +109,7 @@ class page_action extends tform_actions {
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 @@ class page_action extends tform_actions {
$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 @@ class page_action extends tform_actions {
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")."
";
} 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 @@ class page_action extends tform_actions {
// 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';
diff --git a/interface/web/mail/user_quota_stats.php b/interface/web/mail/user_quota_stats.php
index 18d962f339800ce2d86e3b67150d60ca87e84c68..a7a805689dfe6f8ac004a34fb291be12cb000492 100644
--- a/interface/web/mail/user_quota_stats.php
+++ b/interface/web/mail/user_quota_stats.php
@@ -41,7 +41,7 @@ class list_action extends listform_actions {
$rec['bgcolor'] = $this->DataRowColor;
$email = $rec['email'];
- $rec['used'] = $monitor_data[$email]['used'];
+ $rec['used'] = isset($monitor_data[$email]['used']) ? $monitor_data[$email]['used'] : array(1 => 0);
if (!is_numeric($rec['used'])) $rec['used']=$rec['used'][1];
diff --git a/interface/web/monitor/show_sys_state.php b/interface/web/monitor/show_sys_state.php
index 20f0b05e8e8745a96add068a436d1448603e5a8c..4219fbf87b6e0bcf79d39db7114bd1b37d459a43 100644
--- a/interface/web/monitor/show_sys_state.php
+++ b/interface/web/monitor/show_sys_state.php
@@ -69,7 +69,7 @@ else {
$app->tpl->setVar("state_data",$output);
$app->tpl->setVar("state_type",$stateType);
$app->tpl->setVar("list_head_txt",$title);
-$app->tpl->setVar("list_desc_txt",$description);
+$app->tpl->setVar("list_desc_txt",(isset($description) ? $description : ''));
$app->tpl->setVar("monTransRefreshsq", $monTransRefreshsq);
/*
@@ -234,7 +234,7 @@ function _getServerState($serverId, $serverName) {
/*
* Info of a "normal" Server or a OpenVz-Host
*/
- $html_server .= '