BUGFIX: include $call in $ruleset

$call wasn't added everywhere where a new ruleset was defined;

diff --git a/db.php b/db.php
index 75cd8a0e83bcdcdeb77abab0d013c66450070fa5..a78afb6aa744d58550385e0084abc56e69978ddd 100644 (file)
--- a/db.php
+++ b/db.php
@@ -705,12 +705,13 @@ function DB_get_hashes_by_session($session,$user)
   return $r;
 }
 
   return $r;
 }
 

-function DB_get_ruleset($dullen,$schweinchen)
+function DB_get_ruleset($dullen,$schweinchen,$call)

 {
   $r = array();
   
   $result = mysql_query("SELECT id FROM Rulesets WHERE".
                        " dullen=".DB_quote_smart($dullen)." AND ".
 {
   $r = array();
   
   $result = mysql_query("SELECT id FROM Rulesets WHERE".
                        " dullen=".DB_quote_smart($dullen)." AND ".

+                       " call=".DB_quote_smart($call)." AND ".

                        " schweinchen=".DB_quote_smart($schweinchen));
   if($result)
     $r    = mysql_fetch_array($result,MYSQL_NUM);
                        " schweinchen=".DB_quote_smart($schweinchen));
   if($result)
     $r    = mysql_fetch_array($result,MYSQL_NUM);


@@ -722,7 +723,8 @@ function DB_get_ruleset($dullen,$schweinchen)
       /* create new one */
       $result = mysql_query("INSERT INTO Rulesets VALUES (NULL, NULL, ".
                            DB_quote_smart($dullen).",".
       /* create new one */
       $result = mysql_query("INSERT INTO Rulesets VALUES (NULL, NULL, ".
                            DB_quote_smart($dullen).",".

-                           DB_quote_smart($schweinchen).
+                           DB_quote_smart($schweinchen).",".
+                           DB_quote_smart($call).

                            ", NULL)");
       if($result)
        return mysql_insert_id();
                            ", NULL)");
       if($result)
        return mysql_insert_id();

diff --git a/index.php b/index.php
index 44a5d5fc233f3d8220538ecc3a1e103be6ffabfa..eee9b462f8c906f7f913a585bd5dbb4b2d4b56a7 100644 (file)
--- a/index.php
+++ b/index.php
@@ -61,7 +61,7 @@ if(myisset("new"))
     output_form_for_new_game($names);
   }
 /*check if everything is ready to set up a new game */
     output_form_for_new_game($names);
   }
 /*check if everything is ready to set up a new game */

- else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen" ))
+ else if( myisset("PlayerA", "PlayerB","PlayerC","PlayerD","dullen","schweinchen","call" ))

   {
     $PlayerA = $_REQUEST["PlayerA"];
     $PlayerB = $_REQUEST["PlayerB"];
   {
     $PlayerA = $_REQUEST["PlayerA"];
     $PlayerB = $_REQUEST["PlayerB"];


@@ -70,7 +70,8 @@ if(myisset("new"))
 
     $dullen      = $_REQUEST["dullen"];
     $schweinchen = $_REQUEST["schweinchen"];
 
     $dullen      = $_REQUEST["dullen"];
     $schweinchen = $_REQUEST["schweinchen"];

-    
+    $call        = $_REQUEST["call"];
+

     $EmailA  = DB_get_email_by_name($PlayerA);
     $EmailB  = DB_get_email_by_name($PlayerB);
     $EmailC  = DB_get_email_by_name($PlayerC);
     $EmailA  = DB_get_email_by_name($PlayerA);
     $EmailB  = DB_get_email_by_name($PlayerB);
     $EmailC  = DB_get_email_by_name($PlayerC);


@@ -92,17 +93,7 @@ if(myisset("new"))
     /* create random numbers */
     $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
     $randomNRstring = join(":",$randomNR);
     /* create random numbers */
     $randomNR       = create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD);
     $randomNRstring = join(":",$randomNR);

-    
-    /* get ruleset information or create new one */
-    $ruleset = DB_get_ruleset($dullen,$schweinchen);
-    if($ruleset <0) 
-      {
-       myerror("Error defining ruleset: $ruleset");
-       output_footer();
-       DB_close();
-       exit();
-      };
-    
+        

     /* create game */
     $followup = NULL;
     if(myisset("followup") )
     /* create game */
     $followup = NULL;
     if(myisset("followup") )


@@ -125,8 +116,20 @@ if(myisset("new"))
          }
       }
     else
          }
       }
     else

-      mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".
+      {
+       /* get ruleset information or create new one */
+       $ruleset = DB_get_ruleset($dullen,$schweinchen,$call);
+       if($ruleset <0) 
+         {
+           myerror("Error defining ruleset: $ruleset");
+           output_footer();
+           DB_close();
+           exit();
+         };
+       
+       mysql_query("INSERT INTO Game VALUES (NULL, NULL, '$randomNRstring', 'normal', NULL,NULL,'1',NULL,'pre', ".

                  "'$ruleset',NULL ,NULL)");
                  "'$ruleset',NULL ,NULL)");

+      }

     $game_id = mysql_insert_id();
     
     /* create hash */
     $game_id = mysql_insert_id();
     
     /* create hash */