Finally changed the Language files and activated new loading mechanism.

Changes according to : http://forum.wbce.org/viewtopic.php?id=59 No entity conversion yet.
WBCE · Aug 1, 2015 · b0bd015 · b0bd015
1 parent 54dac88
commit b0bd015
Show file tree

Hide file tree

Showing 24 changed files with 75 additions and 259 deletions.
diff --git a/wbce/framework/initialize.php b/wbce/framework/initialize.php
@@ -173,7 +173,7 @@ function makePhExp($sList)
         }
     }
 
-
+/*
 	// Load Language file
 	if(!defined('LANGUAGE_LOADED')) {
 		if(!file_exists(WB_PATH.'/languages/'.LANGUAGE.'.php')) {
@@ -182,9 +182,9 @@ function makePhExp($sList)
 			require_once(WB_PATH.'/languages/'.LANGUAGE.'.php');
 		}
 	}
+*/
 
-
-   /* // Load default language file so even incomplete languagefiles display at least the english text
+    // Load default language file so even incomplete languagefiles display at least the english text
 	if(!file_exists(WB_PATH.'/languages/EN.php')) {
 		exit('Error loading default language file (EN), please check configuration');
 	} else {
@@ -199,10 +199,10 @@ function makePhExp($sList)
 		define("LANGUAGE_LOADED", TRUE);
 	}
 
-	 include old languages format  only for compatibility need to check code for old vars*/
-	/*if(file_exists(WB_PATH.'/languages/old.format.inc.php')) {
+	//include old languages format  only for compatibility need to check code for old vars 
+	if(file_exists(WB_PATH.'/languages/old.format.inc.php')) {
 		include(WB_PATH.'/languages/old.format.inc.php');
-	}*/
+	}
 
 
 

diff --git a/wbce/languages/BG.php b/wbce/languages/BG.php
@@ -16,13 +16,8 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
 // Set the language information
 $language_code = 'BG';
@@ -677,8 +672,4 @@
 $OVERVIEW['USERS'] = '&#1059;&#1087;&#1088;&#1072;&#1074;&#1083;&#1077;&#1085;&#1080;&#1077; &#1085;&#1072; &#1087;&#1086;&#1090;&#1088;&#1077;&#1073;&#1080;&#1090;&#1077;&#1083;&#1080;&#1090;&#1077; &#1084;&#1086;&#1078;&#1077;&#1097;&#1080; &#1076;&#1072; &#1074;&#1083;&#1103;&#1079;&#1072;&#1090; &#1074; WebsiteBaker...';
 $OVERVIEW['VIEW'] = '&#1042;&#1080;&#1078; &#1089;&#1074;&#1086;&#1103; &#1089;&#1072;&#1081;&#1090; &#1074; &#1085;&#1086;&#1074; &#1087;&#1088;&#1086;&#1079;&#1086;&#1088;&#1077;&#1094;...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/CA.php b/wbce/languages/CA.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'CA';
@@ -677,8 +673,4 @@
 $OVERVIEW['USERS'] = 'Administreu els usuaris que poden identificar-se a WebsiteBaker...';
 $OVERVIEW['VIEW'] = 'Veure i navegar r&agrave;pidament la vostra p&agrave;gina web en una nova finestra...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/CS.php b/wbce/languages/CS.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'CS';
@@ -677,8 +673,4 @@
 $OVERVIEW['USERS'] = 'Spravovat u&#382;ivate WebsiteBakeru...';
 $OVERVIEW['VIEW'] = 'Rychle prohl&eacute;dhout str&aacute;nky v nov&eacute;m okn&#283;...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/DA.php b/wbce/languages/DA.php
@@ -16,13 +16,8 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Du kan ikke få direkte adgang til denne fil"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
 // Set the language information
 $language_code = 'DA';
@@ -677,8 +672,4 @@
 $OVERVIEW['USERS'] = 'Administr&eacute;r brugere som kan logge ind p&aring; WebsiteBaker systemet...';
 $OVERVIEW['VIEW'] = 'Hurtig visning og gennemsyn af dit Websted i et nyt vindue..';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/DE.php b/wbce/languages/DE.php
@@ -16,14 +16,8 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED'))
-{
-	define('LANGUAGE_LOADED', true);
-}
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
 // Set the language information
 $language_code = 'DE';
