CLEANUP: cleaned up code for Karlchen

[e-DoKo.git] / include / reminder.php

diff --git a/include/reminder.php b/include/reminder.php
index a269478b5085d0856f781d7abd38c6612eb1db22..1031decca055927aadfe792399c3b5d59db6dec2 100644 (file)
--- a/include/reminder.php
+++ b/include/reminder.php
@@ -1,18 +1,33 @@
 <?php
 <?php

+/* Copyright 2006, 2007, 2008, 2009, 2010 Arun Persaud <arun@nubati.net>
+ *
+ *   This file is part of e-DoKo.
+ *
+ *   e-DoKo is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   e-DoKo is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with e-DoKo.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+

 /* make sure that we are not called from outside the scripts, 
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
   exit;
 
 /* make sure that we are not called from outside the scripts, 
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
   exit;
 

-output_status();
-

 if(!myisset("me"))
   {
     echo "Hmm, you really shouldn't mess with the urls.<br />\n";
 if(!myisset("me"))
   {
     echo "Hmm, you really shouldn't mess with the urls.<br />\n";

-    output_footer();
-    DB_close();
-    exit();
+    return;

   }
 
 $me = $_REQUEST["me"];
   }
 
 $me = $_REQUEST["me"];


@@ -23,9 +38,7 @@ if(!$myid)
   {
     echo "Can't find you in the database, please check the url.<br />\n";
     echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";
   {
     echo "Can't find you in the database, please check the url.<br />\n";
     echo "perhaps the game has been canceled, check by login in <a href=\"$INDEX\">here</a>.";

-    output_footer();
-    DB_close();
-    exit();
+    return;

   }
 
 DB_update_user_timestamp($myid);
   }
 
 DB_update_user_timestamp($myid);


@@ -35,21 +48,18 @@ $gameid   = DB_get_gameid_by_hash($me);
 $myname   = DB_get_name('hash',$me);
 
 /* check if player hasn't done anything in a while */
 $myname   = DB_get_name('hash',$me);
 
 /* check if player hasn't done anything in a while */

-$result = mysql_query("SELECT mod_date,player,status from Game WHERE id='$gameid' " );
-$r = mysql_fetch_array($result,MYSQL_NUM);
+$r = DB_query_array("SELECT mod_date,player,status from Game WHERE id='$gameid' " );

 if( (time()-strtotime($r[0]) > 60*60*24*7)  && ($r[2]!='gameover') ) /* = 1 week */
   {
     $name = DB_get_name('userid',$r[1]);
 if( (time()-strtotime($r[0]) > 60*60*24*7)  && ($r[2]!='gameover') ) /* = 1 week */
   {
     $name = DB_get_name('userid',$r[1]);

-    $To   = DB_get_email('userid',$r[1]);

     $userhash = DB_get_hash_from_gameid_and_userid($gameid,$r[1]);
 
     $userhash = DB_get_hash_from_gameid_and_userid($gameid,$r[1]);
 

-    $message = "Hello $name, \n\n".
-      "It's your turn in game ".DB_format_gameid($gameid)." \n".
+    $message = "It's your turn in game ".DB_format_gameid($gameid)." \n".

       "Actually everyone else is waiting for you for more than a week now ;)\n\n".
       "Please visit this link now to continue: \n".
       " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ;
 
       "Actually everyone else is waiting for you for more than a week now ;)\n\n".
       "Please visit this link now to continue: \n".
       " ".$HOST.$INDEX."?action=game&me=".$userhash."\n\n" ;
 

-    /* make sure we don't send too  many reminders to one person */
+    /* make sure we don't send too many reminders to one person */

     if(DB_get_reminder($r[1],$gameid)>0)
       {
        echo "<p>An email has already been sent out.</p>\n";
     if(DB_get_reminder($r[1],$gameid)>0)
       {
        echo "<p>An email has already been sent out.</p>\n";


@@ -57,12 +67,13 @@ if( (time()-strtotime($r[0]) > 60*60*24*7)  && ($r[2]!='gameover') ) /* = 1 week
     else
       {
        DB_set_reminder($r[1],$gameid);
     else
       {
        DB_set_reminder($r[1],$gameid);

-       mymail($To,$EmailName."Reminder: game ".DB_format_gameid($gameid)." it's your turn",$message);
+       $subject ='Reminder: game '.DB_format_gameid($gameid)." it's your turn";
+       mymail($r[1],$subject,$message);

 
        echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid).
          ": an email has been sent out.<br /><br /></p>";
       }
   }
  else
 
        echo "<p style=\"background-color:red\";>Game ".DB_format_gameid($gameid).
          ": an email has been sent out.<br /><br /></p>";
       }
   }
  else

-   echo "<p>You need to wait longer before you can send out a reminder...</p>\n";
+   echo '<p>You need to wait longer before you can send out a reminder...</p>\n';

 ?>
\ No newline at end of file
 ?>
\ No newline at end of file