From ad955792a8ade5c0015aa3d68f86b1035c1acc31 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 22 Jan 2014 11:30:52 -0500
Subject: [PATCH] Fixed bug from previous commit
---
interface/web/dashboard/dashlets/modules.php | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/interface/web/dashboard/dashlets/modules.php b/interface/web/dashboard/dashlets/modules.php
index cfb2e12..1b1d2ef 100644
--- a/interface/web/dashboard/dashlets/modules.php
+++ b/interface/web/dashboard/dashlets/modules.php
@@ -1,21 +1,21 @@
<?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);
+ if(is_file($lng_file)) include $lng_file;
$tpl->setVar($wb);
-
+
/*
* Show all modules, the user is allowed to use
*/
@@ -25,24 +25,29 @@
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');
+ 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(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']);
+ 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();
-
+
}
+
}
@@ -52,4 +57,4 @@
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1