From cd6b3d92f0fd3411f5cc8a0a298c47d484384260 Mon Sep 17 00:00:00 2001
From: Sorrel Harriet <s.harriet@gold.ac.uk>
Date: Sun, 13 Nov 2016 19:56:59 +0000
Subject: [PATCH] changing name of content variable to match last week
---
lab-6/lecture-task/index_v1.php | 10 +++++-----
lab-6/lecture-task/index_v2.php | 4 ++--
lab-6/lecture-task/views/404.php | 4 ++--
lab-6/lecture-task/views/customers.php | 4 ++--
lab-6/lecture-task/views/home.php | 4 ++--
lab-6/lecture-task/views/orders.php | 4 ++--
6 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/lab-6/lecture-task/index_v1.php b/lab-6/lecture-task/index_v1.php
index e3538d0..d4461b5 100644
--- a/lab-6/lecture-task/index_v1.php
+++ b/lab-6/lecture-task/index_v1.php
@@ -5,16 +5,16 @@ $myvar = $_GET['id'];
} else {
$myvar = 'home';
}
-$html = "<!DOCTYPE html
+$content = "<!DOCTYPE html
<html>
<head>
<meta charset='utf-8'/>
<title>Music Store: $myvar</title>
</head>
<body>";
-$html .= "<nav><ul><a href='index_v1.php?id=home'>Home</a></li>";
-$html .= "<li><a href='index_v1.php?id=customers'>Customers</a></li>";
-$html .= "<li><a href='index_v1.php?id=orders'>Orders</a></li></ul></nav>";
+$content .= "<nav><ul><a href='index_v1.php?id=home'>Home</a></li>";
+$content .= "<li><a href='index_v1.php?id=customers'>Customers</a></li>";
+$content .= "<li><a href='index_v1.php?id=orders'>Orders</a></li></ul></nav>";
switch ($myvar) {
case 'home' : include 'views/home.php';
@@ -25,6 +25,6 @@ case 'orders' :
include 'views/orders.php' break;
default :
include 'views/404.php';}
-$html .= "</body></html>";echo$html;
+$content .= "</body></html>";echo$content;
?>
diff --git a/lab-6/lecture-task/index_v2.php b/lab-6/lecture-task/index_v2.php
index 708e971..0913c95 100644
--- a/lab-6/lecture-task/index_v2.php
+++ b/lab-6/lecture-task/index_v2.php
@@ -7,7 +7,7 @@ include('templates/header.html');
include('templates/nav.html');
// define variable for storing body HTML
-$html = "";
+$content = "";
// check if 'page' parameter is set in query string
if (isset($_GET['page'])) {
@@ -32,7 +32,7 @@ default :
}
// output body HTML
-echo $html;
+echo $content;
// include the footer HTML
include('templates/footer.html');
diff --git a/lab-6/lecture-task/views/404.php b/lab-6/lecture-task/views/404.php
index 79cc209..67dcdb0 100644
--- a/lab-6/lecture-task/views/404.php
+++ b/lab-6/lecture-task/views/404.php
@@ -1,6 +1,6 @@
<?php
-$html .= "<h1>Oops!</h1>";
-$html .= "<p>Sorry, the page you're looking for cannot be found.</p>";
+$content .= "<h1>Oops!</h1>";
+$content .= "<p>Sorry, the page you're looking for cannot be found.</p>";
?>
diff --git a/lab-6/lecture-task/views/customers.php b/lab-6/lecture-task/views/customers.php
index a0279ca..b04f1e2 100644
--- a/lab-6/lecture-task/views/customers.php
+++ b/lab-6/lecture-task/views/customers.php
@@ -1,6 +1,6 @@
<?php
-$html .= "<h1>Customers</h1>";
-$html .= "<p>Browse the app's customers here...maybe add/delete/edit customers too...whatever.</p>";
+$content .= "<h1>Customers</h1>";
+$content .= "<p>Browse the app's customers here...maybe add/delete/edit customers too...whatever.</p>";
?>
diff --git a/lab-6/lecture-task/views/home.php b/lab-6/lecture-task/views/home.php
index 3a06398..1164f12 100644
--- a/lab-6/lecture-task/views/home.php
+++ b/lab-6/lecture-task/views/home.php
@@ -1,6 +1,6 @@
<?php
-$html .= "<h1>Welcome to the Music Store</h1>";
-$html .= "<p>Some content here...</p>";
+$content .= "<h1>Welcome to the Music Store</h1>";
+$content .= "<p>Some content here...</p>";
?>
diff --git a/lab-6/lecture-task/views/orders.php b/lab-6/lecture-task/views/orders.php
index 79995dc..7fbb409 100644
--- a/lab-6/lecture-task/views/orders.php
+++ b/lab-6/lecture-task/views/orders.php
@@ -1,6 +1,6 @@
<?php
-$html .= "<h1>Orders</h1>";
-$html .= "<p>Browse the orders here...maybe add/delete/edit/mark dispatched...whatever.</p>";
+$content .= "<h1>Orders</h1>";
+$content .= "<p>Browse the orders here...maybe add/delete/edit/mark dispatched...whatever.</p>";
?>
--
GitLab