Merge pull request #22 from didiatworkz/v2.4

v2.4
didiatworkz · Oct 31, 2019 · 782e9ff · 782e9ff
2 parents 570b6a9 + 88f949d
commit 782e9ff
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 38 deletions.
diff --git a/_config.php b/_config.php
@@ -12,7 +12,7 @@
 			   info@atworkz.de
 	________________________________________
 			  Screenly OSE Monitor
-		   Version 2.2 - October 2019
+		   Version 2.4 - November 2019
 	________________________________________
 	*/
 	ini_set('display_errors',0);

diff --git a/assets/tools/ansible/roles/monitoring/files/ose-monitoring b/assets/tools/ansible/roles/monitoring/files/ose-monitoring
@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="2.2"
+VERSION="2.4"
 LOCAL=$(cat /home/pi/.monitor/latest_monitor)
 ONLINE=$(git ls-remote https://github.com/didiatworkz/screenly-ose-monitor | head -1 | sed "s/\tHEAD//")
 ACTION='\033[1;90m'

diff --git a/assets/tools/version.txt b/assets/tools/version.txt
@@ -1 +1 @@
-2.2
+2.4
diff --git a/index.php b/index.php
@@ -540,9 +540,10 @@
 											<input name="duration" type="number" class="form-control" id="InputAssetDuration" value="30" />
 										</div>
 										<div class="form-group text-right">
-											<input name="asset" id="InputSubmitId" type="hidden" value="1" />
-											<input name="id" id="InputAssetId" type="hidden" value="'.$player['playerID'].'" />
-											<button type="submit" name="updateAsset" class="btn btn-warning btn-sm">Update</button>
+											<input name="updateAsset" type="hidden" value="1" />
+											<input name="asset" id="InputAssetId"type="hidden" value="1" />
+											<input name="id" id="InputSubmitId" type="hidden" value="'.$player['playerID'].'" />
+											<button type="submit" class="btn btn-warning btn-sm">Update</button>
 											<button type="button" class="btn btn-secondary btn-sm" data-dismiss="modal">Close</button>
 										</div>
 									</form>
@@ -903,41 +904,42 @@
 	    header("Cache-Control: post-check=0, pre-check=0", false);
 	    header("Pragma: no-cache");
 
-	    if($playerCount['counter'] > 0 && $key == $securityToken){
-	      echo'
-	    	<div class="row">
-	      ';
-	      while($player = $playerSQL->fetchArray(SQLITE3_ASSOC)){
-	        if($player['name'] == ''){
-	          $name	 			= 'No Player Name';
-	          $imageTag 	= 'No Player Name '.$player['playerID'];
-	        }
-	        else {
-	          $name 			= $player['name'];
-	          $imageTag 	= $player['name'];
-	        }
-	        echo'
-					<div class="col-xl-2 col-lg-3 col-md-4 col-sm-6">
-						<div class="card">
-							<div class="card-header">
-								<h4 class="d-inline">'.$name.'</h4>
-								<h5>'.$player['address'].'</h5>
-							</div>
-							<div class="card-body card-monitor">
-								<img class="player" src="'.monitorScript($player['address']).'" alt="'.$imageTag.'">
+	    if($key == $securityToken){
+				if($playerCount['counter'] > 0){
+		      echo'
+		    	<div class="row">
+		      ';
+		      while($player = $playerSQL->fetchArray(SQLITE3_ASSOC)){
+		        if($player['name'] == ''){
+		          $name	 			= 'No Player Name';
+		          $imageTag 	= 'No Player Name '.$player['playerID'];
+		        }
+		        else {
+		          $name 			= $player['name'];
+		          $imageTag 	= $player['name'];
+		        }
+		        echo'
+						<div class="col-xl-2 col-lg-3 col-md-4 col-sm-6">
+							<div class="card">
+								<div class="card-header">
+									<h4 class="d-inline">'.$name.'</h4>
+									<h5>'.$player['address'].'</h5>
+								</div>
+								<div class="card-body card-monitor">
+									<img class="player" src="'.monitorScript($player['address']).'" alt="'.$imageTag.'">
+								</div>
 							</div>
 						</div>
-					</div>
-	        ';
-	      }
-	      echo '
-	    	</div>
-			</div>
-	    ';
-	    }
+		        ';
+		      }
+		      echo '
+		    	</div>
+				</div>
+		    ';
+		    }
+				else sysinfo('warning', 'No Player available!');
+			}
 	    else sysinfo('danger', 'Token incorrect - Access denied!');
-
-
 	  }
 		else {
 			if (isset($logedout)){