language-check error counting etc.

e107_admin/language.php

@@ -9,8 +9,8 @@
  * Administration Area - Languages
  *
  * $Source: /cvs_backup/e107_0.8/e107_admin/language.php,v $
- * $Revision: 1.22 $
+ * $Revision: 1.23 $
- * $Date: 2009-10-24 07:52:32 $
+ * $Date: 2009-11-05 08:07:48 $
  * $Author: e107coders $
  *
  */
@@ -161,10 +161,16 @@ if (varset($action) == 'db')
 }
 if (varset($_POST['ziplang']) && varset($_POST['language']))
 {
-	$text = zip_up_lang($_POST['language']);
+	if(varset($pref['lancheck'][$_POST['language']]) == 1)
-	$admin_log->log_event('LANG_04', $_POST['language'], E_LOG_INFORMATIVE, '');
+	{
-	//$ns -> tablerender(LANG_LAN_25, $text);
+		$text = zip_up_lang($_POST['language']);
-	$emessage->add(LANG_LAN_25.': '.$text);
+		$admin_log->log_event('LANG_04', $_POST['language'], E_LOG_INFORMATIVE, '');
+		$emessage->add(LANG_LAN_25.': '.$text);	
+	}
+	else
+	{
+		$emessage->add(LANG_LAN_36,E_MESSAGE_WARNING);		
+	}
 }
 if (varset($action) == "tools")
 {
@@ -575,8 +581,8 @@ function show_tools()
 
 function available_langpacks()
 {
-	require_once(e_HANDLER.'xml_class.php');
+
-	$xml = new xmlClass;
+	$xml = e107::getXml();
 	
 	$feed = e107::getPref('xmlfeed_languagepacks');
 		

e107_handlers/file_class.php

@@ -3,7 +3,7 @@
 + ----------------------------------------------------------------------------+
 |     e107 website system
 |
-|     <20>Steve Dunstan 2001-2002
+|     <20>Steve Dunstan 2001-2002
 |     http://e107.org
 |     jalist@e107.org
 |
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/file_class.php,v $
-|     $Revision: 1.2 $
+|     $Revision: 1.3 $
-|     $Date: 2008-11-20 20:34:44 $
+|     $Date: 2009-11-05 08:07:48 $
-|     $Author: e107steved $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -68,11 +68,17 @@ class e_file
 	function setDefaults()
 	{
 		$this->dirFilter = array('/', 'CVS', '.svn');										// Default directory filter (exact matches only)
-		$this->fileFilter = array('^thumbs\.db$','^Thumbs\.db$','.*\._$','^\.htaccess$','^index\.html$','^null\.txt$','\.bak$');		// Default file filter (regex format)
+		$this->fileFilter = array('^thumbs\.db$','^Thumbs\.db$','.*\._$','^\.htaccess$','^index\.html$','^null\.txt$','\.bak$','^.tmp');		// Default file filter (regex format)
 	}
 	
-
+	/**
-
+	 * 
+	 * @param object $path
+	 * @param object $fmask [optional]
+	 * @param object $omit [optional]
+	 * @param object $recurse_level [optional]
+	 * @return 
+	 */
 	function get_files($path, $fmask = '', $omit='standard', $recurse_level = 0)
 	{
 		$ret = array();

e107_handlers/login.php

@@ -12,8 +12,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/login.php,v $
-|     $Revision: 1.26 $
+|     $Revision: 1.27 $
-|     $Date: 2009-10-22 13:00:11 $
+|     $Date: 2009-11-05 08:07:48 $
 |     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
@@ -345,7 +345,9 @@ class userlogin
 			  $this->logNote('LAN_ROLL_LOG_02', $username);
 			  break;
 			case LOGIN_NOT_ACTIVATED :
-			  define("LOGINMESSAGE", LAN_LOGIN_22."<br /><br />");
+			  $srch = array("[","]");
+			  $repl = array("<a href='".e_BASE_ABS."signup.php?resend'>","</a>");					
+			  define("LOGINMESSAGE", str_replace($srch,$repl,LAN_LOGIN_22)."<br /><br />");
 			  $this->logNote('LAN_ROLL_LOG_05', $username);
 			  $this->genNote($fip, $username, LAN_LOGIN_27);
 			  $doCheck = TRUE;

e107_languages/English/admin/lan_admin.php

@@ -1,7 +1,7 @@
 <?php
 /*
  * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_admin.php,v 1.32 2009-11-04 03:07:44 e107coders Exp $
+ * $Id: lan_admin.php,v 1.33 2009-11-05 08:07:53 e107coders Exp $
  *
  * Admin Language File
 */
@@ -308,3 +308,4 @@ define("LAN_COMMENTMAN", "Comments Manager");
 define("LAN_FILTER", "Filter");
 define("LAN_NO_RECORDS", "No Records Found");
 
+

e107_languages/English/admin/lan_lancheck.php

@@ -1,13 +1,13 @@
 <?php
 /*
  * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_lancheck.php,v 1.5 2009-09-08 23:53:13 e107coders Exp $
+ * $Id: lan_lancheck.php,v 1.6 2009-11-05 08:07:53 e107coders Exp $
  *
  * Admin Language File
  * 
 */
 define("LAN_CHECK_1", "Verify/Edit Language-Pack Files"); // modified in 0.7.6
-define("LAN_CHECK_2", "Begin Verify");
+define("LAN_CHECK_2", "Verify");
 define("LAN_CHECK_3", "Verification of");
 define("LAN_CHECK_4", "File missing!");
 define("LAN_CHECK_5", "Phrase missing!");
@@ -37,4 +37,7 @@ define('LAN_CHECK_PAGE_TITLE', 'Languages');
 define('LAN_CHECK_24', 'Edit/Create file');
 define('LAN_CHECK_25', 'Language verification');
 define('LAN_CHECK_26', 'No data');
+define('LAN_CHECK_27', 'Number of language-pack errors found: ');
+
+
 ?>

e107_languages/English/admin/lan_language.php

@@ -1,7 +1,7 @@
 <?php
 /*
  * Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
- * $Id: lan_language.php,v 1.7 2009-09-08 23:53:13 e107coders Exp $
+ * $Id: lan_language.php,v 1.8 2009-11-05 08:07:53 e107coders Exp $
  *
  * Admin Language File
  *
@@ -48,6 +48,7 @@ define('LANG_LAN_33', 'Delete all tables in %s?');
 define('LANG_LAN_09', 'Are you sure?');
 define('LANG_LAN_34', 'Available Language Packs');
 define('LANG_LAN_35', "The following language packs are available for this version of e107.");
+define('LANG_LAN_36', "Language-Pack errors found! Please first verify your language files are without errors, before creating a language-pack.");
 
 
 ?>

e107_languages/English/lan_login.php

@@ -4,9 +4,9 @@
 |     e107 website system - Language File.
 |
 |     $Source: /cvs_backup/e107_0.8/e107_languages/English/lan_login.php,v $
-|     $Revision: 1.5 $
+|     $Revision: 1.6 $
-|     $Date: 2009-07-05 18:47:52 $
+|     $Date: 2009-11-05 08:07:53 $
-|     $Author: e107steved $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 define('LAN_LOGIN_1', 'User name');
@@ -30,7 +30,7 @@ define('LAN_LOGIN_18', 'Auto-ban: More than 10 failed login attempts');
 define('LAN_LOGIN_19', '> 10 failed login attempts');
 define('LAN_LOGIN_20', 'You left required field(s) blank');
 define('LAN_LOGIN_21', "Incorrect login. The entered data doesn't match to a registered user. Check if you have the CAPS-LOCK key activated as logins on this site are case sensitive");
-define('LAN_LOGIN_22', "You have not activated your account. You should have received an email with instructions on how to confirm your account. If not, please click <a href='".e_BASE."signup.php?resend'>here</a>.");
+define('LAN_LOGIN_22', "You have not activated your account. You should have received an email with instructions on how to confirm your account. If not, please click [here].");
 define('LAN_LOGIN_23', 'Incorrect code entered.');
 define('LAN_LOGIN_24', 'That username/password combination is already in use.');
 define('LAN_LOGIN_25', 'Banned user attempted to login');