From 9c5af0e78797d2c5c2e3bbf2439bb7b88fc32cdf Mon Sep 17 00:00:00 2001 From: Arun Persaud Date: Tue, 19 Jun 2007 22:57:17 +0200 Subject: CLEANUP: code + text messages cleaned up the code and corrected some typos --- .gitignore | 4 ++- index.php | 110 +++++++++++++++++++++++++++---------------------------------- output.php | 8 +++-- 3 files changed, 57 insertions(+), 65 deletions(-) diff --git a/.gitignore b/.gitignore index e4e5f6c..a7db7a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -*~ \ No newline at end of file +*~ +config.php +db*sql \ No newline at end of file diff --git a/index.php b/index.php index f5c3d3d..1db07ce 100644 --- a/index.php +++ b/index.php @@ -1,9 +1,6 @@ yes
"; } } - echo "I don't want to take any trump: ". - "yes
"; + echo "No,way I take those trump...
"; echo "Your cards are:
\n"; $mycards = DB_get_hand($me); @@ -897,13 +892,7 @@ else if(myisset("me")) else echo "it's not your turn yet to decide if you want to take the trump or not."; } - /* - * yes, display number of trump and user's hand, ask if he wants to take it - * no, set whom-to-ask to next player, email next player, cancle game if no next player - * yes -> link to new page:display all cards, ask for N return cards - * set re/contra - * - */ + }; } /* check if no one wanted to take trump, in that case the gamesickness would be set to 5 or 50 */ @@ -930,10 +919,10 @@ else if(myisset("me")) } /* check if all players are ready to play */ - $ok=1; + $ok = 1; foreach($userids as $user) if(DB_get_hand_status_by_userid_and_gameid($user,$gameid)!='play') - $ok=0; + $ok = 0; if($ok) { @@ -974,14 +963,14 @@ else if(myisset("me")) */ $gametype = DB_get_gametype_by_gameid($gameid); - $GT = $gametype; + $GT = $gametype; if($gametype=="solo") { $gametype = DB_get_solo_by_gameid($gameid); - $GT = $gametype." ".$GT; + $GT = $gametype." ".$GT; } else - $gametype="normal"; + $gametype = "normal"; set_gametype($gametype); /* this sets the $CARDS variable */ @@ -1050,8 +1039,8 @@ else if(myisset("me")) if($sickness=="poverty") { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $cards = DB_get_all_hand($userhash); - $trumpNR = count_trump($cards); + $cards = DB_get_all_hand($userhash); + $trumpNR = count_trump($cards); if($trumpNR) echo "(poverty < trump back)"; else @@ -1065,8 +1054,8 @@ else if(myisset("me")) if($sickness=="poverty") { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $cards = DB_get_all_hand($userhash); - $trumpNR = count_trump($cards); + $cards = DB_get_all_hand($userhash); + $trumpNR = count_trump($cards); if($trumpNR) echo "(poverty A < trump back)"; else @@ -1078,8 +1067,8 @@ else if(myisset("me")) if($sickness=="poverty") { $userhash = DB_get_hash_from_gameid_and_userid($gameid,$user); - $cards = DB_get_all_hand($userhash); - $trumpNR = count_trump($cards); + $cards = DB_get_all_hand($userhash); + $trumpNR = count_trump($cards); if($trumpNR) echo "(poverty B < trump back)"; else @@ -1124,8 +1113,7 @@ else if(myisset("me")) "LEFT JOIN Comment ON Play.id=Comment.play_id ". "WHERE Trick.game_id='".$gameid."' ". "ORDER BY Trick.id,sequence ASC"); - $trickNR = 1; - + $trickNR = 1; $lasttrick = DB_get_max_trickid($gameid); $play = array(); /* needed to calculate winner later */ @@ -1206,14 +1194,14 @@ else if(myisset("me")) /* whos turn is it? */ if($seq==4) { - $winner = get_winner($play,$gametype); /* returns the position */ - $next = $winner; + $winner = get_winner($play,$gametype); /* returns the position */ + $next = $winner; $firstcard = ""; /* new trick, no first card */ } else { $next = $pos+1; - if($next==5) $next=1; + if($next==5) $next = 1; } /* my turn?, display cards as links, ask for comments*/ @@ -1370,7 +1358,7 @@ else if(myisset("me")) " LEFT JOIN User ON Hand.user_id=User.id". " WHERE Hand.game_id=$gameid". " GROUP BY fullname" ); - $message = "The game is over. Thanks for playing :)\n"; + $message = "The game is over. Thanks for playing :)\n"; $message .= "Final score:\n"; while( $r = mysql_fetch_array($result,MYSQL_NUM)) $message .= " ".$r[0]."(".$r[2].") ".$r[1]."\n"; @@ -1579,7 +1567,7 @@ else if(myisset("me")) " WHERE session=$session". " ORDER BY create_date DESC". " LIMIT 1"); - $r=-1; + $r = -1; if($result) $r = mysql_fetch_array($result,MYSQL_NUM); @@ -1608,11 +1596,11 @@ else if(myisset("me")) if(myisset("forgot")) { - $ok=1; + $ok = 1; $uid = DB_get_userid_by_email($email); if(!$uid) - $ok=0; + $ok = 0; if($ok) { @@ -1634,10 +1622,10 @@ else if(myisset("me")) if(strlen($password)!=32) $password = md5($password); - $ok=1; + $ok = 1; $uid = DB_get_userid_by_email_and_password($email,$password); if(!$uid) - $ok=0; + $ok = 0; if($ok) { @@ -1677,7 +1665,7 @@ else if(myisset("me")) DB_update_user_timestamp($uid); - echo "

these are your games that haven't started yet:
\n"; + echo "

These are your games that haven't started yet:
\n"; $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player from Hand". " LEFT JOIN Game On Hand.game_id=Game.id". " WHERE Hand.user_id='$uid' AND Game.status='pre'" ); @@ -1702,7 +1690,7 @@ else if(myisset("me")) } echo "

\n"; - echo "

these are the games you are playing in:
\n"; + echo "

These are the games you are playing in:
\n"; $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player from Hand". " LEFT JOIN Game On Hand.game_id=Game.id". " WHERE Hand.user_id='$uid' AND Game.status='play'" ); @@ -1728,15 +1716,15 @@ else if(myisset("me")) echo "

\n"; - echo "

and these are your games that are already done:
Game: \n"; - $output=array(); + echo "

And these are your games that are already done:
Game: \n"; + $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[] = "#".$r[1]." "; echo implode(", ",$output)."

\n"; $names = DB_get_all_names(); - echo "

registered players:
\n"; + echo "

Registered players:
\n"; echo implode(", ",$names)."\n"; echo "

\n"; @@ -1745,7 +1733,7 @@ else if(myisset("me")) } else { - echo "sorry email and password don't match
"; + echo "Sorry email and password don't match
"; } }; output_footer(); diff --git a/output.php b/output.php index 81433d0..922b439 100644 --- a/output.php +++ b/output.php @@ -289,15 +289,17 @@ function output_home_page($pre,$game,$done,$avgtime) else echo "

At the moment there are $pre games that are being started "; - echo "and"; + echo "and "; if($game==0) - echo " zero games that are ongoing. "; + echo "zero games that are ongoing. "; else if($game==1) - echo " one game that is ongoing. "; + echo "one game that is ongoing. "; else echo "$game games that are ongoing. "; + echo "
\n"; + if($done==0) echo "No game has been completed on this server.

"; else if($done==1) -- cgit v1.2.3-18-g5258