From 5bbfc1b098302671bcbf2f754efc627d50eaa5c7 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 13 Jan 2011 09:25:59 -0500
Subject: [PATCH] Added global functions library which conatins a mail functin that supports attachments and a array_merge function that merges arrays that conatain numeric keys and strings correctly.
---
interface/web/dashboard/dashlets/limits.php | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/interface/web/dashboard/dashlets/limits.php b/interface/web/dashboard/dashlets/limits.php
index c2abb1c..b020def 100644
--- a/interface/web/dashboard/dashlets/limits.php
+++ b/interface/web/dashboard/dashlets/limits.php
@@ -12,6 +12,10 @@
$limits[] = array('field' => 'limit_maildomain',
'db_table' => 'mail_domain',
'db_where' => '');
+
+ $limits[] = array('field' => 'limit_mailmailinglist',
+ 'db_table' => 'mail_mailinglist',
+ 'db_where' => '');
$limits[] = array('field' => 'limit_mailbox',
'db_table' => 'mail_user',
@@ -67,7 +71,7 @@
$limits[] = array('field' => 'limit_web_aliasdomain',
'db_table' => 'web_domain',
- 'db_where' => "type = 'aliasdomain'");
+ 'db_where' => "type = 'alias'");
$limits[] = array('field' => 'limit_ftp_user',
'db_table' => 'ftp_user',
@@ -79,6 +83,10 @@
$limits[] = array('field' => 'limit_dns_zone',
'db_table' => 'dns_soa',
+ 'db_where' => "");
+
+ $limits[] = array('field' => 'limit_dns_slave_zone',
+ 'db_table' => 'dns_slave',
'db_where' => "");
$limits[] = array('field' => 'limit_dns_record',
@@ -106,8 +114,9 @@
$tpl = new tpl;
$tpl->newTemplate("dashlets/templates/limits.htm");
+ $wb = array();
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dashlet_limits.lng';
- include($lng_file);
+ if(is_file($lng_file)) include($lng_file);
$tpl->setVar($wb);
if($app->auth->is_admin()) {
@@ -165,4 +174,4 @@
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1