From 0ee22c71f98b4d9481c03bf3032e1b8d94c8f12f Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 26 Sep 2011 09:54:48 -0400
Subject: [PATCH] - Removed ufw configuration from installer to avoid "PHP Notice: Undefined index: ufw in /tmp/trunk/install/install.php on line 251". - Changed phpMyAdmin location in ISPConfig nginx vhost to allow phpmyadmin and phpmyadmin/ (with and without trailing slash).
---
interface/web/admin/language_complete.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/interface/web/admin/language_complete.php b/interface/web/admin/language_complete.php
index 63c89e7..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.');
@@ -89,7 +90,7 @@
$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 remove because does not exist in master language<br />";
+ $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
@@ -97,7 +98,7 @@
}
}
if($msg=='')
-$msg="No files created, remove or modified<br />";
+$msg="No files created, removed or modified<br />";
}
function merge_langfile($langfile,$masterfile) {
--
Gitblit v1.9.1