From aa370627b211a51dc46891cfa4b6e3d2ef3e52db Mon Sep 17 00:00:00 2001
From: mcramer <m.cramer@pixcept.de>
Date: Tue, 16 Jul 2013 10:45:17 -0400
Subject: [PATCH] - Fixed FS#2924 - the month will not set automatically in the autoresponder by click now Along with this fixed some display problems with the combo boxes introduced in 3.0.5. Some fields were not correctly displayed with the predefined values if value and text of the underlying option element differ.
---
interface/web/dashboard/dashlets/modules.php | 109 +++++++++++++++++++++++++++++-------------------------
1 files changed, 58 insertions(+), 51 deletions(-)
diff --git a/interface/web/dashboard/dashlets/modules.php b/interface/web/dashboard/dashlets/modules.php
index 7824cd5..2f16329 100644
--- a/interface/web/dashboard/dashlets/modules.php
+++ b/interface/web/dashboard/dashlets/modules.php
@@ -1,52 +1,59 @@
-<?php
-
-class dashlet_modules {
-
- function show() {
- global $app, $conf;
-
- //* Loading Template
- $app->uses('tpl');
-
- $tpl = new tpl;
- $tpl->newTemplate("dashlets/templates/modules.htm");
-
- $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dashlet_modules.lng';
- include($lng_file);
- $tpl->setVar($wb);
-
- /*
- * 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']);
- }
- }
- }
-
- $tpl->setloop('modules', $mod);
- }
-
- return $tpl->grab();
-
- }
-}
-
-
-
-
-
-
-
-
+<?php
+
+class dashlet_modules {
+
+ function show() {
+ global $app, $conf;
+
+ //* Loading Template
+ $app->uses('tpl');
+
+ $tpl = new tpl;
+ $tpl->newTemplate("dashlets/templates/modules.htm");
+
+ $wb = array();
+ $lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_dashlet_modules.lng';
+ if(is_file($lng_file)) include($lng_file);
+ $tpl->setVar($wb);
+
+ /*
+ * 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') {
+ $module_title = $app->lng($module['title']);
+ if(function_exists('mb_strlen')) {
+ if(mb_strlen($module_title,"UTF-8") > 8) $module_title = mb_substr($module_title,0,7,"UTF-8").'..';
+ } else {
+ if(strlen($module_title) > 8) $module_title = substr($module_title,0,7).'..';
+ }
+ $mod[] = array( 'modules_title' => $module_title,
+ 'modules_startpage' => $module['startpage'],
+ 'modules_name' => $module['name']);
+ }
+ }
+ }
+
+ $tpl->setloop('modules', $mod);
+ }
+
+ return $tpl->grab();
+
+ }
+}
+
+
+
+
+
+
+
+
?>
\ No newline at end of file
--
Gitblit v1.9.1