Add include_lan() to fornt

banner.php

@@ -9,12 +9,14 @@
  * 
  *
  * $Source: /cvs_backup/e107_0.8/banner.php,v $
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
- * $Date: 2009-07-18 17:03:39 $
+ * $Date: 2009-08-28 15:30:25 $
  * $Author: marj_nl_fr $
  */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."form_handler.php");
 $rs = new form;
 	

comment.php

@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/comment.php,v $
-|     $Revision: 1.10 $
+|     $Revision: 1.11 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."news_class.php");
 require_once(e_HANDLER."comment_class.php");
 define("PAGE_NAME", COMLAN_99);

contact.php

@@ -11,16 +11,18 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/contact.php,v $
-|     $Revision: 1.7 $
+|     $Revision: 1.8 $
-|     $Date: 2009-07-27 21:12:42 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: bugrain $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
 
-    // security image may be disabled by removing the appropriate shortcodes from the template.
+// security image may be disabled by removing the appropriate shortcodes from the template.
-	require_once(e_HANDLER."secure_img_handler.php");
+require_once(e_HANDLER."secure_img_handler.php");
-	$sec_img = new secure_image;
+$sec_img = new secure_image;
+
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 
 require_once(HEADERF);

download.php

@@ -11,14 +11,16 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/download.php,v $
-|     $Revision: 1.28 $ 
+|     $Revision: 1.29 $ 
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:25 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 |
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."comment_class.php");
 require_once(e_FILE."shortcode/batch/download_shortcodes.php");
 

email.php

@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/email.php,v $
-|     $Revision: 1.5 $
+|     $Revision: 1.6 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:25 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(HEADERF);
 
 $use_imagecode = FALSE;

error.php

@@ -11,13 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/error.php,v $
-|     $Revision: 1.9 $
+|     $Revision: 1.10 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 define("ERR_PAGE_ACTIVE",'error');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 require_once("class2.php");
 

fpw.php

