projects
/
e-DoKo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix error when language is not set
[e-DoKo.git]
/
include
/
user.php
diff --git
a/include/user.php
b/include/user.php
index ef63e43ec4e196fca3f64d27d184a67c2541e47b..5142918fbb9188dd564831c82d377cf6577a8d45 100644
(file)
--- a/
include/user.php
+++ b/
include/user.php
@@
-1,5
+1,5
@@
<?php
<?php
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014
, 2016
Arun Persaud <arun@nubati.net>
*
* This file is part of e-DoKo.
*
*
* This file is part of e-DoKo.
*
@@
-67,7
+67,8
@@
if(myisset('forgot'))
/* create temporary password, use the fist 8 letters of a md5 hash */
$TIME = (string) time(); /* to avoid collisions */
/* create temporary password, use the fist 8 letters of a md5 hash */
$TIME = (string) time(); /* to avoid collisions */
- $hash = md5('Anewpassword'.$email.$TIME);
+ $rndstring = sha1(rand()); /* add some randomness */
+ $hash = md5('Anewpassword'.$email.$TIME.$rndstring);
$newpw = substr($hash,1,8);
$message = sprintf( _("Someone (hopefully you) requested a new password.\n".
$newpw = substr($hash,1,8);
$message = sprintf( _("Someone (hopefully you) requested a new password.\n".
@@
-204,8
+205,8
@@
else
/* create output */
$sessionoutput .= $gameoutput;
/* create output */
$sessionoutput .= $gameoutput;
- $gameoutput = "
<span class=\"gamestatusover \"><a
href=\"".$INDEX."?action=game&me=".$myhash."\">"
- .$gamefrequence."</a>
</span>
\n";
+ $gameoutput = "
<a class=\"gamestatusover\"
href=\"".$INDEX."?action=game&me=".$myhash."\">"
+ .$gamefrequence."</a>\n";
}
else
{ /* new session */
}
else
{ /* new session */
@@
-218,13
+219,13
@@
else
{
$output_active .= "<li> ";
if($gamestatus == 'pre')
{
$output_active .= "<li> ";
if($gamestatus == 'pre')
- $
output_active .= '<span class="gamestatuspre gameid">
';
+ $
class= 'class="gamestatuspre gameid"
';
else if($gamestatus == 'play')
else if($gamestatus == 'play')
- $
output_active .= '<span class="gamestatusplay gameid">
';
+ $
class= 'class="gamestatusplay gameid"
';
else
else
- $
output_active .= '<span class="gamestatusover gameid">
';
- $output_active .= "<a href=\"$INDEX?action=game&me=$myhash\">".
- DB_format_gameid($gameid).'</a>
</span>
';
+ $
class= 'class="gamestatusover gameid"
';
+ $output_active .= "<a
$class
href=\"$INDEX?action=game&me=$myhash\">".
+ DB_format_gameid($gameid).'</a> ';
@@
-314,11
+315,14
@@
else
if($count<10)
echo '<p class="newbiehint">'._('You can start new games using the link in the top right corner!')."</p>\n";
if($count<10)
echo '<p class="newbiehint">'._('You can start new games using the link in the top right corner!')."</p>\n";
- /* display last 5 users that have signed up to e-DoKo */
+ /* display last 5 users that have signed up to e-DoKo
within the 45 days
*/
$names = DB_get_names_of_new_logins(5);
$names = DB_get_names_of_new_logins(5);
- echo '<h4>'._('New Players').":</h4>\n<p>\n";
- echo implode(", ",$names).",...\n";
- echo "</p>\n";
+ if ($names)
+ {
+ echo '<h4>'._('New Player(s)').":</h4>\n<p>\n";
+ echo implode(", ",$names).",...\n";
+ echo "</p>\n";
+ };
/* display last 5 users that logged on */
echo '<h4>'._('Players last logged in').":</h4>\n<p>\n";
/* display last 5 users that logged on */
echo '<h4>'._('Players last logged in').":</h4>\n<p>\n";
@@
-328,7
+332,7
@@
else
for($i=0;$i<7;$i++)
{
echo '<img class="gravatar" title="'.$names[$i].
for($i=0;$i<7;$i++)
{
echo '<img class="gravatar" title="'.$names[$i].
- '" src="http://www.gravatar.com/avatar/'.
+ '" src="http
s
://www.gravatar.com/avatar/'.
md5(strtolower(trim($emails[$i])))."?d=identicon\" />\n";
}
echo "</p>\n";
md5(strtolower(trim($emails[$i])))."?d=identicon\" />\n";
}
echo "</p>\n";