X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=include%2Ffunctions.php;h=cb784575d783fc344077c3db9d8d78cbe1964433;hp=a17ce0811d28c018bac0d4b578f6d1cae297fcaf;hb=14f6017a5b84d70320bde9d6e074ea8ac948a85e;hpb=72842383a6162e43f8b9630bfcca13d10eca7bff;ds=sidebyside

diff --git a/include/functions.php b/include/functions.php
index a17ce08..cb78457 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -30,42 +30,45 @@ function config_check()
 
   /* check if some variables are set in the config file, else set defaults */
   if(!isset($EmailName))
-    $EmailName="[DoKo] ";
+    $EmailName='[DoKo] ';
   if(isset($EMAIL_REPLY))
     {
-      ini_set("sendmail_from",$EMAIL_REPLY);
+      ini_set('sendmail_from',$EMAIL_REPLY);
     }
   if(!isset($ADMIN_NAME))
     {
       output_header();
-      echo "<h1>Setup not completed</h1>";
-      echo "You need to set \$ADMIN_NAME in config.php.";
+      echo '<h1>Setup not completed</h1>';
+      echo 'You need to set $ADMIN_NAME in config.php.';
       output_footer();
       exit();
     }
   if(!isset($ADMIN_EMAIL))
     {
       output_header();
-      echo "<h1>Setup not completed</h1>";
-      echo "You need to set \$ADMIN_EMAIL in config.php. ".
-	"If something goes wrong an email will be send to this address.";
+      echo '<h1>Setup not completed</h1>';
+      echo 'You need to set $ADMIN_EMAIL in config.php. '.
+	'If something goes wrong an email will be send to this address.';
       output_footer();
       exit();
     }
   if(!isset($DB_work))
     {
       output_header();
-      echo "<h1>Setup not completed</h1>";
-      echo "You need to set \$DB_work in config.php. ".
-	"If this is set to 1, the game will be suspended and one can work safely on the database.".
-	"The default should be 0 for the game to work.";
+      echo '<h1>Setup not completed</h1>';
+      echo 'You need to set $DB_work in config.php. '.
+	'If this is set to anything else than 0, the game will be suspended and one can work safely on the database. '.
+	'A message will be displayed that it will probably take about N minutes, with N being the number $DB_work is set to. '.
+	'The default should be 0 for the game to work.';
       output_footer();
       exit();
     }
   if($DB_work)
     {
       output_header();
-      echo "Working on the database...please check back later.";
+      echo '<div class="WIP">'.
+	_("Working on some aspect of e-DoKo... This will probably take max. $DB_work minutes. It could be over in a few seconds too though ;)").
+	'</div>';
       output_footer();
       exit();
     }
@@ -196,7 +199,7 @@ function mymail($uid,$gameid=0,$type,$message)
   else
     {
       /* store email in database */
-      DB_digest_insert_email($To,$message);
+      DB_digest_insert_email($To,$message,$type,$gameid);
     }
 }
 
@@ -566,6 +569,9 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
 
   if($debug)
     {
+      /* fix the hands; makes debugging easier; the following hands have lots of sicknesses,
+       * to make testing easier
+       */
       $r[ 0]=1;     $r[12]=47;   $r[24]=13;       $r[36]=37;
       $r[ 1]=2;     $r[13]=23;   $r[25]=14;	  $r[37]=38;
       $r[ 2]=3;     $r[14]=27;   $r[26]=15;	  $r[38]=39;
@@ -582,7 +588,7 @@ function  create_array_of_random_numbers($useridA,$useridB,$useridC,$useridD)
   else
     {
       /* check if we can find a game were non of the player was involved and return
-       * cards insted
+       * cards instead
        */
       $userstr = "'".implode("','",array($useridA,$useridB,$useridC,$useridD))."'";
       $randomnumbers = DB_get_unused_randomnumbers($userstr);
@@ -999,7 +1005,7 @@ function display_table_begin ()
   echo "<div class=\"table\">\n";
   display_single_user($row1);
   echo "\n<div class=\"middle\">\n";
-  display_single_user($row0);
+  display_single_user($row0,1); /* mark starting player in case re/contra is not set yet */
   echo "  <img class=\"table\" src=\"pics/table.png\" alt=\"table\" />\n";
   display_single_user($row2);
 
@@ -1037,8 +1043,10 @@ function display_table_end ()
   return;
 }
 
-function display_single_user($r)
+function display_single_user($r,$start=0)
 {
+  /* start=1, mark starting player, default=0, so the player on the left is not marked */
+
   global $gameid, $GT, $debug,$INDEX,$defaulttimezone,$session;
   global $RULES,$GAME,$gametype;
 
@@ -1061,6 +1069,10 @@ function display_single_user($r)
 
       echo "  <div class=\"table".($pos-1)."\">\n";
 
+      /* mark starting player */
+      if($start && ! ($party=="re" || $party=="contra"))
+	echo '   <span class="start">'._('Starting Player')."</span> <br />\n";
+
       if($debug)
 	echo "   <a href=\"".$INDEX."?action=game&amp;me=".$hash."\">";
       if($vacation = check_vacation($user))
@@ -1638,4 +1650,53 @@ function get_user_token($userid)
   return $token;
 }
 
+function verify_password($email, $password)
+{
+  /* verify password, if old password has length 32 assume it's an old md5, else use new password scheme */
+  /* return 0 if verified, else return error code
+   *        1 can't find email
+   *        2 can't calculate correct hash
+   *        3 misc error
+   */
+
+  /* check user email by getting his id */
+  $userid = DB_get_userid('email',$email);
+  if(!$userid)
+    return 1;
+
+  /* test for temporary passwords, only valid for one date (tested in the DB) */
+  $tmppasswd = md5($password);
+  if(DB_check_recovery_passwords($tmppasswd,$email))
+    return 0;
+
+  /* get saved password */
+  $existingpassword =  DB_get_passwd_by_userid($userid);
+
+  if(strlen($existingpassword)==32) /* old password type */
+    {
+      if ($existingpassword == md5($password))
+	{
+	  /* update password to new crypt version */
+	  // create a password hash using the crypt function, need php 5.3 for this
+	  // create and random salt
+	  $salt = substr(str_replace('+', '.', base64_encode(sha1(microtime(true), true))), 0, 22);
+	  // hash incoming password using 12 rounds of blowfish
+	  $hash = crypt($password, '$2y$12$' . $salt);
+	  if(strlen($hash)>13)
+	    DB_query("UPDATE User SET password='$hash' where id='$userid'");
+	  else
+	    return 2;
+
+	  return 0;
+	}
+    }
+  else
+    {
+      if ($existingpassword == crypt($password, $existingpassword))
+	return 0;
+    };
+
+  return 3;
+}
+
 ?>