Merge pull request #9 from james-lsn/master

Clean up Includes and add PHP 5.3.2+ requirement to readme

README.markdown

@@ -13,7 +13,7 @@ This project is [Composer Enabled](http://getcomposer.org/).
 * Twitter OAuth (https://github.com/abraham/twitteroauth) available in your PHP include path
 
 
-To automatically fetch the prerequisites, run the command 
+To automatically fetch the prerequisites, you must have PHP 5.3.2+ and run the command 
 
 ```php -r "eval('?>'.file_get_contents('https://getcomposer.org/installer'));" && ./composer.phar install```
 

includes/authentication.class.php

@@ -65,6 +65,4 @@ function logout() {
 		$_SESSION = array();
 		return true;
 	}
-}
-
-?>
+}

includes/base.inc.php

@@ -1,6 +1,6 @@
 <?php
 
-include('config.php');
+require_once('config.php');
 
 require_once('../vendor/autoload.php');
 
@@ -13,5 +13,10 @@
 require_once('template.inc.php');
 require_once('status.class.php');
 require_once('facilities.class.php');
+require_once('twitter.class.php');
+require_once('authentication.class.php');
+require_once('users.class.php');
 
-?>
+if (!class_exists('Smarty')) {
+	require_once('smarty/Smarty.class.php');
+}

includes/config.php

@@ -25,5 +25,4 @@
 	'heading' => 'Get Support',
 	'text' => 'Having service issues? In the event that our ticketing system is offline we will monitor emails sent to <a href="mailto:[email protected]">[email protected]</a>. Please be advised that unless our ticketing system is inaccessable this mail box is not actively monitored and you should <a href="https://example.com/support/newticket.html" target="_blank">open a ticket</a> for support.'
 );
-$config['smarty_debug'] = false;
-?>
+$config['smarty_debug'] = false;

includes/database.class.php

@@ -109,6 +109,4 @@ function initialize() {
 			$this->sqlite->query("CREATE INDEX incidents_updates_incidents_id ON incidents_updates(incidents_id)");
 		}
 	}
-}
-
-?>
+}

includes/facilities.class.php

@@ -22,6 +22,4 @@ function getFacilities() {
 
 		return $row;
 	}
-}
-
-?>
+}

includes/status.class.php

@@ -52,7 +52,7 @@ function newIncident($data) {
 		}
 
 		if (!empty($data['twitter'])) {
-			require_once('twitter.class.php');
+
 			$twitter = new Twitter;
 			$twitter->tweet("{$twitter_prefix} {$data['title']}");
 
@@ -155,7 +155,7 @@ function newUpdate($data) {
 		$insert = $sql->execute();
 
 		if ($data['twitterpost']) {
-			require_once('twitter.class.php');
+
 			$twitter = new Twitter;
 			$twitter->tweet($data['message']);
 		}
@@ -276,6 +276,4 @@ function getSummary($facilities_id, $days, $shortdate = false) {
 		return $summary;
 	}
 
-}
-
-?>
+}

includes/template.inc.php

@@ -1,9 +1,5 @@
 <?php
 
-if (!class_exists('Smarty')) {
-	require_once('smarty/Smarty.class.php');
-}
-
 $smarty = new Smarty();
 
 $smarty->template_dir = "{$config['app_path']}/public/templates/{$config['template_name']}";
@@ -16,5 +12,4 @@
 $smarty->assign('footer_links', $config['footer_links']);
 $smarty->assign('textarea', $config['textarea']);
 
-if ($config['smarty_debug']) $smarty->debugging = true;
-?>
+if ($config['smarty_debug']) $smarty->debugging = true;

includes/twitter.class.php

@@ -52,6 +52,4 @@ private function prepareMessage($message, $limit = 137) {
 
 		return $message;
 	}
-}
-
-?>
+}

includes/users.class.php

@@ -76,5 +76,4 @@ private function userExistsByUsername($name) {
 		$result = (empty($users)) ? false : true;
 		return $result;
 	}
-}
-?>
+}

public/index.php

@@ -1,5 +1,5 @@
 <?php
-	include('../includes/base.inc.php');
+	require_once('../includes/base.inc.php');
 
 	if (!empty($_SESSION['auth']['id'])) {
 		if (!empty($_POST)) {
@@ -49,5 +49,4 @@
 
 	$smarty->display('_header.tpl');
 	$smarty->display('index.tpl');
-	$smarty->display('_footer.tpl');
-?>
+	$smarty->display('_footer.tpl');

public/login.php

@@ -1,6 +1,6 @@
 <?php
-	include('../includes/base.inc.php');
-	include('../includes/authentication.class.php');
+	require_once('../includes/base.inc.php');
+
 	$auth = new Authentication;
 
 	if (isset($_POST['username'], $_POST['password'])) {
@@ -12,5 +12,4 @@
 
 	$smarty->display('_header.tpl');
 	$smarty->display('login.tpl');
-	$smarty->display('_footer.tpl');
-?>
+	$smarty->display('_footer.tpl');

public/logout.php

@@ -1,8 +1,7 @@
 <?php
-	include('../includes/base.inc.php');
-	include('../includes/authentication.class.php');
+	require_once('../includes/base.inc.php');
+
 	$auth = new Authentication;
 
 	$auth->logout();
-	header('Location: index.php');
-?>
+	header('Location: index.php');

public/save.php

@@ -1,6 +1,5 @@
 <?php
 require_once('../includes/base.inc.php');
-require_once('../includes/status.class.php');
 
 	if (!empty($_SESSION['auth']['id'])) {
 		if (isset($_POST)) {
@@ -35,5 +34,4 @@
 
 			}
 		}
-	}
-?>
+	}

public/users.php

@@ -1,7 +1,6 @@
 <?php
-	include('../includes/base.inc.php');
-	include('../includes/users.class.php');
-	include('../includes/authentication.class.php');
+	require_once('../includes/base.inc.php');
+
 	$auth = new Authentication;
 	$users = new Users;
 
@@ -43,5 +42,4 @@
 
 	$smarty->display('_header.tpl');
 	$smarty->display('users.tpl');
-	$smarty->display('_footer.tpl');
-?>
+	$smarty->display('_footer.tpl');