| Index: trunk/phpwiki/fpw/special_userlogin.php |
| — | — | @@ -27,6 +27,7 @@ |
| 28 | 28 | $user = $nu ; |
| 29 | 29 | setcookie ( "WikiUserID" , $user->id , $expiration ) ; |
| 30 | 30 | setcookie ( "WikiLoggedIn" , "yes" , $expiration ) ; |
| | 31 | + $WikiLoggedIn = "yes" ; |
| 31 | 32 | if ( $user->options["rememberPassword"] == "on" ) setcookie ( "WikiUserPassword" , $user->password , $expiration ) ; |
| 32 | 33 | $user->options["rememberPassword"] = $REMEMBERPASSWORD ; |
| 33 | 34 | $user->saveSettings() ; |
| Index: trunk/phpwiki/fpw/wiki.phtml |
| — | — | @@ -58,7 +58,7 @@ |
| 59 | 59 | global $THESCRIPT ; |
| 60 | 60 | |
| 61 | 61 | global $metaDescription , $metaKeywords , $wikiCharset ; # For meta tags in the HTML code |
| 62 | | - $expiration = time()+315360000 ; # Cookies set will expire in ten years from now |
| | 62 | + $expiration = time()+31536000 ; # Cookies set will expire in one year from now |
| 63 | 63 | $pageTitle = "" ; |
| 64 | 64 | |
| 65 | 65 | # $mt = getmicrotime() ; |
| Index: trunk/phpwiki/fpw/special_userlogout.php |
| — | — | @@ -1,11 +1,11 @@ |
| 2 | 2 | <? |
| 3 | 3 | function userLogout () { |
| 4 | | - global $user , $vpage ; |
| | 4 | + global $user , $vpage , $WikiLoggedIn , $wikiGoodbye ; |
| 5 | 5 | $vpage->title = "User logout" ; |
| 6 | 6 | setcookie ( "WikiLoggedIn" , "" , time()-3600 ) ; |
| 7 | 7 | if ( $user->options["rememberPassword"] != "on" ) setcookie ( "WikiUserPassword" , "" , time()-3600 ) ; |
| 8 | 8 | $user->isLoggedIn = false ; |
| 9 | | - global $wikiGoodbye ; |
| | 9 | + $WikiLoggedIn = false ; |
| 10 | 10 | return str_replace ( "$1" , $user->name , $wikiGoodbye ) ; |
| 11 | 11 | } |
| 12 | 12 | ?> |
| \ No newline at end of file |