From 0732d32f508045da40fe9df607b9ef20ce2d198f Mon Sep 17 00:00:00 2001
From: xaver <xaver@ispconfig3>
Date: Tue, 06 Mar 2012 10:03:23 -0500
Subject: [PATCH] join fix - disappered in commit + Switch traffic joins, because its faster - Tested in a productive system (MySQL 5.1) as query few tausend domains 1-3 sec for Webtraffic sort, faster SQL = faster and MySQL 5.5 is much faster with joins (standard is not sorted with slow traffic querys) -> slowest part is coping the tables into temp -> more tweeks on cache... -> faster by heavy use
---
interface/web/dashboard/lib/custom_menu.inc.php | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/interface/web/dashboard/lib/custom_menu.inc.php b/interface/web/dashboard/lib/custom_menu.inc.php
index 60b95dd..8796023 100644
--- a/interface/web/dashboard/lib/custom_menu.inc.php
+++ b/interface/web/dashboard/lib/custom_menu.inc.php
@@ -29,18 +29,34 @@
*/
$app->uses('simplepie');
+$app->uses('auth');
$app->tpl->newTemplate('dashboard/templates/custom_menu.htm');
$app->uses('getconf');
- $misc_config = $app->getconf->get_global_config('misc');
+$misc_config = $app->getconf->get_global_config('misc');
-//* We want to show the news only to the admin user
-if($misc_config['dashboard_atom_url'] != '') {
+switch($_SESSION['s']['user']['typ']) {
+ case 'admin':
+ $atom_url = $misc_config['dashboard_atom_url_admin'];
+ break;
+ case 'user':
+ if ($app->auth->has_clients($_SESSION['s']['user']['userid']) === true)
+ $atom_url = $misc_config['dashboard_atom_url_reseller'];
+ else
+ $atom_url = $misc_config['dashboard_atom_url_client'];
+ break;
+ default:
+ $atom_url = "";
+}
+
+$rows = array();
+
+if( $atom_url != '' ) {
if(!isset($_SESSION['s']['rss_news'])) {
- $app->simplepie->set_feed_url($misc_config['dashboard_atom_url']);
+ $app->simplepie->set_feed_url($atom_url);
$app->simplepie->enable_cache(false);
$app->simplepie->init();
$items = $app->simplepie->get_items();
--
Gitblit v1.9.1