From ee7ffeb51035ecfc466f7c70103c5830e078935f Mon Sep 17 00:00:00 2001
From: DoggersHusky <w0227962@nscc.ca>
Date: Sun, 24 Jan 2016 15:28:32 -0400
Subject: [PATCH] menu script clean up

menu script clean up and using content class
---
 _notes/dwsync.xml |  2 +-
 test 2 - menu.php | 25 +++----------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/_notes/dwsync.xml b/_notes/dwsync.xml
index 30f15c5..1ec2a28 100644
--- a/_notes/dwsync.xml
+++ b/_notes/dwsync.xml
@@ -3,5 +3,5 @@
 <file name="test 1 - retrieving.html" server="doggershusky.com//" local="130979898554321457" remote="130979862000000000" Dst="1" />
 <file name="test 1 - script.php" server="doggershusky.com//" local="130981362475451500" remote="130981326000000000" Dst="1" />
 <file name="test 2 - JQuery retrieving.html" server="doggershusky.com//" local="130981367384539309" remote="130981330800000000" Dst="1" />
-<file name="test 2 - menu.php" server="doggershusky.com//" local="130980597283108251" remote="130980561000000000" Dst="1" />
+<file name="test 2 - menu.php" server="doggershusky.com//" local="130981372444859783" remote="130981336200000000" Dst="1" />
 </dwsync>
\ No newline at end of file
diff --git a/test 2 - menu.php b/test 2 - menu.php
index 22091cf..f188a65 100644
--- a/test 2 - menu.php	
+++ b/test 2 - menu.php	
@@ -1,30 +1,11 @@
 <?php
 	header("Access-Control-Allow-Origin: *");
 	header("Content-Type: application/json; charset=UTF-8");
+	require('includes/classes/class.content.php');
 	
 	//create the connection object
-	$conn = new mysqli("db545467511.db.1and1.com", "dbo545467511", "Rage2167_robert", "db545467511");
+	$conn = new Content("db545467511.db.1and1.com", "dbo545467511", "Rage2167_robert", "db545467511");
 	
 	//query the database and pull the results
 	//select everything from the information table
-	$results = $conn->query("SELECT * FROM pages ORDER BY position");
-	
-	$outp = "[";
-	
-	while ($rs = $results->fetch_array(MYSQLI_ASSOC)) {
-		if ($outp != "[") {
-				$outp .= ",";
-			}
-		$outp .= '{"ID":"' . htmlspecialchars_decode($rs["ID"], ENT_QUOTES) . '",';
-		$outp .= '"pageLinkName":"' . htmlspecialchars_decode($rs["pageLinkName"], ENT_QUOTES) . '",';
-		$outp .= '"linkUnderPage":"' . htmlspecialchars_decode($rs["linkUnderPage"], ENT_QUOTES) . '",';
-		$outp .= '"page":"' . htmlspecialchars_decode($rs["page"], ENT_QUOTES) . '",';
-		$outp .= '"pageMenu":"' . htmlspecialchars_decode($rs["pageMenu"], ENT_QUOTES) . '",';
-		$outp .= '"position":"' . htmlspecialchars($rs["position"], ENT_QUOTES) . '"}';
-	}
-	$outp .= "]";
-
-
-	
-	$conn->close();
-	echo $outp;
\ No newline at end of file
+	echo $results = $conn->content("SELECT * FROM pages ORDER BY position");