Backporting retarded amount of changes outside of version control

3 files changed, 253 insertions, 244 deletions

diff --git a/admin/newsreel/functions.php b/admin/newsreel/functions.php
index 6bde17c..f8cb759 100644
--- a/admin/newsreel/functions.php
+++ b/admin/newsreel/functions.php
@@ -1,160 +1,160 @@
-<style> 

-

-ul {

-	margin: 0;

-}

- 

-#contentLeft {

-	width: 400px;

-}

- 

-#contentLeft li {

-	list-style: none;

-	margin: 0 0 4px 0;

-	padding: 10px;

-	background-color:#a1a1a1;

-	border: #CCCCCC solid 1px;

-	color:#fff;

-	text-align:center;

-	cursor:move;

-}

-

-</style>

-<script type="text/javascript" src="scripts/jquery-ui-1.7.1.custom.min.js"></script>

-<script type="text/javascript">

-$(document).ready(function(){ 

-						   

-	$(function() {

-		

-		$("#contentLeft ul").sortable({ opacity: 0.6, cursor: 'move', update: function() {

-			var order = $(this).sortable("serialize") + '&action=updateReelOrder'; 

-			$.post("newsreel/updateDB.php", order, function(theResponse){

-				 $("#updateStatus").html(theResponse);

-			}); 															 

-		}								  

-		});

-	});

- 

-});	

-</script> 

-<?php

-/**

- * Bayonet Content Management System

- * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell

- *

- * 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 3 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, see <http://www.gnu.org/licenses/>.

- */

- 

- define(MAX_SLIDES, 6);

- 

-  function EditOrder(){

- 	

-	 global $db;

-	 ?>

-	 	 <div id="contentLeft">

-	 		<table> 

-	 			<tr>

-				 	<th>News Reel Order</th>

-			 		<td id="updateStatus"></td>

-			 	</tr>

-		 	</table>

-			<ul>

-	 <?php

-	 $result = $db->Query("SELECT `title`, `slide_id`, `src` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` ASC");

-	 $row = $db->Fetch($result);

-	 

-	 foreach($row as $slide){

- 		echo "<li id=\"recordsArray_{$slide['slide_id']}\">";

-		 PrintSlide($slide);

-	 	echo "<br /><a href=\"?op=newsreel&disable={$slide['slide_id']}\"><input type=\"button\" value=\"Disable\" /></a></li>";		 

-	 }	 

-?>	 

-		  </ul>

-		  Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved.

-	 	</div> 

-<?php

- }

- 

- function EnableSlide($slide_id){

- 	

-	 global $db;

-	 $lastspot = GetLastPosition();

-	 if($lastspot >= MAX_SLIDES){

-	 	ReportError("There are already 6 active slides. You must disable one in order to enable another.");

-	 	PageRedirect(3,"?op=newsreel");

-		return;	 

-	 }

-	 $weight = $lastspot+1;

-	 $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 1, `weight` = '$weight' WHERE `slide_id` = '$slide_id' LIMIT 1");

-	 PageRedirect(0,"?op=newsreel");

- }

- 

- function DisableSlide($slide_id){

- 	

-	 global $db;

-	 $result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `slide_id` = '$slide_id' LIMIT 1");

-	 $slide = $db->FetchRow($result);

-

-	 $oldWeight = $slide['weight'];

-	 

-	 if($oldWeight < MAX_SLIDES){

-		$total = getNumOfActive(); 

-		for($i=$oldWeight+1; $i<=$total; $i++){

-			//echo "Change Weight:".$i." to ".($i-1)."<br />";

-			$new = $i-1;

-			$db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$new' WHERE `weight` = '$i' LIMIT 1");	

-		} 		  		  		  		 

-	 }	 	 	 	 

-

-	 $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 0, `weight` = 0 WHERE `slide_id` = '$slide_id' LIMIT 1");

-	 PageRedirect(0,"?op=newsreel");

- }

- 

