From b37f8df96199195f2b7f5071e4dc66415a7eb5db Mon Sep 17 00:00:00 2001
From: marj <marj@e107.org>
Date: Sat, 18 Jul 2009 15:14:38 +0000
Subject: [PATCH] language cleanup
---
e107_admin/banner.php | 7 ++++---
e107_admin/fileinspector.php | 14 +++++++-------
e107_admin/header.php | 18 +++++-------------
e107_admin/users.php | 7 ++++---
4 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/e107_admin/banner.php b/e107_admin/banner.php
index c5d93a524..4b048cfb5 100644
--- a/e107_admin/banner.php
+++ b/e107_admin/banner.php
@@ -9,9 +9,9 @@
* Banner Administration
*
* $Source: /cvs_backup/e107_0.8/e107_admin/banner.php,v $
- * $Revision: 1.10 $
- * $Date: 2009-01-09 17:25:50 $
- * $Author: secretr $
+ * $Revision: 1.11 $
+ * $Date: 2009-07-18 15:14:38 $
+ * $Author: marj_nl_fr $
*
*/
@@ -35,6 +35,7 @@ $fl = new e_file;
require_once(e_HANDLER."message_handler.php");
$emessage = &eMessage::getInstance();
+//@FIXME mix up in banner language files
@include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_menus.php");
@include_lan(e_PLUGIN."banner_menu/languages/".e_LANGUAGE.".php");
diff --git a/e107_admin/fileinspector.php b/e107_admin/fileinspector.php
index 80b83b3d2..5615e6e7e 100644
--- a/e107_admin/fileinspector.php
+++ b/e107_admin/fileinspector.php
@@ -11,16 +11,16 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $
-| $Revision: 1.15 $
-| $Date: 2009-07-07 07:32:59 $
-| $Author: e107coders $
+| $Revision: 1.16 $
+| $Date: 2009-07-18 15:14:38 $
+| $Author: marj_nl_fr $
Includes standalone function - needs finishing
+----------------------------------------------------------------------------+
*/
-
if ($_SERVER['QUERY_STRING'] == 'alone')
{
+//@TODO make multi-language if possible
// Standalone file inspector - requires suitably edited authorisation file, otherwise it just exits with blank screen. This bit is intended to facilitate the
// checking of a totally dead installation.
@@ -949,9 +949,9 @@ class file_inspector {
$data .= "| GNU General Public License (http://gnu.org).\n";
$data .= "|\n";
$data .= "| \$Source: /cvs_backup/e107_0.8/e107_admin/fileinspector.php,v $\n";
- $data .= "| \$Revision: 1.15 $\n";
- $data .= "| \$Date: 2009-07-07 07:32:59 $\n";
- $data .= "| \$Author: e107coders $\n";
+ $data .= "| \$Revision: 1.16 $\n";
+ $data .= "| \$Date: 2009-07-18 15:14:38 $\n";
+ $data .= "| \$Author: marj_nl_fr $\n";
$data .= "+----------------------------------------------------------------------------+\n";
$data .= "*/\n\n";
}
diff --git a/e107_admin/header.php b/e107_admin/header.php
index a76239969..ccc13bedb 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-| $Revision: 1.38 $
-| $Date: 2009-07-17 23:23:36 $
-| $Author: e107coders $
+| $Revision: 1.39 $
+| $Date: 2009-07-18 15:14:38 $
+| $Author: marj_nl_fr $
+---------------------------------------------------------------+
*/
@@ -78,16 +78,8 @@ echo (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='".CHARSET.
// B.2: Include admin LAN defines
//
-if (file_exists(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_header.php')) {
- @include_once(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_header.php");
-} else {
- @include_once(e_LANGUAGEDIR."English/admin/lan_header.php");
-}
-if (file_exists(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_footer.php')) {
- @include_once(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_footer.php');
-} else {
- @include_once(e_LANGUAGEDIR.'English/admin/lan_footer.php');
-}
+include_lan(e_LANGUAGEDIR.e_LANGUAGE."/admin/lan_header.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_footer.php');
diff --git a/e107_admin/users.php b/e107_admin/users.php
index 3f435a333..4db3b3c9c 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -9,9 +9,9 @@
* Administration Area - Users
*
* $Source: /cvs_backup/e107_0.8/e107_admin/users.php,v $
-* $Revision: 1.40 $
-* $Date: 2009-07-17 07:53:13 $
-* $Author: e107coders $
+* $Revision: 1.41 $
+* $Date: 2009-07-18 15:14:38 $
+* $Author: marj_nl_fr $
*
*/
require_once('../class2.php');
@@ -1354,6 +1354,7 @@ class users
else
{
$row['user_language'] = e_LANGUAGE;
+ //@FIXME use array
require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
}