X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Fuser.php;h=fa4653de449b8bec3a5805c212ecea07853b847e;hp=0f67a68f9791ff9f7fc418421d46817dbc12494d;hb=90323815e10b6bd6dc04e270a78ee9687a2f357a;hpb=09515348107d9aab7823a12d31b082a2ebb75555

diff --git a/include/user.php b/include/user.php
index 0f67a68..fa4653d 100644
--- a/include/user.php
+++ b/include/user.php
@@ -111,26 +111,26 @@ if(myisset("forgot"))
 	       {
 	       case "germancards":
 	       case "englishcards":
-		 $result = mysql_query("SELECT * from User_Prefs".
-				       " WHERE user_id='$myid' AND pref_key='cardset'" );
-		 if( mysql_fetch_array($result,MYSQL_NUM))
-		   $result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
-					 " WHERE user_id='$myid' AND pref_key='cardset'" );
+		 $result = DB_query("SELECT * from User_Prefs".
+				    " WHERE user_id='$myid' AND pref_key='cardset'" );
+		 if( DB_fetch_array($result))
+		   $result = DB_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
+				      " WHERE user_id='$myid' AND pref_key='cardset'" );
 		 else
-		   $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','cardset',".
-					 DB_quote_smart($setpref).")");
+		   $result = DB_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','cardset',".
+				      DB_quote_smart($setpref).")");
 		 echo "Ok, changed you preferences for the cards.\n";
 		 break;
 	       case "emailaddict":
 	       case "emailnonaddict":
-		 $result = mysql_query("SELECT * from User_Prefs".
-				       " WHERE user_id='$myid' AND pref_key='email'" );
-		 if( mysql_fetch_array($result,MYSQL_NUM))
-		   $result = mysql_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
-					 " WHERE user_id='$myid' AND pref_key='email'" );
+		 $result = DB_query("SELECT * from User_Prefs".
+				    " WHERE user_id='$myid' AND pref_key='email'" );
+		 if( DB_fetch_array($result))
+		   $result = DB_query("UPDATE User_Prefs SET value=".DB_quote_smart($setpref).
+				      " WHERE user_id='$myid' AND pref_key='email'" );
 		 else
-		   $result = mysql_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','email',".
-					 DB_quote_smart($setpref).")");
+		   $result = DB_query("INSERT INTO User_Prefs VALUES(NULL,'$myid','email',".
+				      DB_quote_smart($setpref).")");
 		 echo "Ok, changed you preferences for sending out emails.\n";
 		 break;
 	       }
@@ -166,8 +166,8 @@ if(myisset("forgot"))
 		     break;
 		   case '1':
 		     echo "Changed the password.<br />";
-		     mysql_query("UPDATE User SET password='".md5($_REQUEST["password1"]).
-				 "' WHERE id=".DB_quote_smart($myid));
+		     DB_query("UPDATE User SET password='".md5($_REQUEST["password1"]).
+			      "' WHERE id=".DB_quote_smart($myid));
 		     break;
 		   }
 		 /* set password */
@@ -192,13 +192,13 @@ if(myisset("forgot"))
 	     echo "</p>\n";
 
 	     $output = array();
-	     $result = mysql_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player,Game.status from Hand".
-				   " LEFT JOIN Game ON Game.id=Hand.game_id".
-				   " WHERE user_id='$myid'".
-				   " ORDER BY Game.session,Game.create_date" );
+	     $result = DB_query("SELECT Hand.hash,Hand.game_id,Game.mod_date,Game.player,Game.status from Hand".
+				" LEFT JOIN Game ON Game.id=Hand.game_id".
+				" WHERE user_id='$myid'".
+				" ORDER BY Game.session,Game.create_date" );
 	     $gamenrold = -1;
 	     echo "<table>\n <tr><td>\n";
-	     while( $r = mysql_fetch_array($result,MYSQL_NUM))
+	     while( $r = DB_fetch_array($result))
 	       {
 		 $game = DB_format_gameid($r[1]);
 		 $gamenr = (int) $game;
@@ -212,14 +212,14 @@ if(myisset("forgot"))
 		   }
 		 if($r[4]=='pre')
 		   {
-		     echo "\n   <span class=\"gamestatuspre\"><a href=\"".$INDEX."?me=".$r[0]."\">p </a></span> ";
+		     echo "\n   <span class=\"gamestatuspre\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">p </a></span> ";
 
 		   }
 		 else if ($r[4]=='gameover')
-		   echo "\n   <span class=\"gamestatusover\"><a href=\"".$INDEX."?me=".$r[0]."\">F </a></span> ";
+		   echo "\n   <span class=\"gamestatusover\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">F </a></span> ";
 		 else
 		   {
-		     echo "\n   <span class=\"gamestatusplay\"><a href=\"".$INDEX."?me=".$r[0]."\">P </a></span> ";
+		     echo "\n   <span class=\"gamestatusplay\"><a href=\"".$INDEX."?action=game&me=".$r[0]."\">P </a></span> ";
 		   }
 		 if($r[4] != 'gameover')
 		   {
@@ -233,12 +233,12 @@ if(myisset("forgot"))
 			 if(DB_get_reminder($r[3],$gameid)==0)
 			   if(time()-strtotime($r[2]) > 60*60*24*7)
 			     echo "".
-			       "<a href=\"$INDEX?remind=1&amp;me=".$r[0]."\">Send a reminder.</a>";
+			       "<a href=\"$INDEX?action=reminder&amp;me=".$r[0]."\">Send a reminder.</a>";
 			 echo "(it's $name's turn)\n";
 		       };
 		     if(time()-strtotime($r[2]) > 60*60*24*30)
 		       echo "".
-			 "<a href=\"$INDEX?cancel=1&amp;me=".$r[0]."\">Cancel?</a>".
+			 "<a href=\"$INDEX?action=cancel&amp;me=".$r[0]."\">Cancel?</a>".
 			 " (clicking here is final and can't be restored)";
 
 		   }