- function ListInactive(){

- 	

-	 global $db;

-	 echo "<h3>Disabled Slides</h3>";

-	 $result = $db->Query("SELECT `slide_id`, `title`, `src` FROM `bayonet_newsreel` WHERE `visible` = 0 ORDER BY `slide_id` DESC");

-	 $row = $db->Fetch($result);

-	 

-	 foreach($row as $slide){

-	 	echo PrintSlide($slide);

-		echo "<br /><a href=\"?op=newsreel&enable={$slide['slide_id']}\"><input type=\"button\" value=\"Enable\" /></a><br /><br />";	

-	 }

- }

- 

- function PrintSlide($slide){

-	echo "{$slide['title']}";

-	if(file_exists("../modules/newsreel/slides/{$slide['src']}") && $slide['src'] != ""){

-	  echo "<br /><img src=\"../modules/newsreel/slides/{$slide['src']}\" width=\"100px\" />";

- 	}

- }

- 

- function GetLastPosition(){

- 	

-	global $db;

-	$result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` DESC LIMIT 1");

-	$row = $db->FetchRow($result);

-	

- 	return $row['weight'];

- }

- 

- function getNumOfActive(){

- 	global $db;

-	$result = $db->Query("SELECT `slide_id` FROM `bayonet_newsreel` WHERE `visible` = 1");

-	return $db->Rows($result); 

- }

-		

-

+<style> 
+
+ul {
+	margin: 0;
+}
+ 
+#contentLeft {
+	width: 400px;
+}
+ 
+#contentLeft li {
+	list-style: none;
+	margin: 0 0 4px 0;
+	padding: 10px;
+	background-color:#a1a1a1;
+	border: #CCCCCC solid 1px;
+	color:#fff;
+	text-align:center;
+	cursor:move;
+}
+
+</style>
+<script type="text/javascript" src="scripts/jquery-ui-1.7.1.custom.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function(){ 
+						   
+	$(function() {
+		
+		$("#contentLeft ul").sortable({ opacity: 0.6, cursor: 'move', update: function() {
+			var order = $(this).sortable("serialize") + '&action=updateReelOrder'; 
+			$.post("newsreel/updateDB.php", order, function(theResponse){
+				 $("#updateStatus").html(theResponse);
+			}); 															 
+		}								  
+		});
+	});
+ 
+});	
+</script> 
+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+ 
+ define(MAX_SLIDES, 6);
+ 
+  function EditOrder(){
+ 	
+	 global $db;
+	 ?>
+	 	 <div id="contentLeft">
+	 		<table> 
+	 			<tr>
+				 	<th>News Reel Order</th>
+			 		<td id="updateStatus"></td>
+			 	</tr>
+		 	</table>
+			<ul>
+	 <?php
+	 $result = $db->Query("SELECT `title`, `slide_id`, `src` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` ASC");
+	 $row = $db->Fetch($result);
+	 
+	 foreach($row as $slide){
+ 		echo "<li id=\"recordsArray_{$slide['slide_id']}\">";
+		 PrintSlide($slide);
+	 	echo "<br /><a href=\"?op=newsreel&disable={$slide['slide_id']}\"><input type=\"button\" value=\"Disable\" /></a></li>";		 
+	 }	 
+?>	 
+		  </ul>
+		  Click and drag on a slide to change the order. Wait for confirmation indicating the changes have been saved.
+	 	</div> 
+<?php
+ }
+ 
+ function EnableSlide($slide_id){
+ 	
+	 global $db;
+	 $lastspot = GetLastPosition();
+	 if($lastspot >= MAX_SLIDES){
+	 	ReportError("There are already 6 active slides. You must disable one in order to enable another.");
+	 	PageRedirect(3,"?op=newsreel");
+		return;	 
+	 }
+	 $weight = $lastspot+1;
+	 $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 1, `weight` = '$weight' WHERE `slide_id` = '$slide_id' LIMIT 1");
+	 PageRedirect(0,"?op=newsreel");
+ }
+ 
+ function DisableSlide($slide_id){
+ 	
+	 global $db;
+	 $result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `slide_id` = '$slide_id' LIMIT 1");
+	 $slide = $db->FetchRow($result);
+
+	 $oldWeight = $slide['weight'];
+	 
+	 if($oldWeight < MAX_SLIDES){
+		$total = getNumOfActive(); 
+		for($i=$oldWeight+1; $i<=$total; $i++){
+			//echo "Change Weight:".$i." to ".($i-1)."<br />";
+			$new = $i-1;
+			$db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$new' WHERE `weight` = '$i' LIMIT 1");	
+		} 		  		  		  		 
+	 }	 	 	 	 
+
+	 $db->Query("UPDATE `bayonet_newsreel` SET `visible` = 0, `weight` = 0 WHERE `slide_id` = '$slide_id' LIMIT 1");
+	 PageRedirect(0,"?op=newsreel");
+ }
+ 
+ function ListInactive(){
+ 	
+	 global $db;
+	 echo "<h3>Disabled Slides</h3>";
+	 $result = $db->Query("SELECT `slide_id`, `title`, `src` FROM `bayonet_newsreel` WHERE `visible` = 0 ORDER BY `slide_id` DESC");
+	 $row = $db->Fetch($result);
+	 
+	 foreach($row as $slide){
+	 	echo PrintSlide($slide);
+		echo "<br /><a href=\"?op=newsreel&enable={$slide['slide_id']}\"><input type=\"button\" value=\"Enable\" /></a><br /><br />";	
+	 }
+ }
+ 
+ function PrintSlide($slide){
+	echo "{$slide['title']}";
+	if(file_exists("../modules/newsreel/slides/{$slide['src']}") && $slide['src'] != ""){
+	  echo "<br /><img src=\"../modules/newsreel/slides/{$slide['src']}\" width=\"100px\" />";
+ 	}
+ }
+ 
+ function GetLastPosition(){
+ 	
+	global $db;
+	$result = $db->Query("SELECT `weight` FROM `bayonet_newsreel` WHERE `visible` = 1 ORDER BY `weight` DESC LIMIT 1");
+	$row = $db->FetchRow($result);
+	
+ 	return $row['weight'];
+ }
+ 
+ function getNumOfActive(){
+ 	global $db;
+	$result = $db->Query("SELECT `slide_id` FROM `bayonet_newsreel` WHERE `visible` = 1");
+	return $db->Rows($result); 
+ }
+		
+
 ?>
