projects
/
e-DoKo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
BUGFIX: wrongly displayed "trump back" in pre-trick during poverty
[e-DoKo.git]
/
include
/
user.php
diff --git
a/include/user.php
b/include/user.php
index 6cc96370bac78718f1e1a8510cecd5be7213e339..bac439895098d170ba6c86f12fdb93e4631b27ff 100644
(file)
--- a/
include/user.php
+++ b/
include/user.php
@@
-53,8
+53,9
@@
if(myisset("forgot"))
" $newpw \n".
"to log into the server. The new password is valid for 24h, so make\n".
"sure you reset your password to something new. Your old password will\n".
" $newpw \n".
"to log into the server. The new password is valid for 24h, so make\n".
"sure you reset your password to something new. Your old password will\n".
- " also still be valid until you set a new one\n";
- mymail($email,$EmailName."recovery ",$message);
+ "also still be valid until you set a new one.\n";
+ $subject = 'Recovery';
+ mymail($myid,$subject,$message);
/* we save these in the database */
DB_set_recovery_password($myid,md5($newpw));
/* we save these in the database */
DB_set_recovery_password($myid,md5($newpw));
@@
-153,7
+154,7
@@
else
$Multi = ($r[5]>1) ? "multi" : "";
if($r[4]=='pre')
echo " <span class=\"gamestatuspre $Multi\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">p </a></span>\n";
$Multi = ($r[5]>1) ? "multi" : "";
if($r[4]=='pre')
echo " <span class=\"gamestatuspre $Multi\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">p </a></span>\n";
- else if (
$r[4]=='gameover'
)
+ else if (
in_array($r[4],array('gameover','cancel-timedout','cancel-nines','cancel-noplay','cancel-trump'))
)
{
echo " <span class=\"gamestatusover $Multi\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">";
if($r[5]<2)
{
echo " <span class=\"gamestatusover $Multi\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">";
if($r[5]<2)
@@
-164,7
+165,7
@@
else
}
else
echo " <span class=\"gamestatusplay $Multi\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">P </a></span>\n";
}
else
echo " <span class=\"gamestatusplay $Multi\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">P </a></span>\n";
- if($r[4]
!= 'gameover
')
+ if($r[4]
== 'pre' || $r[4] == 'play
')
{
echo "</td>\n<td>\n ";
if($r[3]==$myid || !$r[3])
{
echo "</td>\n<td>\n ";
if($r[3]==$myid || !$r[3])
@@
-189,8
+190,7
@@
else
echo "(it's $name's turn)\n";
};
if(time()-strtotime($r[2]) > 60*60*24*30)
echo "(it's $name's turn)\n";
};
if(time()-strtotime($r[2]) > 60*60*24*30)
- echo "<a href=\"$INDEX?action=cancel&me=".$r[0]."\">Cancel?</a>".
- " (clicking here is final and can't be restored)";
+ echo "<a href=\"$INDEX?action=cancel&me=".$r[0]."\">Cancel?</a> ";
}
}
echo "</td></tr>\n</table>\n";
}
}
echo "</td></tr>\n</table>\n";