From 7ec4c7998d4ae7f29896e4d3250b125be400561e Mon Sep 17 00:00:00 2001
From: RedDragonWebDesign <admiraladama99@gmail.com>
Date: Tue, 23 Jan 2024 00:33:07 -0800
Subject: [PATCH] fix indenting

---
 src/members/include/polls/createpoll.php      | 426 +++++++++---------
 .../include/polls/include/addoption.php       | 190 ++++----
 2 files changed, 311 insertions(+), 305 deletions(-)

diff --git a/src/members/include/polls/createpoll.php b/src/members/include/polls/createpoll.php
index e1f1a9d7..424776e2 100644
--- a/src/members/include/polls/createpoll.php
+++ b/src/members/include/polls/createpoll.php
@@ -1,124 +1,124 @@
 <?php
 
-	/*
-	 * BlueThrust Clan Scripts
-	 * Copyright 2014
-	 *
-	 * Author: Bluethrust Web Development
-	 * E-mail: support@bluethrust.com
-	 * Website: http://www.bluethrust.com
-	 *
-	 * License: http://www.bluethrust.com/license.php
-	 *
-	 */
-
-	if (!isset($member) || substr($_SERVER['PHP_SELF'], -11) != "console.php") {
+/*
+ * BlueThrust Clan Scripts
+ * Copyright 2014
+ *
+ * Author: Bluethrust Web Development
+ * E-mail: support@bluethrust.com
+ * Website: http://www.bluethrust.com
+ *
+ * License: http://www.bluethrust.com/license.php
+ *
+ */
+
+if (!isset($member) || substr($_SERVER['PHP_SELF'], -11) != "console.php") {
+	exit();
+} else {
+	$memberInfo = $member->get_info();
+	$consoleObj->select($_GET['cID']);
+	if (!$member->hasAccess($consoleObj)) {
 		exit();
-	} else {
-		$memberInfo = $member->get_info();
-		$consoleObj->select($_GET['cID']);
-		if (!$member->hasAccess($consoleObj)) {
-			exit();
-		}
 	}
+}
 
-	require_once("../classes/access.php");
-	require_once("../classes/poll.php");
+require_once("../classes/access.php");
+require_once("../classes/poll.php");
 
-	$cID = $_GET['cID'];
+$cID = $_GET['cID'];
 
-	$dispError = "";
-	$countErrors = 0;
+$dispError = "";
+$countErrors = 0;
 
 
-	$pollObj = new Poll($mysqli);
-	$accessObj = $pollObj->objAccess;
+$pollObj = new Poll($mysqli);
+$accessObj = $pollObj->objAccess;
 
 
-	if (isset($_POST['accessCacheID'])) {
-		$accessObj->cacheID = $_POST['accessCacheID'];
-	}
+if (isset($_POST['accessCacheID'])) {
+	$accessObj->cacheID = $_POST['accessCacheID'];
+}
 
-	$_SESSION['btAccessCacheTables'][$accessObj->cacheID] = json_encode($accessObj->arrAccessTables);
-	$_SESSION['btAccessCacheTypes'][$accessObj->cacheID] = json_encode($accessObj->arrAccessTypes);
+$_SESSION['btAccessCacheTables'][$accessObj->cacheID] = json_encode($accessObj->arrAccessTables);
+$_SESSION['btAccessCacheTypes'][$accessObj->cacheID] = json_encode($accessObj->arrAccessTypes);
 
-	$arrPostSelected = array();
+$arrPostSelected = array();
 
-	if (!empty($_POST['submit'])) {
+if (!empty($_POST['submit'])) {
 
-		// Check Question
-		if (trim($_POST['pollquestion']) == "") {
-			$countErrors++;
-			$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> Your poll question may not be blank.<br>";
-		}
-
-		// Check Access Types
-		$arrCheckAccessTypes = array("members", "memberslimited", "public");
-		if (!in_array($_POST['accesstype'], $arrCheckAccessTypes)) {
-			$countErrors++;
-			$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid access type.<br>";
-		}
+	// Check Question
+	if (trim($_POST['pollquestion']) == "") {
+		$countErrors++;
+		$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> Your poll question may not be blank.<br>";
+	}
 
+	// Check Access Types
+	$arrCheckAccessTypes = array("members", "memberslimited", "public");
+	if (!in_array($_POST['accesstype'], $arrCheckAccessTypes)) {
+		$countErrors++;
+		$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid access type.<br>";
+	}
 
-		// Check Result Visibility
-		$arrCheckVisTypes = array("open", "votedonly", "pollend", "never");
-		if (!in_array($_POST['resultvisibility'], $arrCheckVisTypes)) {
-			$countErrors++;
-			$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid result visibility type.<br>";
-		}
 
-		// Check Max Votes
+	// Check Result Visibility
+	$arrCheckVisTypes = array("open", "votedonly", "pollend", "never");
+	if (!in_array($_POST['resultvisibility'], $arrCheckVisTypes)) {
+		$countErrors++;
+		$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid result visibility type.<br>";
+	}
 
-		if ($_POST['maxvotes'] != "" && (!is_numeric($_POST['maxvotes']) || $_POST['maxvotes'] < 0)) {
-			$countErrors++;
-			$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> Max votes per user must be a value greater than zero.<br>";
-		}
+	// Check Max Votes
 
-		// Check Poll End
+	if ($_POST['maxvotes'] != "" && (!is_numeric($_POST['maxvotes']) || $_POST['maxvotes'] < 0)) {
+		$countErrors++;
+		$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> Max votes per user must be a value greater than zero.<br>";
+	}
 
-		if ($_POST['enddate'] != "forever" && $_POST['enddate'] != "choose") {
-			$countErrors++;
-			$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid poll end date.<br>";
-		} elseif ($_POST['enddate'] == "choose" && (!is_numeric($_POST['realenddate']) || $_POST['realenddate'] <= 0)) {
-			$countErrors++;
-			$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid poll end date.<br>";
-		}
+	// Check Poll End
 
+	if ($_POST['enddate'] != "forever" && $_POST['enddate'] != "choose") {
+		$countErrors++;
+		$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid poll end date.<br>";
+	} elseif ($_POST['enddate'] == "choose" && (!is_numeric($_POST['realenddate']) || $_POST['realenddate'] <= 0)) {
+		$countErrors++;
+		$dispError .= "&nbsp&nbsp;&nbsp;<b>&middot;</b> You selected an invalid poll end date.<br>";
+	}
 
-		if ($countErrors == 0) {
 
-			$setEndDate = 0;
-			if ($_POST['enddate'] == "choose") {
-				$setEndDate = $_POST['realenddate'] / 1000;
-				$tempYear = date("Y", $setEndDate);
-				$tempMonth = date("n", $setEndDate);
-				$tempDay = date("j", $setEndDate);
-				$tempHour = $_POST['endhour'];
-				if ($_POST['endAMPM'] == "PM") {
-					$tempHour += 12;
-				}
+	if ($countErrors == 0) {
 
-				$setEndDate = mktime($tempHour, $_POST['endminute'], 0, $tempMonth, $tempDay, $tempYear);
+		$setEndDate = 0;
+		if ($_POST['enddate'] == "choose") {
+			$setEndDate = $_POST['realenddate'] / 1000;
+			$tempYear = date("Y", $setEndDate);
+			$tempMonth = date("n", $setEndDate);
+			$tempDay = date("j", $setEndDate);
+			$tempHour = $_POST['endhour'];
+			if ($_POST['endAMPM'] == "PM") {
+				$tempHour += 12;
 			}
 
+			$setEndDate = mktime($tempHour, $_POST['endminute'], 0, $tempMonth, $tempDay, $tempYear);
+		}
+
 
-			$_POST['multivote'] = ($_POST['multivote'] != 1) ? 0 : 1;
-			$_POST['displayvoters'] = ($_POST['displayvoters'] != 1) ? 0 : 1;
+		$_POST['multivote'] = ($_POST['multivote'] != 1) ? 0 : 1;
+		$_POST['displayvoters'] = ($_POST['displayvoters'] != 1) ? 0 : 1;
 
-			$arrColumns = array("member_id", "question", "accesstype", "multivote", "displayvoters", "resultvisibility", "maxvotes", "pollend", "dateposted");
-			$arrValues = array($memberInfo['member_id'], $_POST['pollquestion'], $_POST['accesstype'], $_POST['multivote'], $_POST['displayvoters'], $_POST['resultvisibility'], $_POST['maxvotes'], $setEndDate, time());
+		$arrColumns = array("member_id", "question", "accesstype", "multivote", "displayvoters", "resultvisibility", "maxvotes", "pollend", "dateposted");
+		$arrValues = array($memberInfo['member_id'], $_POST['pollquestion'], $_POST['accesstype'], $_POST['multivote'], $_POST['displayvoters'], $_POST['resultvisibility'], $_POST['maxvotes'], $setEndDate, time());
 
-			if ($pollObj->addNew($arrColumns, $arrValues)) {
-				$pollObj->cacheID = $_POST['pollCacheID'];
-				$pollObj->savePollOptions();
+		if ($pollObj->addNew($arrColumns, $arrValues)) {
+			$pollObj->cacheID = $_POST['pollCacheID'];
+			$pollObj->savePollOptions();
 
-				if ($_POST['accesstype'] == "memberslimited") {
-					$accessObj->cacheID = $_POST['accessCacheID'];
-					$accessObj->arrAccessFor = array("keyName" => "poll_id", "keyValue" => $pollObj->get_info("poll_id"));
-					$accessObj->saveAccess();
-				}
+			if ($_POST['accesstype'] == "memberslimited") {
+				$accessObj->cacheID = $_POST['accessCacheID'];
+				$accessObj->arrAccessFor = array("keyName" => "poll_id", "keyValue" => $pollObj->get_info("poll_id"));
+				$accessObj->saveAccess();
+			}
 
-				echo "
+			echo "
 				<div style='display: none' id='successBox'>
 					<p align='center'>
 						Successfully created a new poll!
@@ -130,153 +130,153 @@
 				</script>			
 			";
 
-			} else {
-				$countErrors++;
-				$dispError .= "&nbsp;&nbsp;&nbsp;<b>&middot;</b> Unable to save information to the database.  Please contact the website administrator.<br>";
-			}
+		} else {
+			$countErrors++;
+			$dispError .= "&nbsp;&nbsp;&nbsp;<b>&middot;</b> Unable to save information to the database.  Please contact the website administrator.<br>";
 		}
+	}
 
 
-		if ($countErrors > 0) {
-
-			$_POST = filterArray($_POST);
-			$_POST['submit'] = false;
-
-			$arrPostSelected['accesstype']['limited'] = ($_POST['accesstype'] == "memberslimited") ? " selected" : "";
-			$arrPostSelected['accesstype']['public'] = ($_POST['accesstype'] == "public") ? " selected" : "";
+	if ($countErrors > 0) {
 
-			$arrPostSelected['multivote'] = (isset($_POST['multivote']) && $_POST['multivote'] == 1) ? " checked" : "";
-			$arrPostSelected['displayvoters'] = (isset($_POST['displayvoters']) && $_POST['displayvoters'] == 1) ? " checked" : "";
+		$_POST = filterArray($_POST);
+		$_POST['submit'] = false;
 
-			$arrPostSelected['resultvisibility']['votedonly'] = ($_POST['resultvisibility'] == "votedonly") ? " selected" : "";
-			$arrPostSelected['resultvisibility']['pollend'] = ($_POST['resultvisibility'] == "pollend") ? " selected" : "";
-			$arrPostSelected['resultvisibility']['never'] = ($_POST['resultvisibility'] == "never") ? " selected" : "";
+		$arrPostSelected['accesstype']['limited'] = ($_POST['accesstype'] == "memberslimited") ? " selected" : "";
+		$arrPostSelected['accesstype']['public'] = ($_POST['accesstype'] == "public") ? " selected" : "";
 
-			$arrPostSelected['pollend']['choose'] = ($_POST['enddate'] == "choose") ? " selected" : "";
-			$arrPostSelected['pollend']['forever'] = ($_POST['enddate'] == "forever") ? " selected" : "";
+		$arrPostSelected['multivote'] = (isset($_POST['multivote']) && $_POST['multivote'] == 1) ? " checked" : "";
+		$arrPostSelected['displayvoters'] = (isset($_POST['displayvoters']) && $_POST['displayvoters'] == 1) ? " checked" : "";
 
-			$arrPostSelected['endAMPM'] = ($_POST['endAMPM'] == "PM") ? " selected" : "";
+		$arrPostSelected['resultvisibility']['votedonly'] = ($_POST['resultvisibility'] == "votedonly") ? " selected" : "";
+		$arrPostSelected['resultvisibility']['pollend'] = ($_POST['resultvisibility'] == "pollend") ? " selected" : "";
+		$arrPostSelected['resultvisibility']['never'] = ($_POST['resultvisibility'] == "never") ? " selected" : "";
 
-		}
+		$arrPostSelected['pollend']['choose'] = ($_POST['enddate'] == "choose") ? " selected" : "";
+		$arrPostSelected['pollend']['forever'] = ($_POST['enddate'] == "forever") ? " selected" : "";
 
+		$arrPostSelected['endAMPM'] = ($_POST['endAMPM'] == "PM") ? " selected" : "";
 
 	}
 
 
-	$addMenuItemCID = $consoleObj->findConsoleIDByName("Add Menu Item");
-	if (empty($_POST['submit'])) {
+}
 
-		echo "
-	
-		<div class='formDiv'>
-		
-		";
 
-	}
-	if ($dispError != "") {
-		echo "
-		<div class='errorDiv'>
-		<strong>Unable to create poll because the following errors occurred:</strong><br><br>
-		$dispError
-		</div>
-		";
-		$pollOptionCacheID = $_POST['pollCacheID'];
-	} else {
-		$pollOptionCacheID = md5(time() . uniqid());
-		$_SESSION['btPollOptionCache'][$pollOptionCacheID] = array();
-	}
+$addMenuItemCID = $consoleObj->findConsoleIDByName("Add Menu Item");
+if (empty($_POST['submit'])) {
 
+	echo "
 
-	$hourOptions = "";
-	for ($i = 12; $i >= 1; $i--) {
-		$tempNum = str_pad($i, 2, "0", STR_PAD_LEFT);
-		$dispSelected = "";
-		if (isset($_POST['endhour']) && $_POST['endhour'] == $i) {
-			$dispSelected = " selected";
-		}
+	<div class='formDiv'>
+	
+	";
 
-		$hourOptions .= "<option value='" . $i . "'" . $dispSelected . ">" . $tempNum . "</option>";
+}
+if ($dispError != "") {
+	echo "
+	<div class='errorDiv'>
+	<strong>Unable to create poll because the following errors occurred:</strong><br><br>
+	$dispError
+	</div>
+	";
+	$pollOptionCacheID = $_POST['pollCacheID'];
+} else {
+	$pollOptionCacheID = md5(time() . uniqid());
+	$_SESSION['btPollOptionCache'][$pollOptionCacheID] = array();
+}
+
+
+$hourOptions = "";
+for ($i = 12; $i >= 1; $i--) {
+	$tempNum = str_pad($i, 2, "0", STR_PAD_LEFT);
+	$dispSelected = "";
+	if (isset($_POST['endhour']) && $_POST['endhour'] == $i) {
+		$dispSelected = " selected";
 	}
 
-	$minuteOptions = "";
-	for ($i = 0; $i <= 59; $i++) {
-		$tempNum = str_pad($i, 2, "0", STR_PAD_LEFT);
+	$hourOptions .= "<option value='" . $i . "'" . $dispSelected . ">" . $tempNum . "</option>";
+}
 
-		$dispSelected = "";
-		if (isset($_POST['endminute']) && $_POST['endminute'] == $i) {
-			$dispSelected = " selected";
-		}
+$minuteOptions = "";
+for ($i = 0; $i <= 59; $i++) {
+	$tempNum = str_pad($i, 2, "0", STR_PAD_LEFT);
 
-		$minuteOptions .= "<option value='" . $i . "'" . $dispSelected . ">" . $tempNum . "</option>";
+	$dispSelected = "";
+	if (isset($_POST['endminute']) && $_POST['endminute'] == $i) {
+		$dispSelected = " selected";
 	}
 
+	$minuteOptions .= "<option value='" . $i . "'" . $dispSelected . ">" . $tempNum . "</option>";
+}
 
-	echo "
- 	<form action='" . $MAIN_ROOT . "members/console.php?cID=" . $cID . "' method='post'>
-    Use the form below to add a poll.  You can display polls in menus by going to the <a href='" . $MAIN_ROOT . "members/console.php?cID=" . $addMenuItemCID . "'>Add Menu Item</a> page.        
-    <table class='formTable'>
-        <tr>
-            <td class='formLabel' valign='top'>Question:</td>
-            <td class='main'><textarea name='pollquestion' class='textBox' style='width: 60%; height: 30px'>" . (isset($_POST['pollquestion']) ? htmlspecialchars($_POST['pollquestion']) : '') . "</textarea></td>
-        </tr>
-    <tr>
-        <td class='formLabel'>Access:</td>
-        <td class='main'>
-            <select name='accesstype' id='accessType' class='textBox'>
-                <option value='members'>Members Only</option>
-                <option value='memberslimited'" . (isset($arrPostSelected['accesstype']['limited']) ? $arrPostSelected['accesstype']['limited'] : '') . ">Limited Members</option>
-                <option value='public'" . (isset($arrPostSelected['accesstype']['public']) ? $arrPostSelected['accesstype']['public'] : '') . ">Public</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td class='formLabel'>Multi-Vote: <a href='javascript:void(0)' onmouseover=\"showToolTip('Select the checkbox to allow users to vote on more than one option at a time.')\" onmouseout=\"hideToolTip()\">(?)</a></td>
-        <td class='main'>
-            <input type='checkbox' name='multivote' value='1'" . (isset($arrPostSelected['multivote']) ? $arrPostSelected['multivote'] : '') . ">
-        </td>
-    </tr>
-    <tr>
-        <td class='formLabel'>Display Voters: <a href='javascript:void(0)' onmouseover=\"showToolTip('Select the checkbox to show who voted for which option.')\" onmouseout=\"hideToolTip()\">(?)</a></td>
-        <td class='main'><input type='checkbox' name='displayvoters' value='1'" . (isset($arrPostSelected['displayvoters']) ? $arrPostSelected['displayvoters'] : '') . "></td>
-    </tr>
-    <tr>
-        <td class='formLabel'>Result Visibility:</td>
-        <td class='main'>
-            <select name='resultvisibility' class='textBox'>
-                <option value='open'>Show Always</option>
-                <option value='votedonly'" . (isset($arrPostSelected['resultvisibility']['votedonly']) ? $arrPostSelected['resultvisibility']['votedonly'] : '') . ">Show only after voted</option>
-                <option value='pollend'" . (isset($arrPostSelected['resultvisibility']['pollend']) ? $arrPostSelected['resultvisibility']['pollend'] : '') . ">Show only when poll ends</option>
-                <option value='never'" . (isset($arrPostSelected['resultvisibility']['never']) ? $arrPostSelected['resultvisibility']['never'] : '') . ">Don't reveal results</option>
-            </select>
-        </td>
-    </tr>
-        <tr>
-            <td class='formLabel'>Max votes per user: <a href='javascript:void(0)' onmouseover=\"showToolTip('Leave blank or 0 for unlimited votes.')\" onmouseout=\"hideToolTip()\">(?)</a></td>
-            <td class='main'>
-                <input type='text' name='maxvotes' value='" . (isset($_POST['maxvotes']) ? $_POST['maxvotes'] : '') . "' class='textBox' style='width: 10%'>
-            </td>
-        </tr>
-    <tr>
-        <td class='formLabel' valign='top'>Run poll until:</td>
-        <td class='main'>
-            <select name='enddate' id='endDatePick' class='textBox'>
-                <option value=''>Select</option>
-                <option value='choose'" . (isset($arrPostSelected['pollend']['choose']) ? $arrPostSelected['pollend']['choose'] : '') . ">Choose Date</option>
-                <option value='forever'" . (isset($arrPostSelected['pollend']['forever']) ? $arrPostSelected['pollend']['forever'] : '') . ">Forever</option>
-            </select>
-            <div id='pickEndDateDiv' style='display: none'>
-                <br>
-                <input type='text' id='jqEndDate' name='fakeenddate' value='" . (isset($_POST['fakeenddate']) ? $_POST['fakeenddate'] : '') . "' class='textBox' readonly='readonly' style='cursor: pointer'>
-                <p>
-                <select class='textBox' name='endhour'>" . $hourOptions . "</select> : 
-                <select class='textBox' name='endminute'>" . $minuteOptions . "</select>
-                <select class='textBox' name='endAMPM'><option value='AM'>AM</option><option value='PM'" . (isset($arrPostSelected['endAMPM']) ? $arrPostSelected['endAMPM'] : '') . ">PM</option></select>
-                </p>
-                <input type='hidden' name='realenddate' id='realEndDate'>
-            </div>
-        </td>
-    </tr>
-    </table>
+
+			echo "
+				<form action='" . $MAIN_ROOT . "members/console.php?cID=" . $cID . "' method='post'>
+				Use the form below to add a poll.  You can display polls in menus by going to the <a href='" . $MAIN_ROOT . "members/console.php?cID=" . $addMenuItemCID . "'>Add Menu Item</a> page.        
+				<table class='formTable'>
+					<tr>
+						<td class='formLabel' valign='top'>Question:</td>
+						<td class='main'><textarea name='pollquestion' class='textBox' style='width: 60%; height: 30px'>" . (isset($_POST['pollquestion']) ? htmlspecialchars($_POST['pollquestion']) : '') . "</textarea></td>
+					</tr>
+				<tr>
+					<td class='formLabel'>Access:</td>
+					<td class='main'>
+						<select name='accesstype' id='accessType' class='textBox'>
+							<option value='members'>Members Only</option>
+							<option value='memberslimited'" . (isset($arrPostSelected['accesstype']['limited']) ? $arrPostSelected['accesstype']['limited'] : '') . ">Limited Members</option>
+							<option value='public'" . (isset($arrPostSelected['accesstype']['public']) ? $arrPostSelected['accesstype']['public'] : '') . ">Public</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<td class='formLabel'>Multi-Vote: <a href='javascript:void(0)' onmouseover=\"showToolTip('Select the checkbox to allow users to vote on more than one option at a time.')\" onmouseout=\"hideToolTip()\">(?)</a></td>
+					<td class='main'>
+						<input type='checkbox' name='multivote' value='1'" . (isset($arrPostSelected['multivote']) ? $arrPostSelected['multivote'] : '') . ">
+					</td>
+				</tr>
+				<tr>
+					<td class='formLabel'>Display Voters: <a href='javascript:void(0)' onmouseover=\"showToolTip('Select the checkbox to show who voted for which option.')\" onmouseout=\"hideToolTip()\">(?)</a></td>
+					<td class='main'><input type='checkbox' name='displayvoters' value='1'" . (isset($arrPostSelected['displayvoters']) ? $arrPostSelected['displayvoters'] : '') . "></td>
+				</tr>
+				<tr>
+					<td class='formLabel'>Result Visibility:</td>
+					<td class='main'>
+						<select name='resultvisibility' class='textBox'>
+							<option value='open'>Show Always</option>
+							<option value='votedonly'" . (isset($arrPostSelected['resultvisibility']['votedonly']) ? $arrPostSelected['resultvisibility']['votedonly'] : '') . ">Show only after voted</option>
+							<option value='pollend'" . (isset($arrPostSelected['resultvisibility']['pollend']) ? $arrPostSelected['resultvisibility']['pollend'] : '') . ">Show only when poll ends</option>
+							<option value='never'" . (isset($arrPostSelected['resultvisibility']['never']) ? $arrPostSelected['resultvisibility']['never'] : '') . ">Don't reveal results</option>
+						</select>
+					</td>
+				</tr>
+					<tr>
+						<td class='formLabel'>Max votes per user: <a href='javascript:void(0)' onmouseover=\"showToolTip('Leave blank or 0 for unlimited votes.')\" onmouseout=\"hideToolTip()\">(?)</a></td>
+						<td class='main'>
+							<input type='text' name='maxvotes' value='" . (isset($_POST['maxvotes']) ? $_POST['maxvotes'] : '') . "' class='textBox' style='width: 10%'>
+						</td>
+					</tr>
+				<tr>
+					<td class='formLabel' valign='top'>Run poll until:</td>
+					<td class='main'>
+						<select name='enddate' id='endDatePick' class='textBox'>
+							<option value=''>Select</option>
+							<option value='choose'" . (isset($arrPostSelected['pollend']['choose']) ? $arrPostSelected['pollend']['choose'] : '') . ">Choose Date</option>
+							<option value='forever'" . (isset($arrPostSelected['pollend']['forever']) ? $arrPostSelected['pollend']['forever'] : '') . ">Forever</option>
+						</select>
+						<div id='pickEndDateDiv' style='display: none'>
+							<br>
+							<input type='text' id='jqEndDate' name='fakeenddate' value='" . (isset($_POST['fakeenddate']) ? $_POST['fakeenddate'] : '') . "' class='textBox' readonly='readonly' style='cursor: pointer'>
+							<p>
+							<select class='textBox' name='endhour'>" . $hourOptions . "</select> : 
+							<select class='textBox' name='endminute'>" . $minuteOptions . "</select>
+							<select class='textBox' name='endAMPM'><option value='AM'>AM</option><option value='PM'" . (isset($arrPostSelected['endAMPM']) ? $arrPostSelected['endAMPM'] : '') . ">PM</option></select>
+							</p>
+							<input type='hidden' name='realenddate' id='realEndDate'>
+						</div>
+					</td>
+				</tr>
+				</table>
 			
 			<div id='accessDiv' style='margin-bottom: 50px'>
 				<div class='main' style='margin: 20px auto; width: 95%'>
@@ -295,12 +295,12 @@
 						<div class='dottedLine'><b>Member Access:</b></div>
 						<p style='margin: 3px 0px;padding-left: 3px'>Use this section to set whether a specific member is allowed to access this poll.</p>
 					</div>
-				";
+	";
 
 	$accessObj->memberAccessDiv = "memberAccessList";
 	$accessObj->dispSetMemberAccess();
 
-	echo "	
+	echo "
 			</div>
 			
 			<div class='dottedLine main' style='margin-top: 20px; width: 95%; margin-left: auto; margin-right: auto'>
diff --git a/src/members/include/polls/include/addoption.php b/src/members/include/polls/include/addoption.php
index 62b7dde4..9ec1f2e0 100644
--- a/src/members/include/polls/include/addoption.php
+++ b/src/members/include/polls/include/addoption.php
@@ -1,105 +1,110 @@
 <?php
 
 /*
-* BlueThrust Clan Scripts
-* Copyright 2014
-*
-* Author: Bluethrust Web Development
-* E-mail: support@bluethrust.com
-* Website: http://www.bluethrust.com
-*
-* License: http://www.bluethrust.com/license.php
-*
-*/
-
-
-	require_once("../../../../_setup.php");
-	require_once("../../../../classes/member.php");
-	require_once("../../../../classes/poll.php");
+ * BlueThrust Clan Scripts
+ * Copyright 2014
+ *
+ * Author: Bluethrust Web Development
+ * E-mail: support@bluethrust.com
+ * Website: http://www.bluethrust.com
+ *
+ * License: http://www.bluethrust.com/license.php
+ *
+ */
+
+
+require_once("../../../../_setup.php");
+require_once("../../../../classes/member.php");
+require_once("../../../../classes/poll.php");
 
 // Start Page
 
-	$consoleObj = new ConsoleOption($mysqli);
-	$member = new Member($mysqli);
-	$member->select($_SESSION['btUsername']);
+$consoleObj = new ConsoleOption($mysqli);
+$member = new Member($mysqli);
+$member->select($_SESSION['btUsername']);
 
 
-	$createPollCID = $consoleObj->findConsoleIDByName("Create a Poll");
-	$consoleObj->select($createPollCID);
-	$blnConsoleCheck1 = $member->hasAccess($consoleObj);
+$createPollCID = $consoleObj->findConsoleIDByName("Create a Poll");
+$consoleObj->select($createPollCID);
+$blnConsoleCheck1 = $member->hasAccess($consoleObj);
+$managePollsCID = $consoleObj->findConsoleIDByName("Manage Polls");
+$managePollsCID = $consoleObj->findConsoleIDByName("Manage Polls");
+$consoleObj->select($managePollsCID);
+$blnConsoleCheck2 = $member->hasAccess($consoleObj);
 
-	$managePollsCID = $consoleObj->findConsoleIDByName("Manage Polls");
-	$consoleObj->select($managePollsCID);
-	$blnConsoleCheck2 = $member->hasAccess($consoleObj);
-
-
-	$blnConsoleCheck = $blnConsoleCheck1 || $blnConsoleCheck2;
-
-
-	$pollObj = new Poll($mysqli);
+$blnConsoleCheck = $blnConsoleCheck1 || $blnConsoleCheck2;
+$blnConsoleCheck = $blnConsoleCheck1 || $blnConsoleCheck2;
 
+$pollObj = new Poll($mysqli);
+$pollObj = new Poll($mysqli);
 // Check Login
-	$LOGIN_FAIL = true;
-	if ($member->authorizeLogin($_SESSION['btPassword']) && $blnConsoleCheck) {
+$LOGIN_FAIL = true;
+$LOGIN_FAIL = true;
+if ($member->authorizeLogin($_SESSION['btPassword']) && $blnConsoleCheck) {
 
-		$pollObj->cacheID = $_POST['cacheID'];
+	$pollObj->cacheID = $_POST['cacheID'];
 
-		if (!empty($_POST['submit'])) {
+	if (!empty($_POST['submit'])) {
 
-			$arrNewOption = array();
-			$arrErrors = array();
-			$arrReturn = array();
-
-
-			// Check Value
-			if (trim($_POST['optionValue']) == "") {
-				$arrErrors[] = "Option value may not be blank.";
-			}
+		$arrNewOption = array();
+		$arrErrors = array();
+		$arrReturn = array();
 
 
-			// Check Color
-			if (trim($_POST['optionColor']) == "") {
-				$_POST['optionColor'] = "#FFFFFF";
-			}
+		// Check Value
+		if (trim($_POST['optionValue']) == "") {
+			$arrErrors[] = "Option value may not be blank.";
+		}
 
-			// Check Display Order
 
-			if (count($_SESSION['btPollOptionCache'][$pollObj->cacheID]) > 0 && (!is_numeric($_POST['optionOrder']) || !isset($_POST['optionOrder']) || ($_POST['optionOrderBeforeAfter'] != "before" && $_POST['optionOrderBeforeAfter'] != "after"))) {
-				$arrErrors[] = "You selected an invalid display order.";
-			}
+		// Check Color
+		if (trim($_POST['optionColor']) == "") {
+			$_POST['optionColor'] = "#FFFFFF";
+		}
+			$_POST['optionColor'] = "#FFFFFF";
+		}
 
-			if (count($arrErrors) == 0) {
+		// Check Display Order
 
-				$newSortNum = $pollObj->makeCacheRoom($_POST['optionOrderBeforeAfter'], $_POST['optionOrder']);
+		if (count($_SESSION['btPollOptionCache'][$pollObj->cacheID]) > 0 && (!is_numeric($_POST['optionOrder']) || !isset($_POST['optionOrder']) || ($_POST['optionOrderBeforeAfter'] != "before" && $_POST['optionOrderBeforeAfter'] != "after"))) {
+			$arrErrors[] = "You selected an invalid display order.";
+		}
 
-				$arrReturn['result'] = "success";
-				$arrReturn['info'] = $newSortNum;
+		}
 
-				$arrNewOption['value'] = $_POST['optionValue'];
-				$arrNewOption['color'] = $_POST['optionColor'];
+		if (count($arrErrors) == 0) {
+			$newSortNum = $pollObj->makeCacheRoom($_POST['optionOrderBeforeAfter'], $_POST['optionOrder']);
+			$newSortNum = $pollObj->makeCacheRoom($_POST['optionOrderBeforeAfter'], $_POST['optionOrder']);
 
+			$arrReturn['result'] = "success";
+			$arrReturn['info'] = $newSortNum;
 
-				$_SESSION['btPollOptionCache'][$pollObj->cacheID][$newSortNum] = $arrNewOption;
+			$arrNewOption['value'] = $_POST['optionValue'];
+			$arrNewOption['color'] = $_POST['optionColor'];
 
-				$pollObj->resortCacheOrder();
 
-			}
+			$_SESSION['btPollOptionCache'][$pollObj->cacheID][$newSortNum] = $arrNewOption;
+			$pollObj->resortCacheOrder();
+			$pollObj->resortCacheOrder();
 
-			if (count($arrErrors) > 0) {
+		}
 
-				$arrReturn['result'] = "fail";
-				$arrReturn['errors'] = $arrErrors;
+		if (count($arrErrors) > 0) {
 
-			}
+			$arrReturn['result'] = "fail";
+			$arrReturn['errors'] = $arrErrors;
 
-			header('Content-Type: application/json');
-			echo json_encode($arrReturn);
 		}
 
+		header('Content-Type: application/json');
+		echo json_encode($arrReturn);
+	}
 
-		if (empty($_POST['submit'])) {
-			echo "	
-		
+
+	if (empty($_POST['submit'])) {
+		echo "	
+	
+		echo "	
 			<script type='text/javascript'>
 				$(document).ready(function() {
 					$('#optionColor').miniColors({
@@ -122,31 +127,32 @@
 				
 			";
 
-			if (count($_SESSION['btPollOptionCache'][$pollObj->cacheID]) > 0) {
-
-				$displayOrder = "";  // Initialize $displayOrder as an empty string
-
-				foreach ($_SESSION['btPollOptionCache'][$pollObj->cacheID] as $key => $optionInfo) {
-					$displayOrder .= "<option value='" . $key . "'>" . $optionInfo['value'] . "</option>";
-				}
-
-				echo "
-        <tr>
-            <td class='main'><b>Display Order:</b></td>
-            <td class='main'>
-                <select id='optionOrderBeforeAfter' class='textBox'>
-                    <option value='before'>Before</option><option value='after'>After</option>
-                </select>
-                <br>
-                <select id='optionOrder' class='textBox'>
-                " . $displayOrder . "
-                </select>
-    ";
+
+		if (count($_SESSION['btPollOptionCache'][$pollObj->cacheID]) > 0) {
+
+			$displayOrder = "";  // Initialize $displayOrder as an empty string
+
+			foreach ($_SESSION['btPollOptionCache'][$pollObj->cacheID] as $key => $optionInfo) {
+				$displayOrder .= "<option value='" . $key . "'>" . $optionInfo['value'] . "</option>";
 			}
 
 			echo "
-    </table>
+	<tr>
+		<td class='main'><b>Display Order:</b></td>
+		<td class='main'>
+			<select id='optionOrderBeforeAfter' class='textBox'>
+				<option value='before'>Before</option><option value='after'>After</option>
+			</select>
+			<br>
+			<select id='optionOrder' class='textBox'>
+			" . $displayOrder . "
+			</select>
 ";
-
 		}
-	}
\ No newline at end of file
+
+		echo "
+</table>
+";
+
+	}
+}
\ No newline at end of file