\ No newline at end of file
diff --git a/admin/newsreel/index.php b/admin/newsreel/index.php
index 0b97deb..18a239d 100644
--- a/admin/newsreel/index.php
+++ b/admin/newsreel/index.php
@@ -1,46 +1,46 @@
-<?php

-/**

- * Bayonet Content Management System

- * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell

- *

- * 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 3 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, see <http://www.gnu.org/licenses/>.

- */

- 

-if(!defined("ADMIN_FILE"))

-{

-  die("Access denied.");

-}

-

-include $basedir.'newsreel/functions.php';

-?>

- <div style="text-align:left;"><h2>- Manage News Reel</h2></div>

- -Add/Edit/Delete needs to be completed.

-	<table class="panel" width="100%">

-		<tr>

-			<td class="panel"><?php EditOrder(); ?></td>

-			<td class="panel-box" width="50%">

-			<?php

-				if(isset($_GET['enable'])){

-					$slide_id = $_GET['enable'];

-					EnableSlide($slide_id);

-				}else if(isset($_GET['disable'])){

-					$slide_id = $_GET['disable'];

-					DisableSlide($slide_id);				

-				}else{

-					ListInactive();				

-				}

-			?>

-			</td>

-		</tr>

-	</table>

+<?php
+/**
+ * Bayonet Content Management System
+ * Copyright (C) 2008  Joseph Hunkeler & Evan O'Connell
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ */
+ 
+if(!defined("ADMIN_FILE"))
+{
+  die("Access denied.");
+}
+
+include $basedir.'newsreel/functions.php';
+?>
+ <div style="text-align:left;"><h2>- Manage News Reel</h2></div>
+ -Add/Edit/Delete needs to be completed.
+	<table class="panel" width="100%">
+		<tr>
+			<td class="panel"><?php EditOrder(); ?></td>
+			<td class="panel-box" width="50%">
+			<?php
+				if(isset($_GET['enable'])){
+					$slide_id = $_GET['enable'];
+					EnableSlide($slide_id);
+				}else if(isset($_GET['disable'])){
+					$slide_id = $_GET['disable'];
+					DisableSlide($slide_id);				
+				}else{
+					ListInactive();				
+				}
+			?>
+			</td>
+		</tr>
+	</table>
diff --git a/admin/newsreel/updateDB.php b/admin/newsreel/updateDB.php
index f4031a2..cd1a311 100644
--- a/admin/newsreel/updateDB.php
+++ b/admin/newsreel/updateDB.php
@@ -1,40 +1,49 @@
-<?php

