improved error messages for api, includes additional information on handshake failure, also translate the errors

2 files changed, 4 insertions, 1 deletions

diff --git a/lib/class/api.class.php b/lib/class/api.class.php
index 9e1f8f46..7da358f5 100644
--- a/lib/class/api.class.php
+++ b/lib/class/api.class.php
@@ -49,12 +49,14 @@ class Api {
 
 		if (intval($version) < self::$version) { 
 			debug_event('API','Login Failed version too old','1'); 
+			Error::add('api','Login Failed versoin too old'); 
 			return false; 
 		} 			
 
 		// If the timestamp is over 2hr old sucks to be them
 		if ($timestamp < (time() - 14400)) { 
 			debug_event('API','Login Failed, timestamp too old','1'); 
+			Error::add('api','Login Failed, timestamp too old'); 
 			return false; 
 		} 
 
@@ -93,6 +95,7 @@ class Api {
 
 			if (!$row['password']) { 
 				debug_event('API','Unable to find user with username of ' . $user_id,'1'); 
+				Error::add('api','Invalid Username/Password'); 
 				return false; 
 			} 
 
@@ -137,6 +140,7 @@ class Api {
 		} // end while
 
 		debug_event('API','Login Failed, unable to match passphrase','1'); 
+		Error::add('api','Invalid Username/Password'); 
 		return false; 
 
 	} // handhsake
diff --git a/lib/class/xmldata.class.php b/lib/class/xmldata.class.php
index a22805c8..5a1e89bb 100644
--- a/lib/class/xmldata.class.php
+++ b/lib/class/xmldata.class.php
@@ -71,7 +71,6 @@ class xmlData {
 	 * nothing fancy here...
 	 */
 	public static function error($code,$string) { 
-
 		
 		$string = self::_header() . "\t<error code=\"$code\"><![CDATA[$string]]></error>" . self::_footer(); 
 		return $string;