| Index: trunk/phpwiki/fpw/special_userlogin.php |
| — | — | @@ -26,10 +26,10 @@ |
| 27 | 27 | if ( $nu->isLoggedIn ) { |
| 28 | 28 | $user = new WikiUser ; |
| 29 | 29 | $user = $nu ; |
| 30 | | - setcookie ( "WikiUserID" , $user->id , $expiration ) ; |
| 31 | | - setcookie ( "WikiLoggedIn" , "yes" , $expiration ) ; |
| | 30 | + setcookie ( "WikiUserID" , $user->id , $expiration , "/" ) ; |
| | 31 | + setcookie ( "WikiLoggedIn" , "yes" , $expiration , "/" ) ; |
| 32 | 32 | $WikiLoggedIn = "yes" ; |
| 33 | | - if ( $user->options["rememberPassword"] == "on" ) setcookie ( "WikiUserPassword" , $user->password , $expiration ) ; |
| | 33 | + if ( $user->options["rememberPassword"] == "on" ) setcookie ( "WikiUserPassword" , $user->password , $expiration , "/" ) ; |
| 34 | 34 | $user->options["rememberPassword"] = $REMEMBERPASSWORD ; |
| 35 | 35 | $user->saveSettings() ; |
| 36 | 36 | loadSkin () ; |
| — | — | @@ -40,9 +40,9 @@ |
| 41 | 41 | $user = $nu ; |
| 42 | 42 | global $wikiWelcomeCreation ; |
| 43 | 43 | $s = str_replace ( "$1" , $user->name , $wikiWelcomeCreation ) ; |
| 44 | | - setcookie ( "WikiLoggedIn" , "yes" , $expiration ) ; |
| 45 | | - setcookie ( "WikiUserID" , $user->id , $expiration ) ; |
| 46 | | - if ( $user->options["rememberPassword"] == "on" ) setcookie ( "WikiUserPassword" , $user->password , $expiration ) ; |
| | 44 | + setcookie ( "WikiLoggedIn" , "yes" , $expiration , "/" ) ; |
| | 45 | + setcookie ( "WikiUserID" , $user->id , $expiration , "/" ) ; |
| | 46 | + if ( $user->options["rememberPassword"] == "on" ) setcookie ( "WikiUserPassword" , $user->password , $expiration , "/" ) ; |
| 47 | 47 | $user->options["rememberPassword"] = $REMEMBERPASSWORD ; |
| 48 | 48 | # FIXME: user_email always comes up null in the database. Don't know why. |
| 49 | 49 | if ( isset ( $EMAILADDR ) ) $user->email = $EMAILADDR ; |
| Index: trunk/phpwiki/fpw/special_userlogout.php |
| — | — | @@ -3,7 +3,7 @@ |
| 4 | 4 | global $user , $vpage , $WikiLoggedIn , $wikiGoodbye ; |
| 5 | 5 | $vpage->title = "User logout" ; |
| 6 | 6 | setcookie ( "WikiLoggedIn" , "" , time()-3600 ) ; |
| 7 | | - if ( $user->options["rememberPassword"] != "on" ) setcookie ( "WikiUserPassword" , "" , time()-3600 ) ; |
| | 7 | + if ( $user->options["rememberPassword"] != "on" ) setcookie ( "WikiUserPassword" , "" , time()-3600 , "/") ; |
| 8 | 8 | $user->isLoggedIn = false ; |
| 9 | 9 | $WikiLoggedIn = false ; |
| 10 | 10 | return str_replace ( "$1" , $user->name , $wikiGoodbye ) ; |