From f2a9b2faec10094514c16ea2c3539f910dc2bc62 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Sep 2013 05:26:33 -0400
Subject: [PATCH] - Added warning message to language import script. - Added switch to disable import function in config.inc.php - Merged language files.

---
 interface/web/admin/language_import.php |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/language_import.php b/interface/web/admin/language_import.php
index 4df2d10..c25406a 100644
--- a/interface/web/admin/language_import.php
+++ b/interface/web/admin/language_import.php
@@ -117,6 +117,8 @@
 if(!$app->auth->is_admin()) die('only allowed for administrators.');
 if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
 
+if(!$conf['language_file_import_enabled']) $app->error('Languge import function is disabled in the interface config.inc.php file.');
+
 $app->uses('tpl');
 
 $app->tpl->newTemplate('form.tpl.htm');

--
Gitblit v1.9.1