BUGFIX: Score table in email displayed some html

[e-DoKo.git] / index.php

diff --git a/index.php b/index.php
index 6807fa612c70560448d280a1807ca719be3d1a9f..d0d9eef40362dd39d496864394eacac2b977134b 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1743,6 +1743,38 @@ else if(myisset("me"))
                  $message .= " Total Points (from the Re point of view): $Tpoint\n";
                  $message .= "\n";
 
+                 $session = DB_get_session_by_gameid($gameid);
+                 $score = generate_score_table($session);
+                 /* convert html to ascii */
+                 $score = str_replace("<div class=\"scoretable\">\n<table class=\"score\">\n <tr>\n","",$score);
+                 $score = str_replace("</table></div>\n","",$score);
+                 $score = str_replace("\n","",$score);
+                 $score = str_replace(array("<tr>","</tr>","<td>","</td>"),array("","\n","","|"),$score);
+                 $score = explode("\n",$score);
+
+                 $header = array_slice($score,0,1);
+                 $header = explode("|",$header[0]);
+                 for($i=0;$i<sizeof($header);$i++)
+                   $header[$i]=str_pad($header[$i],6," ",STR_PAD_BOTH);
+                 $header = implode("|",$header);
+                 $header.= "\n------+------+------+------+------+\n";
+                 if(sizeof($score)>5) $header.=   "                ...   \n";
+
+                 if(sizeof($score)>5) $score = array_slice($score,-5,5);
+                 for($i=0;$i<sizeof($score);$i++)
+                   {
+                     $line = explode("|",$score[$i]);
+                     for($j=0;$j<sizeof($line);$j++)
+                       $line[$j]=str_pad($line[$j],6," ",STR_PAD_LEFT);
+                     $score[$i] = implode("|",$line);
+                   }
+
+                 $score = implode("\n",$score);
+                 $score = $header.$score;
+                 
+                 $message .= "Score Table:\n";
+                 $message .= $score;
+
                  /* send out final email */
                  $all = array();
 
@@ -2196,21 +2228,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                   if($r[4] != 'gameover')
                     {
                       echo "</td><td>\n    ";
-                      if($r[3])
+                      if($r[3]==$myid || !$r[3])
+                        echo "(it's <strong>your</strong> turn)\n";
+                      else
                         {
-                          if($r[3]==$myid)
-                            echo "(it's <strong>your</strong> turn)\n";
-                          else
-                            {
-                              $name = DB_get_name_by_userid($r[3]);
-                              $gameid = $r[1];
-                              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>";
-                              echo "(it's $name's turn)\n";
-                            };
-                        }
+                          $name = DB_get_name_by_userid($r[3]);
+                          $gameid = $r[1];
+                          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>";
+                          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>".
@@ -2219,10 +2248,18 @@ else if( myisset("email","password") || isset($_SESSION["name"]) )
                     }
                 }
               echo "</td></tr>\n</table>\n";
-              $names = DB_get_all_names();
-              echo "<h4>Registered players:</h4>\n<p>\n";
-              echo implode(", ",$names)."\n";
-              echo "</p>\n</div>";
+
+              $names = DB_get_names_of_new_logins(5);
+              echo "<h4>New Players:</h4>\n<p>\n";
+              echo implode(", ",$names).",...\n";
+              echo "</p>\n";
+
+              $names = DB_get_names_of_last_logins(5);
+              echo "<h4>Players last logged in:</h4>\n<p>\n";
+              echo implode(", ",$names).",...\n";
+              echo "</p>\n";
+              
+              echo "</div>\n";
             }
         }
        else