Skip to content

Commit 7ee336c

Browse files
author
Marius Cramer
committed
- ported some patches
1 parent 75b7fc5 commit 7ee336c

File tree

8 files changed

+18
-8
lines changed

8 files changed

+18
-8
lines changed

‎interface/web/dns/list/dns_slave.list.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
'prefix' => "",
8484
'suffix' => "",
8585
'datasource' => array ( 'type' => 'SQL',
86-
'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
86+
//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
87+
'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
8788
'keyfield'=> 'groupid',
8889
'valuefield'=> 'name'
8990
),

‎interface/web/dns/list/dns_soa.list.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,8 @@
8383
'prefix' => "",
8484
'suffix' => "",
8585
'datasource' => array ( 'type' => 'SQL',
86-
'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
86+
//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
87+
'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
8788
'keyfield'=> 'groupid',
8889
'valuefield'=> 'name'
8990
),

‎interface/web/mail/list/mail_domain.list.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
'prefix' => "",
7171
'suffix' => "",
7272
'datasource' => array ( 'type' => 'SQL',
73-
'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
73+
//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
74+
'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
7475
'keyfield'=> 'groupid',
7576
'valuefield'=> 'name'
7677
),

‎interface/web/sites/list/database.list.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@
9191
'prefix' => "",
9292
'suffix' => "",
9393
'datasource' => array ( 'type' => 'SQL',
94-
'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
94+
//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
95+
'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
9596
'keyfield'=> 'groupid',
9697
'valuefield'=> 'name'
9798
),

‎interface/web/sites/list/web_vhost_domain.list.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@
8888
'prefix' => "",
8989
'suffix' => "",
9090
'datasource' => array ( 'type' => 'SQL',
91-
'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
91+
//'querystring' => 'SELECT groupid, name FROM sys_group WHERE groupid != 1 ORDER BY name',
92+
'querystring' => "SELECT sys_group.groupid,CONCAT(IF(client.company_name != '', CONCAT(client.company_name, ' :: '), ''), IF(client.contact_firstname != '', CONCAT(client.contact_firstname, ' '), ''), client.contact_name, ' (', client.username, IF(client.customer_no != '', CONCAT(', ', client.customer_no), ''), ')') as name FROM sys_group, client WHERE sys_group.groupid != 1 AND sys_group.client_id = client.client_id ORDER BY client.company_name, client.contact_name",
9293
'keyfield'=> 'groupid',
9394
'valuefield'=> 'name'
9495
),

‎interface/web/themes/default/templates/sidenav.tpl.htm‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
<tmpl_else>
1010
<a href="#" data-load-content="<tmpl_var name='link'>">
1111
</tmpl_if>
12-
<tmpl_else>
13-
<a href="#">
1412
</tmpl_if>
1513
<div>
1614
<strong><tmpl_var name="title"></strong>
1715
</div>
16+
<tmpl_if name="link">
1817
</a>
18+
</tmpl_if>
1919
</li>
2020
</tmpl_loop>
2121
</ul>

‎server/lib/classes/cron.d/300-quota_notify.inc.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ public function onBeforeRun() {
4949

5050
public function onRunJob() {
5151
global $app, $conf;
52+
53+
/* used for all monitor cronjobs */
54+
$app->load('monitor_tools');
55+
$this->_tools = new monitor_tools();
56+
/* end global section for monitor cronjobs */
5257

5358
//######################################################################################################
5459
// enforce traffic quota (run only on the "master-server")

‎server/lib/classes/cron.d/500-backup.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ public function onRunJob() {
228228
$db_name = $rec['database_name'];
229229
$db_backup_file = 'db_'.$db_name.'_'.date('Y-m-d_H-i').'.sql';
230230
//$command = "mysqldump -h '".escapeshellcmd($clientdb_host)."' -u '".escapeshellcmd($clientdb_user)."' -p'".escapeshellcmd($clientdb_password)."' -c --add-drop-table --create-options --quick --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'";
231-
$command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." -c --add-drop-table --create-options --quick --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'";
231+
$command = "mysqldump -h ".escapeshellarg($clientdb_host)." -u ".escapeshellarg($clientdb_user)." -p".escapeshellarg($clientdb_password)." -c --add-drop-table --create-options --quick --max_allowed_packet=512M --result-file='".$db_backup_dir.'/'.$db_backup_file."' '".$db_name."'";
232232
exec($command, $tmp_output, $retval);
233233

234234
//* Compress the backup with gzip

0 commit comments

Comments
 (0)