Skip to content

Commit 7ca2762

Browse files
author
Marius Burkard
committed
Syntax errors in PHP 5.3.3, fixes #5129
1 parent eab22ad commit 7ca2762

File tree

4 files changed

+11
-4
lines changed

4 files changed

+11
-4
lines changed

interface/lib/app.inc.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,8 @@ public function tpl_defaults() {
335335
}
336336

337337
private function get_cookie_domain() {
338-
$proxy_panel_allowed = $this->getconf->get_security_config('permissions')['reverse_proxy_panel_allowed'];
338+
$sec_config = $this->getconf->get_security_config('permissions');
339+
$proxy_panel_allowed = $sec_config['reverse_proxy_panel_allowed'];
339340
if ($proxy_panel_allowed == 'all') {
340341
return '';
341342
}

interface/web/dns/dns_caa_edit.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,8 @@ function onSubmit() {
165165

166166
// Set name
167167
if($this->dataRecord['additional'] != '') {
168-
$temp = explode(',', $this->dataRecord['additional'])[0]; // if we have more hostnames the interface-plugin will be used
168+
$temp = explode(',', $this->dataRecord['additional']);
169+
$temp = $temp[0]; // if we have more hostnames the interface-plugin will be used
169170
$temp = trim($temp,'.');
170171
if(trim($temp != '')) $this->dataRecord['name'] = $temp.'.'.$this->dataRecord['name'];
171172
unset($temp);

interface/web/mail/ajax_get_json.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@
4040
if($type == 'create_dkim' && $domain_id != ''){
4141
$dkim_public = $_GET['dkim_public'];
4242
$dkim_selector = $_GET['dkim_selector'];
43-
$domain=@(is_numeric($domain_id))?$app->db->queryOneRecord("SELECT domain FROM domain WHERE domain_id = ? AND ".$app->tform->getAuthSQL('r'), $domain_id)['domain']:$domain_id;
43+
$domain = $domain_id;
44+
if(is_numeric($domain_id)) {
45+
$temp = $app->db->queryOneRecord("SELECT domain FROM domain WHERE domain_id = ? AND ".$app->tform->getAuthSQL('r'), $domain_id);
46+
$domain = $temp['domain'];
47+
}
4448
$rec = $app->db->queryOneRecord("SELECT server_id, domain FROM mail_domain WHERE domain = ?", $domain);
4549
$server_id = $rec['server_id'];
4650
$maildomain = $rec['domain'];

interface/web/sites/database_quota_stats.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@ function prepareDataRow($rec) {
8383
} else {
8484
$web_database = $app->db->queryOneRecord("SELECT * FROM web_database WHERE database_id = ?", $rec[$this->idx_key]);
8585
$rec['database'] = $rec['database_name'];
86-
$rec['server_name'] = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $web_database['server_id'])['server_name'];
86+
$temp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ?", $web_database['server_id']);
87+
$rec['server_name'] = $temp['server_name'];
8788
$sys_group = $app->db->queryOneRecord("SELECT * FROM sys_group WHERE groupid = ?", $web_database['sys_groupid']);
8889
$client = $app->db->queryOneRecord("SELECT * FROM client WHERE client_id = ?", $sys_group['client_id']);
8990
$rec['client'] = $client['username'];

0 commit comments

Comments
 (0)