@@ -674,8 +668,4 @@
 $OVERVIEW['USERS'] = 'Verwaltung von Benutzern, die sich in WebsiteBaker einloggen d&uuml;rfen...';
 $OVERVIEW['VIEW'] = 'Ansicht Ihrer Webseite in einem neuen Fenster...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/EN.php b/wbce/languages/EN.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'EN';
@@ -690,8 +686,4 @@
 $MESSAGE['THEME_DESTINATION_READONLY']       = 'No rights to create new theme directory!';
 $MESSAGE['THEME_IMPORT_HTT']                 = 'Import additional templates into the current active theme.<br />Use these templates to overwrite the corresponding default template.';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/ES.php b/wbce/languages/ES.php
@@ -16,13 +16,8 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
 // Set the language information
 $language_code = 'ES';
@@ -677,8 +672,4 @@
 $OVERVIEW['USERS'] = 'Administrar acceso de usuarios a WebsiteBaker...';
 $OVERVIEW['VIEW'] = 'Ver y explorar tu sitio en una nueva ventana...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/ET.php b/wbce/languages/ET.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'ET';
@@ -677,8 +673,4 @@
 $OVERVIEW['USERS'] = 'Halda kasutajaid kes saavad logida WebsiteBakerisse...';
 $OVERVIEW['VIEW'] = 'Kiirelt vaata ja lehitse oma veebisaiti uues aknas...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/FI.php b/wbce/languages/FI.php
@@ -16,13 +16,8 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
 // Set the language information
 $language_code = 'FI';
@@ -677,8 +672,4 @@
 $OVERVIEW['USERS'] = 'K&auml;ytt&auml;j&auml;hallinta...';
 $OVERVIEW['VIEW'] = 'Tarkastele sivuja...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/FR.php b/wbce/languages/FR.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'FR';
@@ -677,8 +673,4 @@
 $OVERVIEW['USERS'] = 'Gestion des acc&egrave;s au site';
 $OVERVIEW['VIEW'] = 'Aper&ccedil;u du site dans une nouvelle fen&ecirc;tre';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/HR.php b/wbce/languages/HR.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'HR';
@@ -677,8 +673,4 @@
 $OVERVIEW['USERS'] = 'Upravljajte korisnicima koji se mogu logirati na WebsiteBaker...';
 $OVERVIEW['VIEW'] = 'Brzo pogledajte i listajte Va&scaron; web u novom prozoru...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/HU.php b/wbce/languages/HU.php
@@ -16,13 +16,8 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
-
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
 // Set the language information
 $language_code = 'HU';
@@ -677,8 +672,4 @@
 $OVERVIEW['USERS'] = 'Felhaszn&aacute;l&oacute;k bejelentkez&eacute;si enged&eacute;lyei...';
 $OVERVIEW['VIEW'] = 'A k&eacute;sz Port&aacute;l megtekint&eacute;se &uacute;j ablakban...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/IT.php b/wbce/languages/IT.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'IT';
@@ -677,8 +673,4 @@
 $OVERVIEW['USERS'] = 'Gestisci gli utenti che possono collegarsi a WebsiteBaker...';
 $OVERVIEW['VIEW'] = 'Visualizza il sito in una nuova finestra...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+
diff --git a/wbce/languages/LV.php b/wbce/languages/LV.php
@@ -16,13 +16,9 @@
  *
  */
 
-// Must include code to stop this file being access directly
-if(defined('WB_PATH') == false) { exit("Cannot access this file directly"); }
+//no direct file access
+if(count(get_included_files()) ==1){$z="HTTP/1.0 404 Not Found";header($z);die($z);}
 
-// Define that this file is loaded
-if(!defined('LANGUAGE_LOADED')) {
-define('LANGUAGE_LOADED', true);
-}
 
 // Set the language information
 $language_code = 'LV';
@@ -677,8 +673,4 @@
 $OVERVIEW['USERS'] = 'Mened&#382;et lietotajus, kas var ielogties WebsiteBaker sistema...';
 $OVERVIEW['VIEW'] = 'Apskatit majas lapu jauna loga...';
 
-/* include old languages format */
-if(file_exists(WB_PATH.'/languages/old.format.inc.php'))
-{
-	include(WB_PATH.'/languages/old.format.inc.php');
-}
+