Merge pull request #18 from mrbobdobolina/release/v3.6.1

Release/v3.6.1
mrbobdobolina · Feb 17, 2022 · d7469e3 · d7469e3
2 parents 0023850 + 0183d14
commit d7469e3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/admin/add-game.php b/admin/add-game.php
@@ -131,6 +131,14 @@
 	$selectorsSelect .= "<option value=\"" . $aTool . "\">" . $aTool . "</option>";
 }
 
+$services = getListOfServices();
+
+$servicesSelect = "<option disabled selected></option>";
+
+foreach($services as $aService){
+	$servicesSelect .= "<option value=\"" . $aService['name'] . "\">" . $aService['name'] . "</option>";
+}
+
 ?>
 <h1 class="display-6 text-center">Add an Event</h1>
 <div class="text-center mb-5"></div>
@@ -258,7 +266,7 @@
 
 						<div class="col-12 mb-3">
 							<label class="form-label">Format</label>
-							<input class="form-control" type="text" name="format">
+							<select class="form-select" name="format"><?php echo $servicesSelect; ?></select>
 						</div>
 
 						<div class="col-12 mb-3">

diff --git a/admin/add-movie.php b/admin/add-movie.php
@@ -94,7 +94,7 @@
 					<div class="row mb-3">
 						<label for="name" class="col-4 col-form-label">Movie Name</label>
 						<div class="col-8">
-							<input id="name" name="name" type="text" value="<?php if(isset($_POST['sname'])){echo $_POST['sname'];}?>" class="form-control">
+							<input id="name" name="name" type="text" value="<?php if(isset($_POST['sname'])){echo $movie_info['Title'];}?>" class="form-control">
 						</div>
 					</div>
 					<div class="row mb-3">

diff --git a/admin/add-service.php b/admin/add-service.php
@@ -45,8 +45,8 @@
 include('template/header.php');
 
 ?>
-<h1 class="display-6 text-center">Add a viewer</h1>
-<div class="text-center mb-5">Congrats on your new friend, I guess.</div>
+<h1 class="display-6 text-center">Add a service</h1>
+<div class="text-center mb-5">I thought you had enough of those...</div>
 
 <?php
 
@@ -91,15 +91,15 @@
 
 		<div class="card mb-3">
 			<div class="card-header">
-				Existing Viewers
+				Existing Services
 			</div>
 			<div class="card-body">
 				<ul>
 					<?php
 
-					$viewers = getListOfViewers();
-					foreach($viewers as $person){
-						echo '<li>'.$person['name'].'</li>';
+					$services = getListOfServices();
+					foreach($services as $a_service){
+						echo '<li>'.$a_service['name'].'</li>';
 					}
 
 					?>

diff --git a/changelog.php b/changelog.php
@@ -6,6 +6,7 @@
 
 //Array('date' => "", 'version' => '', 'details' => Array("")),
 $changes = Array(
+	Array('date'=>"February 17, 2022", 'version' => 'Version 3.6.1', 'details' => Array("Bug fixes on admin pages.")),
 	Array('date'=>"February 6, 2022", 'version' => 'Version 3.6.0', 'details' => Array("Tweaked some admin code to make adding movies easier","Fixed missing spaces","Updated One Hit Wonder counter to ignore viewer choices","Viewers page should work better on mobile now")),
 	Array('date'=>"February 5, 2022", 'version' => 'Version 3.5.0', 'details' => Array("Added hero section to home page.","Added Poster View", "Changed DB", "Localized snow js", "Decreased chance of flurries", "Minor bug fixes")),
 	Array('date'=>"January 21, 2022", 'version' => 'Version 3.4.0', 'details' => Array("Cleand up Admin backend.", "Admin pages are now Bootstrap 5 compliant.", "Admin list generation is now written in JavaScript.", "Fixed a few divide by zero errors.")),

diff --git a/common.php b/common.php
@@ -279,6 +279,13 @@ function get_service_color_v3($service_name = NULL){
 	}
 }
 
+function getListOfServices($sortBy = 'id', $direction = "DESC"){
+	$sql = "SELECT * FROM `services` ORDER BY `$sortBy` $direction";
+	$data = db($sql);
+
+	return $data;
+}
+
 //reads the db version listed in the DB
 function read_db_version(){
 	$sql = "SELECT * FROM `options` WHERE `name` = 'db_version'";
@@ -292,7 +299,7 @@ function this_db_version(){
 }
 
 function echoVersionNumber(){
-	echo "3.6.0";
+	echo "3.6.1";
 	return;
 }