X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=index.php;h=71d40506c27d5cd52d2000b8dad41714ecd8fda7;hp=1d6dffff64d99a928f23f33ecb975eea503e26fe;hb=d8eac0035f97a64371557e7da8b9730fe28d8788;hpb=b5f096688faaebf7846b3e725e1bd2dd9251b203 diff --git a/index.php b/index.php index 1d6dfff..71d4050 100644 --- a/index.php +++ b/index.php @@ -6,41 +6,7 @@ include_once("output.php"); /* html output only */ include_once("db.php"); /* database only */ include_once("functions.php"); /* the rest */ -/* check if some variables are set in the config file, else set defaults */ -if(!isset($EmailName)) - $EmailName="[DoKo] "; -if(isset($EMAIL_REPLY)) - { - ini_set("sendmail_from",$EMAIL_REPLY); - } -if(!isset($ADMIN_NAME)) - { - output_header(); - echo "

Setup not completed

"; - echo "You need to set \$ADMIN_NAME in config.php."; - output_footer(); - exit(); - } -if(!isset($ADMIN_EMAIL)) - { - output_header(); - echo "

Setup not completed

"; - echo "You need to set \$ADMIN_EMAIL in config.php. ". - "If something goes wrong an email will send to this address."; - output_footer(); - exit(); - } - -/* in case work has to be done on the database or other section we can - * shut down the server and tell people to come back later - */ -if(0) - { - output_header(); - echo "Working on the database...please check back in a few mintues"; - output_footer(); - exit(); - } +config_check(); if(DB_open()<0) { @@ -136,9 +102,12 @@ else if(myisset("new")) DB_close(); exit(); }; + /* get max session */ + $max = DB_get_max_session(); + $max++; mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ". - "'$ruleset',NULL ,NULL)"); + "'$ruleset','$max' ,NULL)"); } $game_id = mysql_insert_id(); @@ -221,19 +190,19 @@ else if(myisset("cancle","me")) if(time()-strtotime($r[0]) > 60*60*24*30) /* = 1 month */ { $message = "Hello, \n\n". - "Game $gameid has been cancled since nothing happend for a while and $myname requested it.\n"; + "Game ".DB_format_gameid($gameid)." has been cancled since nothing happend for a while and $myname requested it.\n"; $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) { $To = DB_get_email_by_userid($user); - mymail($To,$EmailName."game $gameid cancled (timed out)",$message); + mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (timed out)",$message); } /* delete everything from the dB */ DB_cancel_game($me); - echo "

Game $gameid has been cancled.

"; + echo "

Game ".DB_format_gameid($gameid)." has been cancled.

"; } else echo "

You need to wait longer before you can cancle a game...

\n"; @@ -273,7 +242,6 @@ else if(myisset("me")) DB_get_PREF($myid); /* end set pref */ - /* get rule set for this game */ $result = mysql_query("SELECT * FROM Rulesets". " LEFT JOIN Game ON Game.ruleset=Rulesets.id ". @@ -284,7 +252,6 @@ else if(myisset("me")) $RULES["schweinchen"] = $r[3]; $RULES["call"] = $r[4]; - /* get some infos about the game */ $gametype = DB_get_gametype_by_gameid($gameid); $gamestatus = DB_get_game_status_by_gameid($gameid); @@ -294,9 +261,31 @@ else if(myisset("me")) $gametype = DB_get_solo_by_gameid($gameid); $GT = $gametype." ".$GT; } + + /* does anyone have both foxes */ + $GAME["schweinchen"]=0; + for($i=1;$i<5;$i++) + { + $hash = DB_get_hash_from_game_and_pos($gameid,$i); + $cards = DB_get_all_hand($hash); + if( in_array("19",$cards) && in_array("20",$cards) ) + { + $GAME["schweinchen"]=1; + $GAME["schweinchen-who"]=$hash; + } + }; + + /* put everyting in a form */ + echo "
\n"; + + /* output left menu */ - /* display rule set for this game */ - echo "
\n"; + display_user_menu(); + + /* output right menu */ + + /* display rule set for this game */ + echo "
\n"; if($gamestatus != 'pre') echo " Gametype: $GT
\n"; @@ -305,8 +294,49 @@ else if(myisset("me")) echo "10ofhearts : ".$RULES["dullen"] ."
\n"; echo "schweinchen: ".$RULES["schweinchen"] ."
\n"; echo "call: ".$RULES["call"] ."
\n"; + + echo "
\n"; + if($mystatus == 'play' ) + { + output_form_calls($me); + + echo "
\nA short comment:\n"; + echo "
"; + } + + echo "\n"; + + + if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' ) + { + echo "
\n"; + + $session = DB_get_session_by_gameid($gameid); + $result = mysql_query("SELECT id,create_date FROM Game". + " WHERE session=$session". + " ORDER BY create_date DESC". + " LIMIT 1"); + $r = -1; + if($result) + $r = mysql_fetch_array($result,MYSQL_NUM); + + if(!$session || $gameid==$r[0]) + { + /* suggest a new game with the same people in it, just rotated once (unless last game was solo) */ + $names = DB_get_all_names_by_gameid($gameid); + $type = DB_get_gametype_by_gameid($gameid); + + if($type=="solo") + output_ask_for_new_game($names[0],$names[1],$names[2],$names[3],$gameid); + else + output_ask_for_new_game($names[1],$names[2],$names[3],$names[0],$gameid); + } + } + echo "
\n"; + /* output game */ + /* output extra division in case this game is part of a session */ if($session) { @@ -324,20 +354,9 @@ else if(myisset("me")) } echo "
\n"; } - - - /* does anyone have both foxes */ - $GAME["schweinchen"]=0; - for($i=1;$i<5;$i++) - { - $hash = DB_get_hash_from_game_and_pos($gameid,$i); - $cards = DB_get_all_hand($hash); - if( in_array("19",$cards) && in_array("20",$cards) ) - { - $GAME["schweinchen"]=1; - $GAME["schweinchen-who"]=$hash; - } - }; + + /* display the table and the names */ + display_table(); /* mystatus gets the player through the different stages of a game. * start: yes/no @@ -383,7 +402,7 @@ else if(myisset("me")) foreach($userids as $user) { $To = DB_get_email_by_userid($user); - mymail($To,$EmailName."game $gameid canceled",$message); + mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message); } /* delete everything from the dB */ @@ -391,17 +410,16 @@ else if(myisset("me")) } else { - echo "Thanks for joining the game..."; - $mycards = DB_get_hand($me); sort($mycards); - echo "

your cards are:
\n"; + + output_check_for_sickness($me,$mycards); + + echo "

your cards are:
\n"; foreach($mycards as $card) display_card($card,$PREF["cardset"]); echo "

\n"; - output_check_for_sickness($me,$mycards); - /* move on to the next stage*/ DB_set_hand_status_by_hash($me,'check'); } @@ -498,10 +516,10 @@ else if(myisset("me")) $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); if($userhash != $me) { - $message = "Everyone finish the questionary in game $gameid, ". + $message = "Everyone finish the questionary in game ".DB_format_gameid($gameid).", ". "please visit this link now to continue: \n". " ".$host."?me=".$userhash."\n\n" ; - mymail($To,$EmailName." finished setup in game $gameid",$message); + mymail($To,$EmailName." finished setup in game ".DB_format_gameid($gameid),$message); } }; }; @@ -595,7 +613,7 @@ else if(myisset("me")) foreach($userids as $user) { $To = DB_get_email_by_userid($user); - mymail($To,$EmailName."game $gameid canceled",$message); + mymail($To,$EmailName."game ".DB_format_gameid($gameid)." canceled",$message); } /* delete everything from the dB */ @@ -771,7 +789,7 @@ else if(myisset("me")) $message = "Someone has poverty, it's your turn to decide, if you want to take the trump. Please visit:". " ".$host."?me=".$userhash."\n\n" ; - mymail($To,$EmailName." poverty (game $gameid)",$message); + mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message); } /* this user is done */ @@ -789,12 +807,11 @@ else if(myisset("me")) $result = mysql_query("UPDATE Hand_Card SET hand_id='$myhand' WHERE hand_id='$userhand' AND card_id<'27'" ); /* add hidden button with trump in it to get to the next point */ - echo "\n"; + echo "
\n"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; - echo "\n"; + echo "
\n"; } else if(myisset("trump","exchange") && $_REQUEST["trump"]>0 && ($who==$mypos || $who==$mypos*10)) { @@ -853,7 +870,7 @@ else if(myisset("me")) $message = "Someone has poverty, it's your turn to decide, ". "if you want to take the trump. Please visit:". " ".$host."?me=".$userhash."\n\n" ; - mymail($To,$EmailName." poverty (game $gameid)",$message); + mymail($To,$EmailName." poverty (game ".DB_format_gameid($gameid).")",$message); } } @@ -895,24 +912,24 @@ else if(myisset("me")) else { /* else show all trump, have lowest card pre-selected, have hidden setting for */ - echo "you need to get rid of a few cards
\n"; + echo "
you need to get rid of a few cards
\n"; set_gametype($gametype); /* this sets the $CARDS variable */ $mycards = DB_get_hand($me); $mycards = mysort($mycards,$gametype); - echo "
\n"; $type="exchange"; + echo "
Your cards are:
\n"; foreach($mycards as $card) display_link_card($card,$PREF["cardset"],$type); echo " \n"; - echo " \n"; echo " \n"; - echo "\n"; + echo "
\n"; } } else if($who == $mypos || $who == $mypos*10) { + echo "
\n"; foreach($userids as $user) { $name = DB_get_name_by_userid($user); @@ -926,15 +943,16 @@ else if(myisset("me")) /* count trump */ if($nrtrump<4) echo "Player $name has $nrtrump trump. Do you want to take them?". - "yes
"; + "yes
\n"; } } - echo "No,way I take those trump...
"; - + echo "No,way I take those trump...
\n"; + echo "
\n"; + echo "Your cards are:
\n"; $mycards = DB_get_hand($me); sort($mycards); - echo "

your cards are:
\n"; + echo "

your cards are:
\n"; foreach($mycards as $card) display_card($card,$PREF["cardset"]); echo "

\n"; @@ -953,19 +971,19 @@ else if(myisset("me")) if($who==5 || $who==50) { $message = "Hello, \n\n". - "Game $gameid has been cancled since nobody wanted to take the trump.\n"; + "Game ".DB_format_gameid($gameid)." has been cancled since nobody wanted to take the trump.\n"; $userids = DB_get_all_userid_by_gameid($gameid); foreach($userids as $user) { $To = DB_get_email_by_userid($user); - mymail($To,$EmailName."game $gameid cancled (poverty not resolved)",$message); + mymail($To,$EmailName."game ".DB_format_gameid($gameid)." cancled (poverty not resolved)",$message); } /* delete everything from the dB */ DB_cancel_game($me); - echo "

Game $gameid has been cancled.

"; + echo "

Game ".DB_format_gameid($gameid)." has been cancled.

"; output_footer(); DB_close(); exit(); @@ -995,9 +1013,9 @@ else if(myisset("me")) if($hash!=$me) { /* email startplayer) */ - $message = "It's your turn now in game $gameid.\n". + $message = "It's your turn now in game ".DB_format_gameid($gameid).".\n". "Use this link to play a card: ".$host."?me=".$hash."\n\n" ; - mymail($email,$EmailName."ready, set, go... (game $gameid) ",$message); + mymail($email,$EmailName."ready, set, go... (game ".DB_format_gameid($gameid).") ",$message); } else echo " Please, start the game.
"; @@ -1033,16 +1051,6 @@ else if(myisset("me")) /* get some infos about the game */ $gamestatus = DB_get_game_status_by_gameid($gameid); - /* display useful things in divs */ - - /* display links to the users status page */ - $result = mysql_query("SELECT email,password from User WHERE id='$myid'" ); - $r = mysql_fetch_array($result,MYSQL_NUM); - - display_links($r[0],$r[1]); - - /* end display useful things*/ - /* has the game started? No, then just wait here...*/ if($gamestatus == 'pre') { @@ -1051,143 +1059,6 @@ else if(myisset("me")) break; /* not sure this works... the idea is that you can * only play a card after everyone is ready to play */ } - - /* display the table and the names */ - $result = mysql_query("SELECT User.fullname as name,". - " Hand.position as position, ". - " User.id, ". - " Hand.party as party, ". - " Hand.sickness as sickness, ". - " Hand.point_call, ". - " User.last_login, ". - " Hand.hash ". - "FROM Hand ". - "LEFT JOIN User ON User.id=Hand.user_id ". - "WHERE Hand.game_id='".$gameid."' ". - "ORDER BY position ASC"); - - echo "
\n". - " \"table\"\n"; - while($r = mysql_fetch_array($result,MYSQL_NUM)) - { - $name = $r[0]; - $pos = $r[1]; - $user = $r[2]; - $party = $r[3]; - $sickness = $r[4]; - $call = $r[5]; - $lastlogin = strtotime($r[6]); - $hash = $r[7]; - - $offset = DB_get_user_timezone($user); - $zone = return_timezone($offset); - date_default_timezone_set($zone); - - echo " \n"; - if(!$debug) - echo " $name \n"; - else - { - echo "$name\n"; - } - /* add hints for poverty, wedding, solo, etc */ - if($GT=="poverty" && $party=="re") - if($sickness=="poverty") - { - $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $cards = DB_get_all_hand($userhash); - $trumpNR = count_trump($cards); - if($trumpNR) - echo "\"poverty"; - else - echo "\"poverty"; - } - else - echo "\"poverty\" />"; - - if($GT=="dpoverty") - if($party=="re") - if($sickness=="poverty") - { - $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $cards = DB_get_all_hand($userhash); - $trumpNR = count_trump($cards); - if($trumpNR) - echo "\"poverty"; - else - echo "\"poverty"; - } - else - echo "\"poverty\" />"; - else - if($sickness=="poverty") - { - $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $cards = DB_get_all_hand($userhash); - $trumpNR = count_trump($cards); - if($trumpNR) - echo "\"poverty2"; - else - echo "\"poverty2"; - } - else - echo "\"poverty2\" />"; - - if($GT=="wedding" && $party=="re") - if($sickness=="wedding") - echo "\"wedding\""; - else - echo "\"wedding"; - - if(ereg("solo",$GT) && $party=="re") - { - if(ereg("queen",$GT)) - echo "\"$GT\""; - else if(ereg("jack",$GT)) - echo "\"$GT\""; - else if(ereg("club",$GT)) - echo "\"$GT\""; - else if(ereg("spade",$GT)) - echo "\"$GT\""; - else if(ereg("heart",$GT)) - echo "\"$GT\""; - else if(ereg("trumpless",$GT)) - echo "\"$GT\""; - else if(ereg("trump",$GT)) - echo "\"$GT\""; - } - - /* add point calls */ - if($call!=NULL) - { - if($party=="re") - echo "\"re\""; - else - echo "\"contra\""; - switch($call) - { - case "0": - echo "\"0\""; - break; - case "30": - echo "\"30\""; - break; - case "60": - echo "\"60\""; - break; - case "90": - echo "\"90\""; - break; - } - } - - echo "
\n"; - echo " local time: ".date("Y-m-d H:i:s")."
\n"; - echo " last login: ".date("Y-m-d H:i:s",$lastlogin)."
\n"; - echo " \n"; - - } - echo "
\n"; /* get time from the last action of the game */ $result = mysql_query("SELECT mod_date from Game WHERE id='$gameid' " ); @@ -1231,7 +1102,7 @@ else if(myisset("me")) $firstcard = ""; /* first card in a trick */ echo "\n\n"; - + /* whos turn is it? */ if($seq==4) { @@ -1441,13 +1307,20 @@ else if(myisset("me")) }; /* display played card */ - echo "
"; - echo " you played
"; + $pos = DB_get_pos_by_hash($me); + if($sequence==1) + { + echo "
  • Trick ".($tricknr)."\n". + "
    \n". + " \"table\"\n"; + } + + echo "
    "; /* display comments */ display_card($card,$PREF["cardset"]); if($comment!="") - echo "
    Your comment:
    ".$comment."\n"; - echo "
    \n"; + echo " ".$comment."\n"; + echo "
    • \n"; /*check if we still have cards left, else set status to gameover */ if(sizeof(DB_get_hand($me))==0) @@ -1478,10 +1351,10 @@ else if(myisset("me")) $who = DB_get_userid_by_email($email); DB_set_player_by_gameid($gameid,$who); - $message = "A card has been played in game $gameid.\n\n". + $message = "A card has been played in game ".DB_format_gameid($gameid).".\n\n". "It's your turn now.\n". "Use this link to play a card: ".$host."?me=".$next_hash."\n\n" ; - mymail($email,$EmailName."a card has been played in game $gameid",$message); + mymail($email,$EmailName."a card has been played in game ".DB_format_gameid($gameid),$message); } else /* send out final email */ { @@ -1519,15 +1392,15 @@ else if(myisset("me")) $To = implode(",",$all); $help = "\n\n (you can use reply all on this email to reach all the players.)\n"; - mymail($To,$EmailName."game over (game $gameid) part 1(2)",$message.$help); + mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 1(2)",$message.$help); foreach($userids as $user) { $To = DB_get_email_by_userid($user); $hash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $link = "Use this link to have a look at game $gameid: ".$host."?me=".$hash."\n\n" ; - mymail($To,$EmailName."game over (game $gameid) part 2(2)",$link); + $link = "Use this link to have a look at game ".DB_format_gameid($gameid).": ".$host."?me=".$hash."\n\n" ; + mymail($To,$EmailName."game over (game ".DB_format_gameid($gameid).") part 2(2)",$link); } } } @@ -1540,6 +1413,36 @@ else if(myisset("me")) { echo "please wait until it's your turn!
    \n"; } + + if($seq!=4 && $trickNR>1) + echo " \n \n"; /* end div trick, end li trick */ + + /* display points in case game is over */ + if($mystatus=='gameover' && DB_get_game_status_by_gameid($gameid)=='gameover' ) + { + echo "
  • Score\n". + "
    \n"; + /* add pic for re/contra + " \"table\"\n";*/ + + $result = mysql_query("SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party,Hand.position FROM Hand". + " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id". + " LEFT JOIN User ON User.id=Hand.user_id". + " LEFT JOIN Play ON Trick.id=Play.trick_id". + " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id". + " LEFT JOIN Card ON Card.id=Hand_Card.card_id". + " WHERE Hand.game_id='$gameid'". + " GROUP BY User.fullname" ); + while( $r = mysql_fetch_array($result,MYSQL_NUM)) + echo "
    \n". + " ".$r[2]."
    ".$r[1]."    \n". + "
    \n"; + + echo "
    \n
    • \n"; /* end div trick, end li trick */ + } + + + echo "\n"; /* end ul tricks*/ $mycards = DB_get_hand($me); $mycards = mysort($mycards,$gametype); @@ -1549,7 +1452,6 @@ else if(myisset("me")) { echo "Hello ".$myname.", it's your turn!
    \n"; echo "Your cards are:
    \n"; - echo "
    \n"; /* do we have to follow suite? */ $followsuit = 0; @@ -1563,42 +1465,12 @@ else if(myisset("me")) else display_link_card($card,$PREF["cardset"]); } - - if( can_call(120,$me) ) - echo " re/contra (120):". - " "; - if( can_call(90,$me) ) - echo " 90:". - " "; - if( can_call(60,$me) ) - echo " 60:". - " "; - if( can_call(30,$me) ) - echo " 30:". - " "; - if( can_call(0,$me) ) - echo " 0:". - " ". - " no call:". - " "; - - echo "
    \nA short comment:\n"; - echo "\n"; - echo "\n"; - echo "
    \n"; } else if($mystatus=='play' ) { echo "Your cards are:
    \n"; foreach($mycards as $card) display_card($card,$PREF["cardset"]); - - echo "
    \n"; - echo "
    \nA short comment:\n"; - echo "\n"; - echo "\n"; - echo "
    \n"; - } else if($mystatus=='gameover') { @@ -1609,11 +1481,9 @@ else if(myisset("me")) if( $gameend < 60*60*24*7 ) { - echo "
    \n"; echo "
    \nA short comment:\n"; echo "\n"; echo "\n"; - echo "
    \n"; } $oldcards = DB_get_all_hand($me); @@ -1654,23 +1524,6 @@ else if(myisset("me")) } else { - echo "the game is over now...
    \n"; - - $result = mysql_query("SELECT User.fullname, IFNULL(SUM(Card.points),0), Hand.party FROM Hand". - " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id". - " LEFT JOIN User ON User.id=Hand.user_id". - " LEFT JOIN Play ON Trick.id=Play.trick_id". - " LEFT JOIN Hand_Card ON Hand_Card.id=Play.hand_card_id". - " LEFT JOIN Card ON Card.id=Hand_Card.card_id". - " WHERE Hand.game_id='$gameid'". - " GROUP BY User.fullname" ); - echo "Final Score:
    \n". - " \n";; - while( $r = mysql_fetch_array($result,MYSQL_NUM)) - echo " "; - echo "
    ".$r[0]."(".$r[2].") ".$r[1]."
    \n"; - - $result = mysql_query("SELECT Hand.party, IFNULL(SUM(Card.points),0) FROM Hand". " LEFT JOIN Trick ON Trick.winner=Hand.position AND Trick.game_id=Hand.game_id". " LEFT JOIN User ON User.id=Hand.user_id". @@ -1679,37 +1532,17 @@ else if(myisset("me")) " LEFT JOIN Card ON Card.id=Hand_Card.card_id". " WHERE Hand.game_id='$gameid'". " GROUP BY Hand.party" ); - echo "Totals:
    \n". - " \n"; + echo "
    Totals:
    \n"; while( $r = mysql_fetch_array($result,MYSQL_NUM)) - echo "
    \n"; - echo "
    ".$r[0]." ".$r[1]."
    \n"; - - $session = DB_get_session_by_gameid($gameid); - $result = mysql_query("SELECT id,create_date FROM Game". - " WHERE session=$session". - " ORDER BY create_date DESC". - " LIMIT 1"); - $r = -1; - if($result) - $r = mysql_fetch_array($result,MYSQL_NUM); + echo " ".$r[0]." ".$r[1]."
    \n"; + echo "\n"; - if(!$session || $gameid==$r[0]) - { - /* suggest a new game with the same people in it, just rotated once (unless last game was solo) */ - $names = DB_get_all_names_by_gameid($gameid); - $type = DB_get_gametype_by_gameid($gameid); - - if($type=="solo") - output_ask_for_new_game($names[0],$names[1],$names[2],$names[3],$gameid); - else - output_ask_for_new_game($names[1],$names[2],$names[3],$names[0],$gameid); - } } break; default: myerror("error in testing the status"); } + echo "\n"; output_footer(); DB_close(); exit(); @@ -1832,7 +1665,8 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) $ok = 1; /* check if old password matches */ - if($password != md5($_REQUEST["password0"])) + $oldpasswd = md5($_REQUEST["password0"]); + if(!( ($password == $oldpasswd) || DB_check_recovery_passwords($oldpasswd,$email) )) $ok = -1; /* check if new passwords are types the same twice */ if($_REQUEST["password1"] != $_REQUEST["password2"] ) @@ -1883,7 +1717,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) " WHERE Hand.user_id='$uid' AND Game.status='pre'" ); while( $r = mysql_fetch_array($result,MYSQL_NUM)) { - echo "game #".$r[1]." "; + echo "game".DB_format_gameid($r[1])." "; if($r[3]==$uid || $r[3]==NULL) echo "(it's your turn)\n"; else @@ -1906,7 +1740,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) " WHERE Hand.user_id='$uid' AND Game.status='play'" ); while( $r = mysql_fetch_array($result,MYSQL_NUM)) { - echo "game #".$r[1]." "; + echo "game ".DB_format_gameid($r[1])." "; if($r[3]) { if($r[3]==$uid) @@ -1930,7 +1764,7 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) $output = array(); $result = mysql_query("SELECT hash,game_id from Hand WHERE user_id='$uid' AND status='gameover'" ); while( $r = mysql_fetch_array($result,MYSQL_NUM)) - $output[] = "#".$r[1]." "; + $output[] = "".DB_format_gameid($r[1])." "; echo implode(", ",$output)."

    \n"; $names = DB_get_all_names(); @@ -1950,38 +1784,6 @@ else if( myisset("email","password") || isset($_SESSION["name"]) ) DB_close(); exit(); } -/* page for registration */ - else if(myisset("register") ) - { - output_register(); - } -/* new user wants to register */ - else if(myisset("Rfullname","Remail","Rpassword","Rtimezone") ) - { - $ok=1; - if(DB_get_userid_by_name($_REQUEST["Rfullname"])) - { - echo "please chose another name
    "; - $ok=0; - } - if(DB_get_userid_by_email($_REQUEST["Remail"])) - { - echo "this email address is already used ?!
    "; - $ok=0; - } - if($ok) - { - $r=mysql_query("INSERT INTO User VALUES(NULL,".DB_quote_smart($_REQUEST["Rfullname"]). - ",".DB_quote_smart($_REQUEST["Remail"]). - ",".DB_quote_smart(md5($_REQUEST["Rpassword"])). - ",".DB_quote_smart($_REQUEST["Rtimezone"]).",NULL)"); - - if($r) - echo " added you to the database"; - else - echo " something went wrong, couldn't add you to the database, please contact $ADMIN_NAME at $ADMIN_EMAIL."; - } - } /* default login page */ else {