-

-include '../../includes/debug.php';

-include '../../includes/config.php'; 

-include '../../includes/sql.class.php';

-include '../../includes/functions.php';

-

-$action = $_POST['action'];

-$updateRecordsArray = $_POST['recordsArray'];

-

-$db = new Bayonet_SQL();

-$db->Connect(

-  $config['sql']['hostname'],

-  $config['sql']['username'],

-  $config['sql']['password']

-  );

-$db->Select_db($config['sql']['database']);

-

-if ($action == "updateReelOrder"){

-

-	$listingCounter = 1;

-	foreach ($updateRecordsArray as $recordIDValue) {

-	

-		$db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$listingCounter' WHERE `slide_id` = '$recordIDValue'");

-		$listingCounter = $listingCounter + 1;

-	}

-	echo "<img src=\"images/accepted.png\" />";

-/*

-	echo '<pre>';

-	print_r($updateRecordsArray);

-	echo '</pre>';

-	echo 'If you refresh the page, you will see that records will stay just as you modified.';

-*/

-}

-else{

-	echo "<img src=\"images/rejected.png\" />";

-}

-date_default_timezone_set("America/New_York");

-echo " Updated at ".date("g:i:s a", time());

+<?php
+
+//basename(dirname('.'))
+$dirname = "/home/thirdid/3rd-infantry-division.org";
+
+define('BAYONET_ROOT', $dirname);
+define('BAYONET_INCLUDE', BAYONET_ROOT . '/include');
+define('BAYONET_CONFIG', BAYONET_ROOT . '/include/config.ini');
+
+require BAYONET_INCLUDE . '/debug.php';
+require BAYONET_INCLUDE . '/sql.class.php';
+require BAYONET_INCLUDE . '/functions.php';
+
+Bayonet_Config::init();
+$config = Bayonet_Config::$ini;
+$db = new Bayonet_SQL();
+
+
+//Connect to the MySQL server
+$db->Connect($config['sql']['hostname'], $config['sql']['username'], $config['sql']['password']);
+$db->Select_db($config['sql']['database']);
+
+/*----------------------------- */
+
+$action = $_POST['action'];
+$updateRecordsArray = $_POST['recordsArray'];
+
+if ($action == "updateReelOrder"){
+
+	$listingCounter = 1;
+	foreach ($updateRecordsArray as $recordIDValue) {
+	
+		$db->Query("UPDATE `bayonet_newsreel` SET `weight` = '$listingCounter' WHERE `slide_id` = '$recordIDValue'");
+		$listingCounter = $listingCounter + 1;
+	}
+	echo "<img src=\"images/accepted.png\" />";
+/*
+	echo '<pre>';
+	print_r($updateRecordsArray);
+	echo '</pre>';
+	echo 'If you refresh the page, you will see that records will stay just as you modified.';
+*/
+}
+else{
+	echo "<img src=\"images/rejected.png\" />";
+}
+date_default_timezone_set("America/New_York");
+echo " Updated at ".date("g:i:s a", time());
 ?>
\ No newline at end of file