Skip to content

Commit bdf99f4

Browse files
author
Florian Schaal
committed
fixed issue with php 5.3
1 parent 6faa009 commit bdf99f4

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

interface/web/tools/resync_do.php

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,9 @@ function query_server($table, $server_id, $server_type, $where = "WHERE active =
6767
$server_name[$server['server_id']] = $server['server_name'];
6868
}
6969
} else {
70-
$server_name[$server_id] = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$server_id)['server_name'];
70+
$temp = $app->db->queryOneRecord("SELECT server_name FROM server WHERE server_id = ".$server_id);
71+
$server_name[$server_id] = $temp['server_name'];
72+
unset($temp)
7173
}
7274

7375
if ( isset($tmp_id) ) $server_id = rtrim($tmp_id,',');
@@ -283,7 +285,15 @@ function query_server($table, $server_id, $server_type, $where = "WHERE active =
283285
$msg .= '<b>Resynced DNS zone</b><br>';
284286
if(is_array($zone_records) && !empty($zone_records)) {
285287
foreach($zone_records as $zone_rec) {
286-
if ($server_id == -1) $records = query_server('dns_rr', $server_id, $server_type, 'WHERE 1', false)[0]; else $records = query_server('dns_rr', $server_id, $server_type, "WHERE active = 'Y'")[0];
288+
if ($server_id == -1) {
289+
$temp = query_server('dns_rr', $server_id, $server_type, 'WHERE 1', false);
290+
$records = $temp[0];
291+
unset($temp);
292+
} else {
293+
$temp= query_server('dns_rr', $server_id, $server_type, "WHERE active = 'Y'");
294+
$records = $temp[0];
295+
unset($temp);
296+
}
287297
$rr_count = 0;
288298
if (is_array($records)) {
289299
foreach($records as $rec) {

server/lib/classes/cron.d/500-backup_mail.inc.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,9 @@ public function onRunJob() {
8383
foreach($records as $rec) {
8484
//* Do the mailbox backup
8585
if($rec['backup_interval'] == 'daily' or ($rec['backup_interval'] == 'weekly' && date('w') == 0) or ($rec['backup_interval'] == 'monthly' && date('d') == '01')) {
86-
$sql = "SELECT * FROM mail_domain WHERE domain = '".$app->db->quote(explode("@",$rec['email'])[1])."'";
86+
$email = $rec['email'][1];
87+
$sql="SELECT * FROM mail_domain WHERE domain = ?" . $app->db->quote(explode("@",$email))."'";
88+
unset($email);
8789
$domain_rec=$app->db->queryOneRecord($sql);
8890

8991
$mail_backup_dir = $backup_dir.'/mail'.$domain_rec['domain_id'];

0 commit comments

Comments
 (0)