CLEANUP: moved html from output.php to welcome.php

since we now have several files in the include directory, it makes more sense to keep the html directly in the file for some cases instead of putting it in output.php.

Signed-off-by: Arun Persaud <arun@nubati.net>

2 files changed, 56 insertions, 61 deletions

diff --git a/include/output.php b/include/output.php
index 6d7deb7..38356dd 100644
--- a/include/output.php
+++ b/include/output.php
@@ -226,7 +226,6 @@ function output_form_calls($me)
       " <input type=\"radio\" name=\"call\" value=\"no\" /> <br />";
 }
 
-
 function output_check_want_to_play($me)
 {
    ?>
@@ -243,64 +242,6 @@ function output_check_want_to_play($me)
   return;
 }
 
-function output_home_page($pre,$game,$done,$avgtime)
-{
-  global $WIKI;
-  
-  echo"<p> If you want to play a game of Doppelkopf, you found the right place ;)".
-    " For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>";
-  
-  if($pre == 0)
-    echo "<p> At the moment there are no games that are being started ";
-  else if($pre==1)
-    echo "<p> At the moment there is one games that is being started ";
-  else
-    echo "<p> At the moment there are $pre games that are being started ";
-  
-  echo "and ";
-  
-  if($game==0)
-    echo "zero games that are ongoing. ";
-  else if($game==1)
-    echo "one game that is ongoing. ";
-  else
-    echo "$game games that are ongoing. ";
-  
-  echo "<br />\n";
-  
-  if($done==0)
-    echo "No game has been completed on this server. </p>";
-  else if($done==1)
-    echo "One game has been completed on this server. </p>";
-  else
-    echo "$done games have been completed on this server. Average time of a game: $avgtime days</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>
-            <legend>Login</legend>
-             <table>
-              <tr>
-                 <td><label for="email">Email:</label></td>
-                 <td><input type="text" id="email" name="email" size="20" maxlength="30" /> </td>
-              </tr><tr>
-                 <td><label for="password">Password:</label></td>
-                 <td><input type="password" id="password" name="password" size="20" maxlength="30" /></td>
-              </tr><tr>
-                <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>
-          </fieldset>
-        </form>
-
-<?php
- return;
-}
-
 function output_header()
 {
    global $REV;
diff --git a/include/welcome.php b/include/welcome.php
index 34709d3..ccbaea5 100644
--- a/include/welcome.php
+++ b/include/welcome.php
@@ -8,6 +8,7 @@ if(!isset($HOST))
 /* this outputs the default home page with some extra statistics on it */
 
 $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);
@@ -21,6 +22,59 @@ if($r)
  else
    $avgage[0]=0;
 
-output_home_page($pre[0],$game[0],$done[0],$avgage[0]);
+$pre	= $pre[0];
+$game	= $game[0];
+$done	= $done[0];
+$avgage	= $avgage[0];
+
+echo "<p> If you want to play a game of Doppelkopf, you found the right place ;)".
+" For more information please visit our <a href=\"$WIKI\">wiki</a>. </p>";
+
+if($pre == 0)
+  echo "<p> At the moment there are no games that are being started ";
+ else if($pre==1)
+   echo "<p> At the moment there is one games that is being started ";
+ else
+   echo "<p> At the moment there are $pre games that are being started ";
+
+echo "and ";
+
+if($game==0)
+  echo "zero games that are ongoing. ";
+ else if($game==1)
+   echo "one game that is ongoing. ";
+ else
+   echo "$game games that are ongoing. ";
+
+echo "<br />\n";
+
+if($done==0)
+  echo "No game has been completed on this server. </p>";
+ else if($done==1)
+   echo "One game has been completed on this server. </p>";
+ else
+   echo "$done games have been completed on this server. Average time of a game: $avgage days</p>";
+?>
 
-?>
\ No newline at end of file
+<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>
+  <legend>Login</legend>
+  <table>
+  <tr>
+  <td><label for="email">Email:</label></td>
+  <td><input type="text" id="email" name="email" size="20" maxlength="30" /> </td>
+  </tr><tr>
+  <td><label for="password">Password:</label></td>
+  <td><input type="password" id="password" name="password" size="20" maxlength="30" /></td>
+  </tr><tr>
+  <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>
+  </fieldset>
+  </form>
+  
+  
\ No newline at end of file