From 1cd7f50e1b5137af7f4b07833c3a02639b04bd3f Mon Sep 17 00:00:00 2001
From: Kyle Johnson <kjohnson@gnulnx.net>
Date: Mon, 12 Jan 2015 23:24:50 -0500
Subject: [PATCH] Significantly cleaned up Bootstrap functions.php

Got rid of all unnecessary php and variables.
---
 web/skins/bootstrap/includes/functions.php | 138 +++------------------
 1 file changed, 16 insertions(+), 122 deletions(-)
diff --git a/web/skins/bootstrap/includes/functions.php b/web/skins/bootstrap/includes/functions.php
index bfecf4dcb..91c82fcab 100644
--- a/web/skins/bootstrap/includes/functions.php
+++ b/web/skins/bootstrap/includes/functions.php
@@ -1,131 +1,25 @@
-<?php
-//
-// ZoneMinder web function library, $Date: 2008-07-08 16:06:45 +0100 (Tue, 08 Jul 2008) $, $Revision: 2484 $
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-function xhtmlHeaders( $file, $title )
-{
-    $skinCssFile = getSkinFile( 'css/skin.css' );
-    $skinCssPhpFile = getSkinFile( 'css/skin.css.php' );
-    $skinJsFile = getSkinFile( 'js/skin.js' );
-    $skinJsPhpFile = getSkinFile( 'js/skin.js.php' );
-		$jqueryJsFile = getSkinFile( 'js/jquery-2.1.1.min.js');
-    $statePhpFile = getSkinFile( 'views/js/state.js.php' );
-		$stateJsFile = getSkinFile( 'views/js/state.js');
-		$bootstrapCssFile = getSkinFile( 'css/bootstrap.css' );
-		$bootstrapJsFile = getSkinFile( 'js/bootstrap.min.js' );
-		$ChartJsFile = getSkinFile( 'js/Chart.min.js' );
-		$tcangularchartjsFile = getSkinFile( 'js/tc-angular-chartjs.min.js' );
-		$uibootstrapJsFile = getSkinFile( 'js/ui-bootstrap-tpls-0.12.0.min.js' );
-    $basename = basename( $file, '.php' );
-    $viewCssFile = getSkinFile( 'views/css/'.$basename.'.css' );
-    $viewCssPhpFile = getSkinFile( 'views/css/'.$basename.'.css.php' );
-    $viewJsFile = getSkinFile( 'views/js/'.$basename.'.js' );
-    $viewJsPhpFile = getSkinFile( 'views/js/'.$basename.'.js.php' );
-    $dirPagination = getSkinFile( 'js/dirPagination.js' );
-
-    extract( $GLOBALS, EXTR_OVERWRITE );
-?>
+<?php function xhtmlHeaders( $file, $title ) {
+	extract( $GLOBALS, EXTR_OVERWRITE );
+} ?>
 <!DOCTYPE html>
 <html lang="en" ng-app="ZoneMinder">
 <head>
-  <title><?= ZM_WEB_TITLE_PREFIX ?> - <?= validHtmlStr($title) ?></title>
+	<title><?= ZM_WEB_TITLE_PREFIX ?> - <?= validHtmlStr($title) ?></title>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<base href="/">
-  <link rel="icon" type="image/ico" href="graphics/favicon.ico"/>
-  <link rel="shortcut icon" href="graphics/favicon.ico"/>
-  <link rel="stylesheet" href="css/reset.css" type="text/css"/>
-  <link rel="stylesheet" href="css/overlay.css" type="text/css"/>
-  <link rel="stylesheet" href="<?= $bootstrapCssFile ?>" type="text/css" media="screen"/>
-  <link rel="stylesheet" href="<?= $skinCssFile ?>" type="text/css" media="screen"/>
-<?php
-    if ( $viewCssFile )
-    {
-?>
-  <link rel="stylesheet" href="<?= $viewCssFile ?>" type="text/css" media="screen"/>
-<?php
-    }
-    if ( $viewCssPhpFile )
-    {
-?>
-  <style type="text/css">
-  /*<![CDATA[*/
-<?php
-        require_once( $viewCssPhpFile );
-?>
-  /*]]>*/
-  </style>
-<?php
-    }
-?>
+	<link rel="icon" type="image/ico" href="graphics/favicon.ico"/>
+	<link rel="shortcut icon" href="graphics/favicon.ico"/>
+	<link rel="stylesheet" href="skins/bootstrap/css/bootstrap.css" type="text/css" />
+	<link rel="stylesheet" href="skins/bootstrap/css/skin.css" type="text/css" />
 	<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.3.8/angular.min.js"></script>
-	<script src="<?= $dirPagination ?>"></script>
-  <script type="text/javascript" src="<?= $ChartJsFile ?>"></script>
-	<script src="<?= getSkinFile('js/app.js'); ?>"></script>
-	<script src="<?= getSkinFile('js/controllers.js'); ?>"></script>
-  <script type="text/javascript" src="<?= $tcangularchartjsFile ?>"></script>
-  <script type="text/javascript" src="<?= $uibootstrapJsFile ?>"></script>
-  <script type="text/javascript" src="<?= $jqueryJsFile ?>"></script>
-  <script type="text/javascript" src="<?= $bootstrapJsFile ?>"></script>
-<?php
-    if ( $skinJsPhpFile )
-    {
-?>
-  <script type="text/javascript">
-  //<![CDATA[
-  <!--
-<?php
-    require_once( $skinJsPhpFile );
-    require_once( $statePhpFile );
-?>
-  //-->
-  //]]>
-  </script>
-<?php
-    }
-    if ( $viewJsPhpFile )
-    {
-?>
-  <script type="text/javascript">
-  //<![CDATA[
-  <!--
-<?php
-        require_once( $viewJsPhpFile );
-?>
-  //-->
-  //]]>
-  </script>
-<?php
-    }
-?>
-  <script type="text/javascript" src="<?= $skinJsFile ?>"></script>
-<?php
-    if ( $viewJsFile )
-    {
-?>
-  <script type="text/javascript" src="<?= $viewJsFile ?>"></script>
-<?php
-    }
-?>
-  <script type="text/javascript" src="<?= $stateJsFile ?>"></script>
+	<script src="skins/bootstrap/js/dirPagination.js"></script>
+	<script type="text/javascript" src="skins/bootstrap/js/Chart.min.js"></script>
+	<script src="skins/bootstrap/js/app.js"></script>
+	<script src="skins/bootstrap/js/controllers.js"></script>
+	<script type="text/javascript" src="skins/bootstrap/js/tc-angular-chartjs.min.js"></script>
+	<script type="text/javascript" src="skins/bootstrap/js/ui-bootstrap-tpls-0.12.0.min.js"></script>
+	<script type="text/javascript" src="skins/bootstrap/js/jquery-2.1.1.min.js"></script>
+	<script type="text/javascript" src="skins/bootstrap/js/bootstrap.min.js"></script>
 </head>
-<?php
-}
-?>
