New password format

Author: GodMod

guildrequest_plugin_class.php

@@ -28,7 +28,7 @@
   +--------------------------------------------------------------------------*/
 class guildrequest extends plugin_generic {
 
-	public $version				= '1.1.10';
+	public $version				= '1.1.11';
 	public $build				= '';
 	public $copyright			= 'GodMod';
 
@@ -120,11 +120,10 @@ public function pre_install(){
 				'name'	=> 'GuildRequest',
 			);
 
-			$salt = $this->user->generate_salt();
 			$strPassword = random_string(40);
-			$strPwdHash = $this->user->encrypt_password($strPassword, $salt);
+			$strPwdHash = $this->user->encrypt_password($strPassword);
 
-			$user_id = $this->pdh->put('user', 'insert_user_bridge', array($arrUserdata['name'], $strPwdHash.':'.$salt, $arrUserdata['email'], false));
+			$user_id = $this->pdh->put('user', 'insert_user_bridge', array($arrUserdata['name'], $strPwdHash, $arrUserdata['email'], false));
 			if ($user_id){
 				$this->pdh->put('user', 'add_special_user', array($user_id));
 			}

page_objects/viewrequest_pageobject.class.php

@@ -117,8 +117,7 @@ public function status_change(){
 
 			if($this->pdh->get('user', 'check_username', array($newUsername)) !== 'false' && $this->pdh->get('user', 'check_email', array($row['email'])) !== 'false'){
 
-				$salt = $this->user->generate_salt();
-				$strPwdHash = $this->user->encrypt_password(random_string(40), $salt);
+				$strPwdHash = $this->user->encrypt_password(random_string(40));
 				$newUserId = $this->pdh->put('user', 'insert_user_bridge', array($newUsername, $strPwdHash, register('encrypt')->decrypt($row['email'])));
 
 				// Email them their new password