From 378935a8a92592cf1ef164b4d969c376c46a78c6 Mon Sep 17 00:00:00 2001
From: nveid <nveid@ispconfig3>
Date: Fri, 09 Dec 2011 02:35:24 -0500
Subject: [PATCH] Fixed mysql error when switching from "Options" tab to "Ftp User" edit tab, the onUpdate thought we were trying to change the Website because the Options Datalog didn't have the parent_domain_id and the Ftp User tab did.
---
interface/web/admin/language_complete.php | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index 4f45724..1ac6988 100644
--- a/interface/web/admin/language_complete.php
+++ b/interface/web/admin/language_complete.php
@@ -32,6 +32,7 @@
//* Check permissions for module
$app->auth->check_module_permissions('admin');
+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.');
@@ -82,9 +83,22 @@
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) {
@@ -112,6 +126,14 @@
$n++;
}
}
+
+ $r = 0;
+ foreach($wb as $key => $val) {
+ if(!isset($wb_master[$key])) {
+ unset($wb[$key]);
+ $r++;
+ }
+ }
$file_content = "<?php\n";
foreach($wb as $key => $val) {
@@ -120,17 +142,17 @@
$file_content .= '$wb['."'$key'".'] = '."'$val';\n";
}
$file_content .= "?>\n";
-
+
+ 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);
} else {
$msg .= "File does not exist yet. Copied file $masterfile to $langfile<br />";
copy($masterfile,$langfile);
}
}
-
-
-
$app->tpl->setVar('msg',$msg);
--
Gitblit v1.9.1