mantisbt lost_pwd.php,1.4,1.5 signup.php,1.39,1.40 verify.php,1.4,1.5

Update of /cvsroot/mantisbt/mantisbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26202

Modified Files:
        lost_pwd.php signup.php verify.php 
Log Message:
Fix for #0005653: Account signup confirmation

Index: lost_pwd.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/lost_pwd.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lost_pwd.php        21 Mar 2005 20:48:54 -0000      1.4
+++ lost_pwd.php        25 May 2005 19:57:12 -0000      1.5
@@ -22,6 +22,11 @@
                trigger_error( ERROR_LOST_PASSWORD_NOT_ENABLED, ERROR );
        }
 
+       # force logout on the current user if already authenticated
+       if( auth_is_user_authenticated() ) {
+               auth_logout();
+       }
+
        $f_username = gpc_get_string('username');
        $f_email = gpc_get_string('email');
 

Index: verify.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/verify.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- verify.php  21 Mar 2005 20:48:55 -0000      1.4
+++ verify.php  25 May 2005 19:57:13 -0000      1.5
@@ -25,6 +25,11 @@
        $f_user_id = gpc_get_string('id');
        $f_confirm_hash = gpc_get_string('confirm_hash');
 
+       # force logout on the current user if already authenticated
+       if( auth_is_user_authenticated() ) {
+               auth_logout();
+       }
+
        $t_calculated_confirm_hash = auth_generate_confirm_hash( $f_user_id );
 
        if ( $f_confirm_hash != $t_calculated_confirm_hash ) {
@@ -41,16 +46,4 @@
        auth_attempt_script_login( user_get_field( $f_user_id, 'username' ) );
 
        include ( dirname( __FILE__ ) . DIRECTORY_SEPARATOR . 
'account_page.php' );
-/*
-       html_page_top1();
-       html_page_top2();
-
-       echo '<br/>';
-       echo '<div align="center">';
-       echo lang_get( 'lost_password_confirm_hash_OK' ) . '<br/><br/>';
-       print_bracket_link( $t_redirect_url, lang_get( 'proceed' ) );
-       echo '</div>';
-
-       html_page_bottom1( __FILE__ );
-*/
 ?>

Index: signup.php
===================================================================
RCS file: /cvsroot/mantisbt/mantisbt/signup.php,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- signup.php  12 Feb 2005 20:01:07 -0000      1.39
+++ signup.php  25 May 2005 19:57:13 -0000      1.40
@@ -24,6 +24,11 @@
        $f_email = email_append_domain( trim( $f_email ) );
        $f_captcha = strtolower( trim( $f_captcha ) );
 
+       # forse logout on the current user if already authenticated
+       if( auth_is_user_authenticated() ) {
+               auth_logout();
+       }
+
        # Check to see if signup is allowed
        if ( OFF == config_get( 'allow_signup' ) ) {
                print_header_redirect( 'login_page.php' );



-------------------------------------------------------
SF.Net email is sponsored by: GoToMeeting - the easiest way to collaborate
online with coworkers and clients while avoiding the high cost of travel and
communications. There is no equipment to buy and you can meet as often as
you want. Try it free.http://ads.osdn.com/?ad_id=7402&alloc_id=16135&op=click