From 6250b7ea002fd99e40d0170d31e7e19e69f97ccd Mon Sep 17 00:00:00 2001
From: Dominik <info@profi-webdesign.net>
Date: Thu, 23 Jan 2014 13:53:43 -0500
Subject: [PATCH] Merge remote-tracking branch 'ispc3master/master'
---
interface/web/admin/language_list.php | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/interface/web/admin/language_list.php b/interface/web/admin/language_list.php
index 17eab0e..2cb28dc 100644
--- a/interface/web/admin/language_list.php
+++ b/interface/web/admin/language_list.php
@@ -27,14 +27,11 @@
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-require_once('../../lib/config.inc.php');
-require_once('../../lib/app.inc.php');
+require_once '../../lib/config.inc.php';
+require_once '../../lib/app.inc.php';
-// Checking permissions for the module
-if(!stristr($_SESSION['s']['user']['modules'],'admin')) {
- header('Location: ../index.php');
- exit;
-}
+//* Check permissions for module
+$app->auth->check_module_permissions('admin');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
@@ -44,38 +41,50 @@
$app->tpl->newTemplate('form.tpl.htm');
$app->tpl->setInclude('content_tpl', 'templates/language_list.htm');
+$language_files_list = array();
+$bgcolor = '#FFFFFF';
//* reading languages
$language_option = '';
-$selected_language = (isset($_REQUEST['lng_select']))?substr($_REQUEST['lng_select'],0,2):'en';
-$handle = opendir(ISPC_ROOT_PATH.'/lib/lang/');
-while ($file = readdir ($handle)) {
- if ($file != '.' && $file != '..') {
- $tmp_lng = substr($file,0,-4);
+$selected_language = (isset($_REQUEST['lng_select']))?substr($_REQUEST['lng_select'], 0, 2):$_SESSION['s']['language'];
+$handle = opendir(ISPC_ROOT_PATH.'/lib/lang/');
+while ($file = readdir($handle)) {
+ if ($file != '.' && $file != '..') {
+ $tmp_lng = substr($file, 0, -4);
if($tmp_lng !='') {
$selected = ($tmp_lng == $selected_language)?'SELECTED':'';
$language_option .= "<option value='$tmp_lng' $selected>$tmp_lng</option>";
+
+ //$bgcolor = ($bgcolor == '#FFFFFF') ? '#EEEEEE' : '#FFFFFF';
+ if($file == $selected_language.'.lng') {
+ $language_files_list[] = array( 'module' => 'global',
+ 'lang_file' => $file,
+ 'lang_file_date' => date("Y-m-d H:i:s", filectime(ISPC_ROOT_PATH.'/lib/lang/'.$file)),
+ 'bgcolor' => $bgcolor,
+ 'lang' => $selected_language);
+ }
+
+
}
}
}
-$app->tpl->setVar('language_option',$language_option);
+$app->tpl->setVar('language_option', $language_option);
// $app->tpl->setLoop('records', $language_list);
//* list all language files of the selected language
-$bgcolor = '#FFFFFF';
-$language_files_list = array();
-$handle = @opendir(ISPC_WEB_PATH);
-while ($file = @readdir ($handle)) {
- if ($file != '.' && $file != '..') {
- if(@is_dir(ISPC_WEB_PATH.'/'.$file.'/lib/lang')) {
+$handle = @opendir(ISPC_WEB_PATH);
+while ($file = @readdir($handle)) {
+ if ($file != '.' && $file != '..') {
+ if(@is_dir(ISPC_WEB_PATH.'/'.$file.'/lib/lang')) {
$handle2 = opendir(ISPC_WEB_PATH.'/'.$file.'/lib/lang');
- while ($lang_file = @readdir ($handle2)) {
- if ($lang_file != '.' && $lang_file != '..' && substr($lang_file,0,2) == $selected_language) {
+ while ($lang_file = @readdir($handle2)) {
+ if ($lang_file != '.' && $lang_file != '..' && substr($lang_file, 0, 2) == $selected_language) {
$bgcolor = ($bgcolor == '#FFFFFF') ? '#EEEEEE' : '#FFFFFF';
- $language_files_list[] = array( 'module' => $file,
- 'lang_file' => $lang_file,
- 'bgcolor' => $bgcolor,
- 'lang' => $selected_language);
+ $language_files_list[] = array( 'module' => $file,
+ 'lang_file' => $lang_file,
+ 'lang_file_date' => date("Y-m-d H:i:s", filectime(ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file)),
+ 'bgcolor' => $bgcolor,
+ 'lang' => $selected_language);
}
}
}
@@ -87,13 +96,13 @@
-//* load language file
+//* load language file
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_language_list.lng';
-include($lng_file);
+include $lng_file;
$app->tpl->setVar($wb);
$app->tpl_defaults();
$app->tpl->pparse();
-?>
\ No newline at end of file
+?>
--
Gitblit v1.9.1