Fixed : Password recovery page show wrong message

Fixed : Friend Request link in email
Update : CB Installer

upload/cb_install/clipbucket.php

@@ -12,7 +12,7 @@
  define("ClipBucket","ClipBucket - Open Source Media Sharing Script by Arslan Hassan");
  define("VERSION","2.4.5");
  define("STATE","RC3");
- define("REV","667");
+ define("REV","669");
  define("RELEASED","5-23-2011");
  define("AUTHORS","ARSLAN HASSAN,FAWAZ TAHIR");
 

upload/cb_install/sql/email_templates.sql

@@ -5,7 +5,7 @@ INSERT INTO `{tbl_prefix}email_templates` (`email_template_id`, `email_template_
 (3, 'Private Message Notification', 'pm_email_message', '[{website_title}] - {sender} has sent you a private message', '{sender} has sent you a private message, \r\n\r\n{subject}\r\n"{content}"\r\n\r\nclick here to view your inbox <a href="{baseurl}/private_message.php?mode=inbox&mid={msg_id}">{baseurl}/private_message.php?mode=inbox&mid={msg_id}</a>\r\n\r\n{website_title}', ''),
 (4, 'Acitvation code request template', 'avcode_request_template', '[{website_title}] - Account activation code request', 'Hello {username},\r\n\r\nYour Activation Code is : {avcode}\r\n<a href=''{baseurl}/activation.php?av_username={username}&avcode={avcode}''>Click Here</a> To goto Activation Page\r\n\r\nDirect Activation\r\n==========================================\r\nClick Here or Copy & Paste the following link in your browser\r\n{baseurl}/activation.php?av_username={username}&avcode={avcode}\r\n\r\nif above given links are not working, please go here and activate it\r\n\r\nEmail           : {email}\r\nUsername        : {username}\r\nActivation code : {avcode}\r\n\r\nif above given is not working , please go here and activate it\r\n<a href=''{baseurl}/activation.php''>{baseurl}/activation.php</a>\r\n\r\n----------------\r\nRegards\r\n{website_title}', 'username,email,avcode,doj'),
 (5, 'Welcome Message Template', 'welcome_message_template', 'Welcome {username} to {website_title}', 'Hello {username},\r\nThanks for joining at {website_title}!, you are now part of our community and we hope you will enjoy your stay\r\n\r\nAll the best,\r\n{website_title}', 'username,email'),
-(6, 'Password Reset Request', 'password_reset_request', '[{website_title}] - Password reset confirmation', 'Dear {username}\r\nyou have requested a password reset, please follow the link in order to reset your password\r\n<a href="{baseurl}/forgot.php?mode=reset_pass&user={userid}&avcode={avcode}">{baseurl}/forgot.php?mode=reset_pass&user={userid}&avcode={avcode}</a>\r\n\r\n-----------------------------------------\r\nIF YOU HAVE NOT REQUESTED A PASSWORD RESTE - PLEASE IGNORE THIS MESSAGE\r\n-----------------------------------------\r\nRegards\r\n{website_title}', 'username,userid,avcode'),
+(6, 'Password Reset Request', 'password_reset_request', '[{website_title}] - Password reset confirmation', 'Dear {username}\r\nyou have requested a password reset, please follow the link in order to reset your password\r\n<a href="{baseurl}/forgot.php?mode=reset_pass&user={userid}&avcode={avcode}">{baseurl}/forgot.php?mode=reset_pass&user={userid}&avcode={avcode}</a>\r\n\r\n-----------------------------------------\r\nIF YOU HAVE NOT REQUESTED A PASSWORD RESET - PLEASE IGNORE THIS MESSAGE\r\n-----------------------------------------\r\nRegards\r\n{website_title}', 'username,userid,avcode'),
 (7, 'Password Reset Details', 'password_reset_details', '[{website_title}] - Password reset details', 'Dear {username}\r\nyour password has been reset\r\nyour new password is : {password}\r\n\r\n<a href="{login_link}">click here to login to website</a>\r\n<{login_link}>\r\n\r\n---------------\r\nRegards\r\n{website_title}', 'username,password'),
 (8, 'Forgot username request', 'forgot_username_request', '[{website_title}] - your {website_title} username', 'Hello,\r\nyour {website_title} username is : {username}\r\n\r\n--------------\r\nRegards\r\n{website_title}', '{username}'),
 (9, 'Friend Request Email', 'friend_request_email', '[{website_title}] {username} add you as friend', 'Hi {reciever},\r\n{sender} added you as a friend on {website_title}. We need to confirm that you know {sender} in order for you to be friends on {website_title}.\r\n\r\n<a href="{sender_link}">View profile of {sender}</a> \r\n<a href="{request_link}">click here to respond to friendship request</a>\r\n\r\nThanks,\r\n{website_title} Team', 'reciever,sender,sender_link,request_link'),

upload/forgot.php

@@ -32,7 +32,8 @@ require 'includes/config.inc.php';
 	{
 		$input = mysql_clean(get('user'));
 		$avcode = mysql_clean(get('avcode'));
-		$userquery->reset_password(2,$input,$avcode);
+		if($userquery->reset_password(2,$input,$avcode))
+			assign('pass_recover','success');
 	}
 	
 	/**

upload/includes/classes/user.class.php

@@ -826,7 +826,7 @@ class userquery extends CBCategory{
 			 '{reciever}'	=> $friend['username'],
 			 '{sender}'		=> $sender['username'],
 			 '{sender_link}'=> $this->profile_link($sender),
-			 '{request_link}'=> BASEURL.'/manage_contacts.php?mode=request&confirm='.$insert_id
+			 '{request_link}'=> BASEURL.'/manage_contacts.php?mode=request&confirm='.$uid
 			);
 			if(!is_array($var))
 				$var = array();
@@ -1341,6 +1341,7 @@ class userquery extends CBCategory{
 					cbmail(array('to'=>$udetails['email'],'from'=>WEBSITE_EMAIL,'subject'=>$subj,'content'=>$msg));
 				
 					e(lang('usr_rpass_email_msg'),"m");
+					return true;
 				}
 			}
 			break;
@@ -1377,6 +1378,7 @@ class userquery extends CBCategory{
 					//Now Finally Sending Email
 					cbmail(array('to'=>$udetails['email'],'from'=>WEBSITE_EMAIL,'subject'=>$subj,'content'=>$msg));
 					e(lang('usr_pass_email_msg'),'m');
+					return true;
 				}
 			}
 			break;
@@ -1391,9 +1393,9 @@ class userquery extends CBCategory{
 		global $cbemail;
 		$udetails = $this->get_user_details($email);
 		if(!$udetails)
-			e(lang('usr_exist_err'));
+			e(lang('no_user_associated_with_email'));
 		elseif(!verify_captcha())
-					e(lang('usr_ccode_err'));
+			e(lang('usr_ccode_err'));
 		else
 		{
 			$tpl = $cbemail->get_template('forgot_username_request');

upload/styles/cbv2new/layout/forgot.html

@@ -1,5 +1,10 @@
+{if $pass_recover=='success'}
 
 
+{lang code='pass_changed_success'}
+
+{else}
+
 <div style="width:900px; margin:auto">
 
 	{if $mode=='' || $mode=='reset_pass' }  
@@ -61,3 +66,6 @@
   {/if}
     
 </div>
+
+
+{/if}

upload/styles/cbv2new/layout/signup.html

@@ -32,7 +32,7 @@
             <input type="submit" name="login" class="cb_button_2" value="{lang code='login'}" id="login_signup_bttn" {ANCHOR place='login_signup_bttn'} >
             </div>
             <div class="clear"></div>
-            <div align="center"><a href="{$baseurl}/forgot.php">{lang code='user_forgot_password'}</a> | <a href="{$baseurl}/forgot.php">{lang code='user_forgot_username'}</a></div>
+            <div align="center"><a href="{$baseurl}/forgot.php">{lang code='user_forgot_password'}</a> | <a href="{$baseurl}/forgot.php?mode=recover_username">{lang code='user_forgot_username'}</a></div>
             
             {ANCHOR place='login_form'}