@@ -11,12 +11,13 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/fpw.php,v $
-|     $Revision: 1.8 $
+|     $Revision: 1.9 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if(USER)
 {

login.php

@@ -11,13 +11,15 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/login.php,v $
-|     $Revision: 1.8 $
+|     $Revision: 1.9 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:25 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 if (USER)
 {
 	header('location:'.e_BASE.'index.php');      

membersonly.php

@@ -11,14 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/membersonly.php,v $
-|     $Revision: 1.3 $
+|     $Revision: 1.4 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:25 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
 
-include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_membersonly.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if(is_readable(THEME."membersonly_template.php"))
 {

news.php

@@ -9,12 +9,14 @@
  * News frontend
  *
  * $Source: /cvs_backup/e107_0.8/news.php,v $
- * $Revision: 1.16 $
+ * $Revision: 1.17 $
- * $Date: 2009-07-10 20:30:09 $
+ * $Date: 2009-08-28 15:30:24 $
- * $Author: e107steved $
+ * $Author: marj_nl_fr $
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER."news_class.php");
 require_once(e_HANDLER."comment_class.php");
 $cobj = new comment;

online.php

@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/online.php,v $
-|     $Revision: 1.8 $
+|     $Revision: 1.9 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(HEADERF);
 
 if (!$pref['track_online'])

page.php

@@ -11,14 +11,16 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/page.php,v $
-|     $Revision: 1.20 $
+|     $Revision: 1.21 $
-|     $Date: 2009-08-23 10:57:50 $
+|     $Date: 2009-08-28 15:30:24 $
 |     $Author: marj_nl_fr $
 |
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 $page = new pageClass();
 if(isset($_POST['enterpw']))
 {

print.php

@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/print.php,v $
-|     $Revision: 1.10 $
+|     $Revision: 1.11 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 $HEADER="";
 $FOOTER="";
 $CUSTOMHEADER = "";

rate.php

@@ -11,15 +11,16 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/rate.php,v $
-|     $Revision: 1.3 $
+|     $Revision: 1.4 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 // DIRTY - needs input validation, streaky
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 $qs = explode("^", e_QUERY);
 

search.php

@@ -11,13 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/search.php,v $
-|     $Revision: 1.12 $
+|     $Revision: 1.13 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 require_once('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if (!check_class($pref['search_restrict'])) {
 	require_once(HEADERF);

signup.php

@@ -9,20 +9,23 @@
  * User signup
  *
  * $Source: /cvs_backup/e107_0.8/signup.php,v $
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
- * $Date: 2009-08-09 08:39:27 $
+ * $Date: 2009-08-28 15:30:25 $
  * $Author: marj_nl_fr $
  *
 */
 
 
 require_once("class2.php");
+
 $qs = explode(".", e_QUERY);
+
 if($qs[0] != 'activate')
 {   // multi-language fix.
-	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
+	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 //	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_usersettings.php");		Shouldn't need this now
 }
+
 include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_user.php');		// Generic user-related language defines
 
 define('SIGNUP_DEBUG', FALSE);
@@ -58,7 +61,7 @@ $error = FALSE;
 //-------------------------------
 if(e_QUERY == "resend" && !USER && ($pref['user_reg_veri'] == 1))
 {
-	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_".e_PAGE);
+// done above:	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 	require_once(HEADERF);
 
 	$clean_email = $tp -> toDB($_POST['resend_email']);
@@ -202,7 +205,7 @@ if(!$_POST)
 
 if(ADMIN && (e_QUERY == "preview" || e_QUERY == "test"  || e_QUERY == "preview.aftersignup"))
 {
-	include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_".e_PAGE);
+// done above:	include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 	if(e_QUERY == "preview.aftersignup")
 	{
 		require_once(HEADERF);
@@ -284,24 +287,25 @@ if (e_QUERY)
 	$qs = explode(".", e_QUERY);
 	if ($qs[0] == "activate" && (count($qs) == 3 || count($qs) == 4) && $qs[2])
 	{
+		//TODO use generic multilanguage selection
 		// return the message in the correct language.
 		if(isset($qs[3]) && strlen($qs[3]) == 2 )
 		{
 			require_once(e_HANDLER."language_class.php");
 			$slng = new language;
 			$the_language = $slng->convert($qs[3]);
-			if(is_readable(e_LANGUAGEDIR.$the_language."/lan_signup.php"))
+			if(is_readable(e_LANGUAGEDIR.$the_language.'/lan_'.e_PAGE))
 			{
-				include(e_LANGUAGEDIR.$the_language."/lan_signup.php");
+				include(e_LANGUAGEDIR.$the_language.'/lan_'.e_PAGE);
 			}
 			else
 			{
-				require_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
+				include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 			}
 		}
 		else
 		{
-            include_lan(e_LANGUAGEDIR.e_LANGUAGE."/lan_signup.php");
+				include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 		}
 
 

sitedown.php

@@ -11,19 +11,21 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/sitedown.php,v $
-|     $Revision: 1.2 $
+|     $Revision: 1.3 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:25 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
+/*
 global $pref;
 global $tp;
 
 e107_include_once(e_LANGUAGEDIR.e_LANGUAGE."/lan_sitedown.php");
 e107_include_once(e_LANGUAGEDIR."English/lan_sitedown.php");
-
+*/
 if (!$pref['maintainance_flag'] )
 {
 	header("location: ".SITEURL);

submitnews.php

@@ -11,13 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/submitnews.php,v $
-|     $Revision: 1.12 $
+|     $Revision: 1.13 $
-|     $Date: 2009-08-17 19:26:17 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107steved $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 require_once(HEADERF);
 

top.php

@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/top.php,v $
-|     $Revision: 1.4 $
+|     $Revision: 1.5 $
-|     $Date: 2009-07-14 05:31:57 $
+|     $Date: 2009-08-28 15:30:25 $
-|     $Author: e107coders $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once ('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 if (!e_QUERY)
 {
 	$action = 'top';

upload.php

@@ -11,12 +11,13 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/upload.php,v $
-|     $Revision: 1.9 $
+|     $Revision: 1.10 $
-|     $Date: 2009-07-22 19:18:13 $
+|     $Date: 2009-08-28 15:30:24 $
-|     $Author: e107steved $
+|     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 if (!$pref['upload_enabled'] || $pref['upload_class'] == 255) 
 {

user.php

@@ -9,14 +9,15 @@
  * User information
  *
  * $Source: /cvs_backup/e107_0.8/user.php,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
- * $Date: 2008-12-20 20:18:54 $
+ * $Date: 2009-08-28 15:30:24 $
- * $Author: e107steved $
+ * $Author: marj_nl_fr $
  *
 */
-define('PAGE_NAME', 'Members');
+//HCL define('PAGE_NAME', 'Members');
 
 require_once("class2.php");
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 // Next bit is to fool PM plugin into doing things
 global $user;

userposts.php

@@ -11,12 +11,14 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/userposts.php,v $
-|     $Revision: 1.11 $
+|     $Revision: 1.12 $
-|     $Date: 2009-08-23 10:57:50 $
+|     $Date: 2009-08-28 15:30:24 $
 |     $Author: marj_nl_fr $
 +----------------------------------------------------------------------------+
 */
 require_once('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
+
 require_once(e_HANDLER.'comment_class.php');
 $cobj = new comment;
 require_once(HEADERF);

usersettings.php

@@ -9,9 +9,9 @@
  * User settings modify
  *
  * $Source: /cvs_backup/e107_0.8/usersettings.php,v $
- * $Revision: 1.38 $
+ * $Revision: 1.39 $
- * $Date: 2009-08-05 22:03:23 $
+ * $Date: 2009-08-28 15:30:24 $
- * $Author: e107coders $
+ * $Author: marj_nl_fr $
  *
 */
 /*
@@ -26,6 +26,7 @@ if(is_numeric($_SERVER["QUERY_STRING"]))
 	$eplug_admin = TRUE;
 }
 require_once ('class2.php');
+include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE);
 
 define("US_DEBUG",FALSE);
 //define('US_DEBUG', false);