From 5ca959fa688255a8de61f89fe2751eb4d24a6912 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 22 Mar 2016 09:22:07 -0400
Subject: [PATCH] fixed typo
---
interface/web/admin/language_complete.php | 103 +++++++++++++++++++++++++++++++--------------------
1 files changed, 62 insertions(+), 41 deletions(-)
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index b0e36fe..d28e89a 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -27,11 +27,13 @@
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';
//* Check permissions for module
$app->auth->check_module_permissions('admin');
+$app->auth->check_security_permissions('admin_allow_langedit');
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
//* This is only allowed for administrators
if(!$app->auth->is_admin()) die('only allowed for administrators.');
@@ -45,13 +47,13 @@
$language_option = '';
$error = '';
$msg = '';
-$selected_language = (isset($_REQUEST['lng_select']))?substr($_REQUEST['lng_select'],0,2):'en';
+$selected_language = (isset($_REQUEST['lng_select']))?substr($_REQUEST['lng_select'], 0, 2):'en';
if(!preg_match("/^[a-z]{2}$/i", $selected_language)) die('unallowed characters in selected language name.');
-$handle = opendir(ISPC_ROOT_PATH.'/lib/lang/');
-while ($file = readdir ($handle)) {
- if ($file != '.' && $file != '..') {
- $tmp_lng = substr($file,0,-4);
+$handle = opendir(ISPC_ROOT_PATH.'/lib/lang/');
+while ($file = readdir($handle)) {
+ if ($file != '.' && $file != '..') {
+ $tmp_lng = substr($file, 0, -4);
if($tmp_lng !='' && $tmp_lng != 'en') {
$selected = ($tmp_lng == $selected_language)?'SELECTED':'';
$language_option .= "<option value='$tmp_lng' $selected>$tmp_lng</option>";
@@ -59,52 +61,68 @@
}
}
}
-$app->tpl->setVar('language_option',$language_option);
-$app->tpl->setVar('error',$error);
+$app->tpl->setVar('language_option', $language_option);
+$app->tpl->setVar('error', $error);
// Export the language file
if(isset($_POST['lng_select']) && $error == '') {
+
+ //* CSRF Check
+ $app->auth->csrf_token_check();
// complete the global langauge file
- merge_langfile(ISPC_LIB_PATH."/lang/".$selected_language.".lng",ISPC_LIB_PATH."/lang/en.lng");
-
+ merge_langfile(ISPC_LIB_PATH."/lang/".$selected_language.".lng", ISPC_LIB_PATH."/lang/en.lng");
+
// Go trough all language files
$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) == 'en') {
- $target_lang_file = $selected_language.substr($lang_file,2);
- merge_langfile(ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$target_lang_file,ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file);
+ while ($lang_file = @readdir($handle2)) {
+ if ($lang_file != '.' && $lang_file != '..' && substr($lang_file, 0, 2) == 'en') {
+ $target_lang_file = $selected_language.substr($lang_file, 2);
+ merge_langfile(ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$target_lang_file, ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file);
}
}
+ $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) {
+ $master_lang_file=ISPC_WEB_PATH.'/'.$file.'/lib/lang/en'.substr($lang_file, 2);
+ $target_lang_file=ISPC_WEB_PATH.'/'.$file.'/lib/lang/'.$lang_file;
+ if(!file_exists($master_lang_file)){
+ unlink($target_lang_file);
+ $msg.="File $target_lang_file removed because does not exist in master language<br />";
+ }
+ }
+ }//Finish of remove the files how not exists in master language
}
}
}
+ if($msg=='')
+ $msg="No files created, removed or modified<br />";
}
-function merge_langfile($langfile,$masterfile) {
+function merge_langfile($langfile, $masterfile) {
global $msg;
-
+
if(is_file($langfile)) {
-
+
// Load the english language file
- include($masterfile);
+ include $masterfile;
if(isset($wb) && is_array($wb)) {
$wb_master = $wb;
unset($wb);
} else {
$wb_master = array();
}
-
+
// Load the incomplete language file
$wb = array();
- include($langfile);
-
+ include $langfile;
+
$n = 0;
foreach($wb_master as $key => $val) {
if(!isset($wb[$key])) {
@@ -112,7 +130,7 @@
$n++;
}
}
-
+
$r = 0;
foreach($wb as $key => $val) {
if(!isset($wb_master[$key])) {
@@ -120,37 +138,40 @@
$r++;
}
}
-
+
$file_content = "<?php\n";
foreach($wb as $key => $val) {
- $val = str_replace("'",'',$val);
- $val = str_replace('"','',$val);
+ $val = str_replace("'", "\\'", $val);
+ $val = str_replace('"', '\"', $val);
$file_content .= '$wb['."'$key'".'] = '."'$val';\n";
}
$file_content .= "?>\n";
-
- $msg .= "Added $n lines to the file $langfile<br />";
+
+ if($n!=0)
+ $msg .= "Added $n lines to the file $langfile<br />";
if($r!=0)
- $msg .= "Removed $r lines to the file $langfile<br />";
- file_put_contents($langfile ,$file_content);
+ $msg .= "Removed $r lines to the file $langfile<br />";
+ file_put_contents($langfile , $file_content);
} else {
$msg .= "File does not exist yet. Copied file $masterfile to $langfile<br />";
- copy($masterfile,$langfile);
+ copy($masterfile, $langfile);
}
}
+$app->tpl->setVar('msg', $msg);
+//* SET csrf token
+$csrf_token = $app->auth->csrf_token_get('language_merge');
+$app->tpl->setVar('_csrf_id',$csrf_token['csrf_id']);
+$app->tpl->setVar('_csrf_key',$csrf_token['csrf_key']);
-
-$app->tpl->setVar('msg',$msg);
-
-//* load language file
+//* load language file
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_language_complete.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