Updates from lnApp

modules/account/classes/auth/osb.php

@@ -246,21 +246,6 @@ class Auth_OSB extends Auth_ORM {
 		return FALSE;
 	}
 
-	/**
-	 * Override the supplied find_salt() to enable disabling salt keys
-	 */
-	public function find_salt($password) {
-		$salt = '';
-
-		foreach ($this->_config['salt_pattern'] as $i => $offset) {
-			// Find salt characters, take a good long look...
-			if (is_numeric($offset))
-				$salt .= substr($password, $offset + $i, 1);
-		}
-
-		return $salt;
-	}
-
 	/**
 	 * Determine if a user is authorised to view an account
 	 *
@@ -280,12 +265,5 @@ class Auth_OSB extends Auth_ORM {
 
 		return TRUE;
 	}
-
-	/**
-	 * Disable KO3 hash_password function
-	 */
-	public function hash_password($password,$salt = FALSE) {
-		return md5($password);
-	}
 }
 ?>

modules/account/classes/model/account.php

@@ -13,7 +13,7 @@ class Model_Account extends Model_Auth_UserDefault {
 	protected $_has_many = array(
 		'user_tokens' => array('model' => 'user_token'),
 		'group' => array('through' => 'account_group'),
-		'invoice' => array(),
+		'invoice' => array('far_key'=>'id'),
 		'payment'=>array(),
 		'service' => array(),
 	);