From 0bf8233e0ef1db60e09269db5a2372fdd67f290d Mon Sep 17 00:00:00 2001
From: Arun Persaud <arun@nubati.net>
Date: Sat, 23 Jun 2007 19:14:58 +0200
Subject: [PATCH] NEW FEATURE: added admin name and email address to be
 configurable

email and name can be defined in config.php. Errors are send to that email address.
---
 functions.php | 14 +++++++++++---
 index.php     | 39 ++++++++++++++++++++++++++++++---------
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/functions.php b/functions.php
index be88974..7ee180e 100644
--- a/functions.php
+++ b/functions.php
@@ -28,7 +28,7 @@ function myisset()
   /* returns 1 if all names passed as args are defined by a GET or POST statement,
    * else return 0
    */
-
+  
   $ok   = 1;
   $args = func_get_args();
   
@@ -41,10 +41,17 @@ function myisset()
   return $ok;
 }
 
+function myerror($message)
+{
+  echo "<span class=\"error\">".htmlspecialchars($message)."</span>\n";
+  mymail($ADMIN_EMAIL,$EmailName." Error in Code",$message);
+  return;
+}
+
 function pos_array($c,$arr)
 {
   $ret = 0;
-
+  
   $i   = 0;
   foreach($arr as $a)
     {
@@ -335,7 +342,8 @@ function card_value($card)
     case 48:	               
       return 0;
     default:
-      echo "something went wrong, please contact the admin. ErrorCode: 2 - $card<br>";
+      myerror("something went wrong, please contact $ADMIN_NAME at $ADMIN_EMAIL. ErrorCode: 2 - $card<br>");
+      echo "something went wrong, please contact $ADMIN_NAME at $ADMIN_EMAIL. ErrorCode: 2 - $card<br>";
       return 0;
     }
 }
diff --git a/index.php b/index.php
index 980db24..44a5d5f 100644
--- a/index.php
+++ b/index.php
@@ -13,6 +13,23 @@ if(isset($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.";
+    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 send to this address.";
+    output_footer(); 
+    exit(); 
+  }
 
 /* in case work has to be done on the database or other section we can
  * shut down the server and tell people to come back later 
@@ -28,7 +45,8 @@ if(0)
 if(DB_open()<0)
   {
     output_header();
-    echo "Database error, can't connect...";
+    echo "Database error, can't connect... Please wait a while and try again. ".
+      "If the problem doesn't go away feel free to contact $ADMIN_NAME at $ADMIN_EMAIL.";
     output_footer(); 
     exit(); 
   }
@@ -79,7 +97,7 @@ if(myisset("new"))
     $ruleset = DB_get_ruleset($dullen,$schweinchen);
     if($ruleset <0) 
       {
-	echo "Error defining ruleset: $ruleset";
+	myerror("Error defining ruleset: $ruleset");
 	output_footer();
 	DB_close();
 	exit();
@@ -379,7 +397,7 @@ else if(myisset("me"))
 	  /* all these variables have a pre-selected default,
 	   * so we should never get here,
 	   * unless a user tries to cheat ;) */
-	  echo "something went wrong...please contact the admin.";
+	  echo "something went wrong during the setup...please contact the $ADMIN_NAME at $ADMIN_EMAIL.";
 	}
       else
 	{
@@ -771,7 +789,8 @@ else if(myisset("me"))
 		  $r      = mysql_fetch_array($result,MYSQL_NUM);
 		  if(!$r)
 		    {
-		      die("error in poverty");
+		      myerror("error in poverty");
+		      die();
 		    };
 		  if($r[0]==12)
 		    {
@@ -1396,8 +1415,9 @@ else if(myisset("me"))
 		  if($winnerid>0)
 		    mysql_query("INSERT INTO Score VALUES (NULL, '$gameid', '$winnerid', '$points')");
 		  else
-		    echo "ERROR during scoring";
-		  
+		    {
+		      myerror("ERROR during scoring");
+		    }		  
 		  /* email all players */
 		  /* individual score */
 		  $result = mysql_query("SELECT fullname, IFNULL(SUM(score),0), Hand.party FROM Hand".
@@ -1458,8 +1478,9 @@ else if(myisset("me"))
 		      if($winnerid>0)
 			mysql_query("INSERT INTO Score VALUES (NULL, '$gameid', '$winnerid', '$points')");
 		      else
-			echo "ERROR during scoring";
-		      
+			{
+			  myerror("ERROR during scoring");
+			};
 		      if($debug)
 			echo "DEBUG: $winner got $points <br />";
 		      
@@ -1627,7 +1648,7 @@ else if(myisset("me"))
 	}
       break;
     default:
-      echo "error in testing the status";
+      myerror("error in testing the status");
     }
     output_footer();
     DB_close();
-- 
2.25.1