From e1ceb050e19c7574bca146a8da7047ee4ff456b5 Mon Sep 17 00:00:00 2001
From: Marius Burkard <m.burkard@pixcept.de>
Date: Sun, 10 Jul 2016 05:02:35 -0400
Subject: [PATCH] Merge branch 'stable-3.1'
---
interface/web/dashboard/lib/custom_menu.inc.php | 44 ++++++++++++++++++++++++++++++--------------
1 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/interface/web/dashboard/lib/custom_menu.inc.php b/interface/web/dashboard/lib/custom_menu.inc.php
index 60b95dd..176805e 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();
@@ -53,24 +69,24 @@
//* We want to show only the first 10 news records
if($n <= 10) {
$rows[] = array('title' => $item->get_title(),
- 'link' => $item->get_link(),
- 'content' => $item->get_content(),
- 'date' => $item->get_date('Y-m-d')
- );
+ 'link' => $item->get_link(),
+ 'content' => $item->get_content(),
+ 'date' => $item->get_date($app->lng('conf_format_dateshort'))
+ );
}
$n++;
}
-
+
$_SESSION['s']['rss_news'] = $rows;
-
+
} else {
$rows = $_SESSION['s']['rss_news'];
}
-
- $app->tpl->setVar('latest_news_txt',$app->lng('latest_news_txt'));
+
+ $app->tpl->setVar('latest_news_txt', $app->lng('latest_news_txt'));
}
-$app->tpl->setLoop('news',$rows);
+$app->tpl->setLoop('news', $rows);
?>
--
Gitblit v1.9.1