From e3ba932c63d6a8429b52f8de0e3a11709f405d80 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Thu, 16 Sep 2010 09:07:55 -0400
Subject: [PATCH] Fixed: FS#1310 - mailfilter not removed from database
---
interface/web/dashboard/dashboard.php | 57 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/interface/web/dashboard/dashboard.php b/interface/web/dashboard/dashboard.php
index f2d2f4d..a874aff 100644
--- a/interface/web/dashboard/dashboard.php
+++ b/interface/web/dashboard/dashboard.php
@@ -93,34 +93,51 @@
$new_version = @file_get_contents('http://www.ispconfig.org/downloads/ispconfig3_version.txt');
$new_version = trim($new_version);
if($new_version != ISPC_APP_VERSION) {
- $info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available! <a href="http://www.ispconfig.org">See more...</a>');
+ $info[] = array('info_msg' => 'There is a new Version of ISPConfig 3 available! <a href="http://www.ispconfig.org/ispconfig-3/download">See more...</a>');
}
}
$app->tpl->setloop('info', $info);
-/*
- * Show all modules, the user is allowed to use
-*/
-$modules = explode(',', $_SESSION['s']['user']['modules']);
-$mod = array();
-if(is_array($modules)) {
- foreach($modules as $mt) {
- if(is_file('../' . $mt . '/lib/module.conf.php')) {
- if(!preg_match("/^[a-z]{2,20}$/i", $mt)) die('module name contains unallowed chars.');
- include_once('../' . $mt.'/lib/module.conf.php');
- /* We don't want to show the dashboard */
- if ($mt != 'dashboard') {
- $mod[] = array( 'modules_title' => $app->lng($module['title']),
- 'modules_startpage' => $module['startpage'],
- 'modules_name' => $module['name']);
- }
- }
+/* Load the dashlets*/
+$dashlet_list = array();
+$handle = @opendir(ISPC_WEB_PATH.'/dashboard/dashlets');
+while ($file = @readdir ($handle)) {
+ if ($file != '.' && $file != '..' && !is_dir($file)) {
+ $dashlet_name = substr($file,0,-4);
+ $dashlet_class = 'dashlet_'.$dashlet_name;
+ include_once(ISPC_WEB_PATH.'/dashboard/dashlets/'.$file);
+ $dashlet_list[$dashlet_name] = new $dashlet_class;
}
-
- $app->tpl->setloop('modules', $mod);
}
+
+/* Which dashlets in which column */
+/******************************************************************************/
+$leftcol_dashlets = array('modules');
+$rightcol_dashlets = array('limits');
+/******************************************************************************/
+
+
+/* Fill the left column */
+$leftcol = array();
+foreach($leftcol_dashlets as $name) {
+ if(isset($dashlet_list[$name])) {
+ $leftcol[]['content'] = $dashlet_list[$name]->show();
+ }
+}
+$app->tpl->setloop('leftcol', $leftcol);
+
+/* Fill the right columnn */
+$rightcol = array();
+foreach($rightcol_dashlets as $name) {
+ if(isset($dashlet_list[$name])) {
+ $rightcol[]['content'] = $dashlet_list[$name]->show();
+ }
+}
+$app->tpl->setloop('rightcol', $rightcol);
+
+
//* Do Output
$app->tpl->pparse();
--
Gitblit v1.9.1