Pushed to v3

1 files changed, 36 insertions, 32 deletions

diff --git a/www/quote.php b/www/quote.php
index b0bc136..70b1b84 100644
--- a/www/quote.php
+++ b/www/quote.php
@@ -3,26 +3,29 @@
 /* Copyright Maximilian Möhring, 2013
 Licensed under the GPL. Read LICENSE for more Information.*/
 
-include('auth.php');
-include("header.php");
+function print_quote($db){
+	include("static/header.php");
 
-$zufall = $_GET["id"];
+	if(!empty($_GET["id"])){
+		$zufall = $_GET["id"];
+	} else {
+		$zufall = "";
+	}
 
-/*__Datenbank___*/
-$db = new SQLite3("../database/database.sqlite");
-$rows = $db->query("SELECT count(*) as count FROM sprueche;");
-$row = $rows->fetchArray();
-$numRows = $row["count"];
+	/*__Datenbank___*/
+	$rows = $db->query("SELECT count(*) as count FROM sprueche;");
+	$row = $rows->fetchArray();
+	$numRows = $row["count"];
 
-if ($zufall == ""){
-	$zufall  = mt_rand(1,$numRows);
-}
+	if ($zufall == ""){
+		$zufall  = mt_rand(1,$numRows);
+	}
 
 
-$safe_zufall = SQLite3::escapeString("$zufall");
-$ergebnis = $db->query("SELECT * FROM sprueche where id=$safe_zufall;");
+	$safe_zufall = SQLite3::escapeString("$zufall");
+	$ergebnis = $db->query("SELECT * FROM sprueche where id=$safe_zufall;");
 
-echo"
+	echo"
 
 <div id='content_container' align='center'>
         <br>
@@ -33,23 +36,24 @@ echo"
 
 <br><br><br>
 
-<b>Zitat Nummer #$zufall</b><br><br><div id='bgcolor'>";
+<b>Zitat Nummer #$zufall</b><br><br><div id='bgcolor'>
+	";
 
 
-if (preg_match('/[0-9]/',$zufall)){	// I really need this hack to get the 404 when /[0-9][a-zA-Z]/ is happening. Bad PHP!
-	if (preg_match('/[^0-9]/',$zufall)){
-		$zufall = 0;
+	if (preg_match('/[0-9]/',$zufall)){	// I really need this hack to get the 404 when /[0-9][a-zA-Z]/ is happening. Bad PHP!
+		if (preg_match('/[^0-9]/',$zufall)){
+			$zufall = 0;
+		}
 	}
-}
 
 
 
-if ($zufall > 0 && $zufall <= ($numRows)){
-	while($row=$ergebnis->fetchArray()){
-        	echo $row["spruch"];
-	}
-} else {
-echo "\"Sorry, can't find the quote, but a cat is fine too, right?\"<br><br>
+	if ($zufall > 0 && $zufall <= ($numRows)){
+		while($row=$ergebnis->fetchArray()){
+        		echo $row["spruch"];
+		}
+	} else {
+	echo "\"Sorry, can't find the quote, but a cat is fine too, right?\"<br><br>
 <pre>
       ,/|         _.--''^``-...___.._.,;
      /, \'.     _-'          ,--,,,--'''
@@ -58,15 +62,16 @@ echo "\"Sorry, can't find the quote, but a cat is fine too, right?\"<br><br>
  ._.--''     ._,,, _..'  .;.'           
   (,_....----'''     (,..--''           
 </pre><br><br>
-<i>404 - Eintrag nicht vorhanden.</i>";
-}
+<i>404 - Eintrag nicht vorhanden.</i>
+	";
+	}
 
-echo "</div>
+	echo "</div>
 
 <br><br><br>
    -----------------------------------------------------------------
 <div class='kleineschrift'><p>Es sind momentan <b><i>$numRows</i></b> Zitate in der Datenbank enthalten.</p>
-Du suchst ein bestimmtes Zitat? Gib hier dessen Nummer ein: <form method='get' action='quote.php' >
+Du suchst ein bestimmtes Zitat? Gib hier dessen Nummer ein: <form method='get' action='/quote' >
     <input name='id' type='text' size='2' maxlength='30'>
     <input type='submit' style='display:none'/>
 
@@ -74,6 +79,5 @@ Du suchst ein bestimmtes Zitat? Gib hier dessen Nummer ein: <form method='get' a
 </div>
 
 </div></div></div>
-</body></html>";
-
-?>
+";
+}