CLEANUP: clean up the preferences html output a bit

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

diff --git a/include/welcome.php b/include/welcome.php
index 5436ecf5f1015902f4d0f1a84907b7b53ad33a72..5dd267c2741832aa2122cffbf49049080c231c97 100644 (file)
--- a/include/welcome.php
+++ b/include/welcome.php
@@ -1,5 +1,5 @@
 <?php
-/* make sure that we are not called from outside the scripts, 
+/* make sure that we are not called from outside the scripts,
  * use a variable defined in config.php to check this
  */
 if(!isset($HOST))
@@ -9,12 +9,15 @@ if(!isset($HOST))
 
 $pre[0]=0;$game[0]=0;$done[0]=0;
 
-$r=DB_query("SELECT COUNT(id) FROM Game GROUP BY status");
-if($r) {
-  $pre  = DB_fetch_array($r);
-  $game = DB_fetch_array($r);
-  $done = DB_fetch_array($r);
- }
+$r=DB_query("SELECT COUNT(*) FROM Game where status='pre'");
+if($r)  $pre  = DB_fetch_array($r);
+
+$r=DB_query("SELECT COUNT(*) FROM Game where status='play'");
+if($r)  $game  = DB_fetch_array($r);
+
+$r=DB_query("SELECT COUNT(*) FROM Game where status='gameover'");
+if($r)  $done  = DB_fetch_array($r);
+
 
 $r=DB_query("SELECT AVG(datediff(mod_date,create_date)) FROM Game where status='gameover' ");
 if($r)
@@ -27,7 +30,7 @@ $game = $game[0];
 $done  = $done[0];
 $avgage        = $avgage[0];
 
-echo "<div class=\"login\">\n";
+echo "\n\n<div class=\"login\">\n";
 
 echo "<p> If you want to play a game of Doppelkopf, you found the right place ;)</p>".
 "<p> For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>".
@@ -61,28 +64,19 @@ if($done==0)
 ?>
 
   <h4> Login/Register:</h4>
-  <p> 
+  <p>
   Please <a href="index.php?action=register">register</a>, in case you have not done that yet  <br />
   or login with you email-address or name and password here:
   </p>
 
   <form action="index.php?action=login" method="post">
   <fieldset>
-  <table>
-  <tr>
-    <td><label for="email">Email:</label></td>
-    <td><input type="text" class="submitbutton" id="email" name="email" size="20" maxlength="30" /> </td>
-  </tr>
-  <tr>
-    <td><label for="password">Password:</label></td>
-    <td><input type="password" class="submitbutton" id="password" name="password" size="20" maxlength="30" /></td>
-  </tr>
-  <tr class="center">
-    <td> <input type="submit" class="submitbutton" name="login" value="login" /></td>
-    <td> <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" /></td>
-  </tr>
-  </table>
+    <label for="email">Email:</label>
+    <input type="text" id="email" name="email" size="20" maxlength="30" /> <br />
+    <label for="password">Password:</label>
+    <input type="password" id="password" name="password" size="20" maxlength="30" /> <br />
+    <input type="submit" class="submitbutton" name="login" value="login" />
+    <input type="submit" class="submitbutton" name="forgot" value="Forgot your password?" />
   </fieldset>
   </form>
-  
-</div>  
\ No newline at end of file
+</div>