X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=1f2ae74fd7f70eb42e117042a227704e6cd652aa;hp=7e8ef9e259abb89465afd46f6d5bdbc8e1ca1b4d;hb=c581cd05476d07f0fd17dab41cbb211a443fd57f;hpb=880dfb2e715a3770de56fb525f5c90d28a6ccb4c
diff --git a/include/user.php b/include/user.php
index 7e8ef9e..1f2ae74 100644
--- a/include/user.php
+++ b/include/user.php
@@ -1,5 +1,24 @@
+ *
+ * This file is part of e-DoKo.
+ *
+ * e-DoKo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * e-DoKo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with e-DoKo. If not, see
".
@@ -81,115 +101,145 @@ if(myisset("forgot"))
"or else try again.";
}
}
- else
- { /* normal user page */
-
- /* verify password and email */
- if(strlen($password)!=32)
- $password = md5($password);
-
- $ok = 1;
- $myid = DB_get_userid('email-password',$email,$password);
- if(!$myid)
- $ok = 0;
-
- if($ok)
- {
- /* user information is ok */
- $myname = DB_get_name('email',$email);
- $_SESSION["name"] = $myname;
- output_status();
-
- $PREF = DB_get_PREF($myid);
-
- DB_update_user_timestamp($myid);
-
- display_user_menu();
-
- /* display all games the user has played */
- echo "
Session:
\n";
- echo " p = pre-game phase ";
- echo "P = game in progess ";
- echo "F = game finished
";
- echo "
\n"; - while( $r = DB_fetch_array($result)) - { - $game = DB_format_gameid($r[1]); - $gamenr = (int) $game; - if($gamenrold < $gamenr) - { - if($gamenrold!=-1) - echo " | |||
$gamenr: | "; - else - echo "$gamenr: | "; - $gamenrold = $gamenr; - } - if($r[4]=='pre') - { - echo "\n p "; - - } - else if ($r[4]=='gameover') - echo "\n F "; - else - { - echo "\n P "; - } - if($r[4] != 'gameover') - { - echo " | \n "; - if($r[3]==$myid || !$r[3]) - echo "(it's your turn)\n"; - else - { - $name = DB_get_name('userid',$r[3]); - $gameid = $r[1]; - if(DB_get_reminder($r[3],$gameid)==0) - if(time()-strtotime($r[2]) > 60*60*24*7) - echo "". - "Send a reminder."; - echo "(it's $name's turn)\n"; - }; - if(time()-strtotime($r[2]) > 60*60*24*30) - echo "". - "Cancel?". - " (clicking here is final and can't be restored)"; - - } - } - echo " |
\n"; - echo implode(", ",$names).",...\n"; - echo "
\n"; - - /* display last 5 users that logged on */ - $names = DB_get_names_of_last_logins(5); - echo "\n"; - echo implode(", ",$names).",...\n"; - echo "
\n"; - - echo "Enjoy your vacation (don't forgot to change your settings once you're back). Between $vac_start and $vac_stop other users will see the following message: $vac_comment.
\n"; + } + + echo "Session:
\n";
+ echo " p = pre-game phase ";
+ echo "P = game in progess ";
+ echo "E = game ended ";
+ echo "N = N games with same hand
";
+ echo "
\n"; + while( $r = DB_fetch_array($result)) + { + $count++; + $game = DB_format_gameid($r[1]); + $gamenr = (int) $game; + if($gamenrold < $gamenr) + { + if($gamenrold!=-1) + echo " | ||
$gamenr: | \n"; + else + echo "$gamenr:\n"; + $gamenrold = $gamenr; + echo "\n"; + } + $Multi = ($r[5]>1) ? "multi" : ""; + if($r[4]=='pre') + echo " p \n"; + else if (in_array($r[4],array('gameover','cancel-timedout','cancel-nines','cancel-noplay','cancel-trump'))) + { + echo " "; + if($r[5]<2) + echo "E "; + else + echo $r[5]; + echo "\n"; + } + else + echo " P \n"; + if($r[4] == 'pre' || $r[4] == 'play') + { + echo " | \n\n "; + if($r[3]==$myid || !$r[3]) + echo "(it's your turn)\n"; + else + { + $name = DB_get_name('userid',$r[3]); + $gameid = $r[1]; + /* check if we need to send out a reminder */ + if(DB_get_reminder($r[3],$gameid)==0) + if(time()-strtotime($r[2]) > 60*60*24*7) + echo "Send a reminder."; + + /* check vacaction status of this user */ + if($vacation=check_vacation($r[3])) + { + $stop = substr($vacation[1],0,10); + $title = 'begin:'.substr($vacation[0],0,10).' end:'.$vacation[1].' '.$vacation[2]; + echo "(it's $name's (on vacation until $stop) turn)\n"; + } + else + echo "(it's $name's turn)\n"; + }; + if(time()-strtotime($r[2]) > 60*60*24*30) + echo "Cancel? "; + } + } + echo " |
You can start new games using the link in the top right corner!
\n"; + + /* display last 5 users that have signed up to e-DoKo */ + $names = DB_get_names_of_new_logins(5); + echo "\n"; + echo implode(", ",$names).",...\n"; + echo "
\n"; + /* display last 5 users that logged on */ + echo "\n"; + + $names = DB_get_names_of_last_logins(7); + $emails = DB_get_emails_of_last_logins(7); + for($i=0;$i<7;$i++) + { + echo "\n"; + } + echo "
\n"; + + echo "