Merge pull request #39 from didiatworkz/v3.3

V3.3

.github/ISSUE_TEMPLATE/bug_report.md

@@ -36,7 +36,7 @@ Please search on the [issue tracker](https://github.com/didiatworkz/screenly-ose
 
 ## Your Environment
 <!--- Include as many relevant details about the environment you experienced the bug in -->
-* Screenly OSE Monitoring Version: <!-- v3.2 -->
+* Screenly OSE Monitoring Version: <!-- v3.3 -->
 * Screenly OSE Version: <!-- Release v0.18.2 -->
 * Raspbian Version: <!-- buster -->
 * Browser Name and version:

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.3] - 2020-06-29
+
+### Added
+- Notification in Usermanagement Module
+
+### Changed
+- Multiuploader can't upload images
+- Changes Notification System
+
 ## [3.2] - 2020-06-27
 
 ### Changed

README.md

@@ -5,7 +5,7 @@
 <img width="800px" title="Manage Monitoring" alt="Manage Monitoring" src="https://raw.githubusercontent.com/didiatworkz/screenly-ose-monitor/master/.github/IMAGES/manage5.png" />
 </p>
 
-![GitHub release (latest by date)](https://img.shields.io/github/v/release/didiatworkz/screenly-ose-monitor) ![GitHub Release Date](https://img.shields.io/github/release-date/didiatworkz/screenly-ose-monitor?color=green) ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/didiatworkz/screenly-ose-monitor/v3.2) ![GitHub commit activity](https://img.shields.io/github/commit-activity/y/didiatworkz/screenly-ose-monitor)  ![GitHub issues](https://img.shields.io/github/issues-raw/didiatworkz/screenly-ose-monitor)  ![GitHub stars](https://img.shields.io/github/stars/didiatworkz/screenly-ose-monitor?style=social)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/didiatworkz/screenly-ose-monitor) ![GitHub Release Date](https://img.shields.io/github/release-date/didiatworkz/screenly-ose-monitor?color=green) ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/didiatworkz/screenly-ose-monitor/v3.3) ![GitHub commit activity](https://img.shields.io/github/commit-activity/y/didiatworkz/screenly-ose-monitor)  ![GitHub issues](https://img.shields.io/github/issues-raw/didiatworkz/screenly-ose-monitor)  ![GitHub stars](https://img.shields.io/github/stars/didiatworkz/screenly-ose-monitor?style=social)
 
 - [Intro](#what-is-this)
 - [Features](#features)

_functions.php

@@ -12,7 +12,7 @@
 			   info@atworkz.de
 	________________________________________
 			  Screenly OSE Monitor
-		   Version 3.2 - June 2020
+		   Version 3.3 - June 2020
 	________________________________________
 	*/
 
@@ -46,13 +46,17 @@
 		$site = $_GET['site'];
 	} else $site = NULL;
 
-	function redirect($url, $time = 1){
+	function redirect($url, $time = 0){
 		echo '<meta http-equiv="refresh" content="'.$time.';URL='.$url.'">';
 	}
 
-	function sysinfo($status, $message, $refresh = false){
-		echo '<script>$.notify({icon: "tim-icons icon-bell-55",message: "'.$message.'"},{type: "'.$status.'",timer: 1000,placement: {from: "top",align: "center"}});</script>';
-		if($refresh) echo'<meta http-equiv="refresh" content="1;URL=index.php">';
+	function sysinfo($style, $message, $refresh = false){
+		echo '
+		<script>
+			localStorage.setItem("notification_style", "'.$style.'");
+			localStorage.setItem("notification_message", "'.$message.'");
+			localStorage.setItem("notification_counter", "1");
+		</script>';
 	}
 
 	include_once('assets/php/database.php');

assets/dev/UPDATE_VERSION.MD

@@ -5,4 +5,5 @@ This information is only for developers who want to further develop the script a
 + /assets/version.txt
 + /assets/php/database.php
 + /CHANGELOG.md
++ /README.md
 + /assets/ansible/roles/monitoring/files/ose-monitoring

assets/js/monitor.js

@@ -1,3 +1,25 @@
+/*
+                            _
+   ____                    | |
+  / __ \__      _____  _ __| | __ ____
+ / / _` \ \ /\ / / _ \| '__| |/ /|_  /
+| | (_| |\ V  V / (_) | |  |   <  / /
+ \ \__,_| \_/\_/ \___/|_|  |_|\_\/___|
+  \____/
+
+    http://www.atworkz.de
+       info@atworkz.de
+________________________________________
+      Screenly OSE Monitor
+________________________________________
+*/
+
+function setNotification(style, message) {
+  localStorage.setItem("notification_style", style);
+  localStorage.setItem("notification_message", message);
+  localStorage.setItem("notification_counter", "0");
+}
+
 $('[data-tooltip="tooltip"]').tooltip();
 $('[data-tooltip=tooltip]').hover(function(){
   $('.tooltip').css('top',parseInt($('.tooltip').css('left')) + 10 + 'px')
@@ -151,7 +173,7 @@ if ($('.drop').length) {
        data: { name: fname, url: response, mimetype: mimetype, id: playerID, newAsset: upload_asset  },
        timeout: 5000,
        success: function(data){
-         $.notify({icon: 'tim-icons icon-bell-55',message: data},{type: 'success',timer: 1000,placement: {from: 'top',align: 'center'}});
+         setNotification('success', data);
          myDropzone.removeFile(file);
        },
        error: function(data){
@@ -213,6 +235,7 @@ if ($('.dropzoneMulti').length) {
 
       this.on("complete", function(file){
         $('#refresh').show();
+        $('.dz-message').text("Upload done! - Reload this page...");
       });
     }
   });
@@ -247,10 +270,10 @@ $("#assetNewForm").submit(function(e) {
      data: formData,
      success: function(data){
        $('#newAsset').modal('hide');
-       $.notify({icon: 'tim-icons icon-bell-55',message: data},{type: 'success',timer: 1000,placement: {from: 'top',align: 'center'}});
+       setNotification('success', data);
        setTimeout(function() {
          location.reload();
-       }, 2000);
+       }, 0);
      },
      error: function(data){
        $.notify({icon: 'tim-icons icon-bell-55',message: data},{type: 'danger',timer: 1000,placement: {from: 'top',align: 'center'}});

assets/php/actions.php

@@ -29,7 +29,7 @@
 		$end_time		= $start_time;
 		$duration 	= $set['duration'];
 		$cancel 		= FALSE;
-		$output			= '';
+		$output			= NULL;
 
 		if($name == '') $name = $url;
 
@@ -41,14 +41,16 @@
 		}
 
 		for ($i=0; $i < count($id); $i++) {
-			$id = $id[$i];
-			$playerSQL 	= $db->query("SELECT * FROM `player` WHERE playerID='".$id."'");
+			$playerSQL 	= $db->query("SELECT * FROM `player` WHERE playerID='".$id[$i]."'");
 			$player 		= $playerSQL->fetchArray(SQLITE3_ASSOC);
 
 			if(isset($_POST['multidrop'])){
-				print_r($images);
-				$url = callURL('POST3', $player['address'].'/api/v1/file_asset', $images, $id, false);
-				if (strpos($url, '/home/pi/screenly_assets') === false) $cancel = TRUE;
+				//print_r($images);
+				$url = callURL('POST3', $player['address'].'/api/v1/file_asset', $images, $id[$i], false);
+				if (strpos($url, '/home/pi/screenly_assets') === false) {
+					$output .= $player['name'];
+					continue;
+				}
 			}
 
 			$data 										= array();
@@ -64,25 +66,25 @@
 			$data['skip_asset_check'] = 1;
 
 			//print_r($data);
-			//echo'<script>console.log("ID: '.$id.'")</script>';
+			//echo'<script>console.log("ID: '.$id[$i].'")</script>';
 
-			if($out = callURL('POST', $player['address'].'/api/'.$apiVersion.'/assets', $data, $id, false)){
-				if(strpos($out, '201') === false OR $cancel){
+			if($out = callURL('POST', $player['address'].'/api/'.$apiVersion.'/assets', $data, $id[$i], false)){
+				if(strpos($out, '201') === false){
 					$output .= $player['name'].'
 					';
-				} else echo 'Asset added successfully to Player: '.$player['name'];
+				} else if(!isset($_POST['multidrop'])) echo 'Asset added successfully to Player: '.$player['name'];
 			}
 			else {
 				header('HTTP/1.1 404 Not Found');
-				echo 'Error! - Can \'t add the Asset';
+				$output .= 'Error! - Can \'t add the Asset';
 			}
 		}
 
-		if(strpos($output, 'Error') === false){
+		if($output == NULL){
 			header('HTTP/1.1 200 OK');
 		} else {
 			header('HTTP/1.1 500 Internal Server Error');
-			echo 'Can\'t upload Asset '.$_FILES['file']['name'].' to:
+			echo 'Can\'t upload to:
 
 			'.$output;
 		}

assets/php/database.php

@@ -63,7 +63,7 @@
     $db->exec("UPDATE `settings` SET updatecheck=0 WHERE userID=1");
     $db->exec("UPDATE `settings` SET refreshscreen=5 WHERE userID=1");
   }
-  if($oldVersion <= '3.2'){			// Update Database to Version 3.2
+  if($oldVersion <= '3.3'){			// Update Database to Version 3.2
     $db->exec("ALTER TABLE `settings` RENAME TO `settings_tmp`");
     $db->exec("CREATE TABLE `settings` (`settingsID` INTEGER PRIMARY KEY AUTOINCREMENT,`duration`	INTEGER,	`token`	TEXT,	`end_date`	INTEGER, `firstStart`	INTEGER,	`updatecheck`	INTEGER)");
     $db->exec("INSERT INTO `settings`(duration,token,end_date,updatecheck) SELECT duration,token,end_date,updatecheck FROM `settings_tmp`");

assets/php/menu.php

@@ -1,5 +1,22 @@
 <?php
 
+  $adminUserManagement  = '';
+  $adminSettings        = '';
+
+  if(getGroupID($loginUserID) == 1){
+    $adminUserManagement = '
+      <li class="nav-link">
+        <a href="index.php?site=usermanagement" class="nav-item dropdown-item">User Management</a>
+      </li>
+    ';
+
+    $adminSettings = '
+      <li class="nav-link">
+       <a href="javascript:void(0)" data-toggle="modal" data-target="#settings" class="nav-item dropdown-item">Settings</a>
+     </li>
+    ';
+  }
+
   if($playerCount >= 2){
     $multiMenu = '
     <li class="nav-item">

assets/php/multiuploader.php

@@ -21,6 +21,16 @@
   $_moduleName = 'Multi Uploader';
   $_moduleLink = 'index.php?site=multiuploader';
 
+  if(isset($_GET['tab']) AND $_GET['tab'] == 'drop' ) {
+    $active_drop = 'active';
+    $active_url = '';
+  }
+  else {
+    $active_drop = '';
+    $active_url = 'active';
+  }
+
+
   if(isset($_POST['send'])){
       redirect($_moduleLink, 0);
   }
@@ -38,7 +48,7 @@
         </label>
       </div>
         ';
-      
+
     }
     echo '
     <div class="row justify-content-md-center">
@@ -54,15 +64,15 @@
           <div class="card-body">
           <ul class="nav nav-tabs" role="tablist">
             <li class="nav-item">
-              <a class="nav-link active" href="#url" role="tab" data-toggle="tab">URL</a>
+              <a class="nav-link '.$active_url.'" href="#url" role="tab" data-toggle="tab">URL</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="#upload" role="tab" data-toggle="tab">Upload</a>
+              <a class="nav-link '.$active_drop.'" href="#upload" role="tab" data-toggle="tab">Upload</a>
             </li>
           </ul>
 
           <div class="tab-content">
-            <div role="tabpanel" class="tab-pane active" id="url">
+            <div role="tabpanel" class="tab-pane '.$active_url.'" id="url">
               <form id="assetNewForm" action="'.$_SERVER['REQUEST_URI'].'" method="POST" data-multiloader="true">
                 <div class="row">
                   <div class="col-md-6">
@@ -85,7 +95,7 @@
                 </div>
               </form>
             </div>
-            <div role="tabpanel" class="tab-pane" id="upload">
+            <div role="tabpanel" class="tab-pane '.$active_drop.'" id="upload">
             <form id="dropzoneupload">
               <div class="row">
                 <div class="col-md-6">
@@ -102,7 +112,7 @@
                     <br />
                     <input type="hidden" name="multidrop" id="multidrop" value="1" />
                     <input type="hidden" name="test" id="test" value="1" />
-                    <button type="button" id="refresh" onclick="location.reload();" class="btn btn-info btn-sm" style="display:none;">Reload</button>
+                    <a id="refresh" href="'.$_moduleLink.'&tab=drop" class="btn btn-info btn-sm" style="display:none;">Reload</a>
                     <button type="button" id="uploadfiles" class="btn btn-success btn-sm">Upload</button>
                   </div>
                 </div>

assets/php/player.php

@@ -106,7 +106,7 @@ function callURL($method, $ip, $params = false, $playerID = null, $ssl = false){
 		   return callURL($method, $ip, $params, $playerID, true);
 		}
 		elseif ($code == 401) {
-			sysinfo('warning', 'Can not logged in to the player! - Wrong Username or Password!');
+			echo '<script>$.notify({icon: "tim-icons icon-bell-55",message: "<strong>Can not logged in to the player! </strong><br /> Wrong Username or Password!"},{type: "warning",timer: 2000 ,placement: {from: "top",align: "center"}});</script>';
 			return 'authentication error '.$code;
 		}
 		else return 'error '.$code;

assets/php/user.php

@@ -22,8 +22,6 @@
 $loginUsername 	      = '';
 $loginPassword 	      = '';
 $loginGroupID         = 0;
-$adminUserManagement  = '';
-$adminSettings        = '';
 
 function getGroupID($userID){
   global $db;
@@ -157,20 +155,6 @@ function isActive($userID){
     $loginGroupID     = getGroupID($loginUserID);
     $loginGroupName   = getGroupName($loginUserID);
 
-    if(getGroupID($loginUserID) == 1){
-      $adminUserManagement = '
-        <li class="nav-link">
-          <a href="index.php?site=usermanagement" class="nav-item dropdown-item">User Management</a>
-        </li>
-      ';
-
-      $adminSettings = '
-        <li class="nav-link">
-         <a href="javascript:void(0)" data-toggle="modal" data-target="#settings" class="nav-item dropdown-item">Settings</a>
-       </li>
-      ';
-    }
-
     $loggedIn = TRUE;
   }
   else $loggedIn = FALSE;

assets/php/usermanagement.php

@@ -35,7 +35,9 @@
         $userSQL = $db->query("SELECT userID FROM `users` WHERE username='".$user."' AND password='".$pass2."'");
         $userSQL = $userSQL->fetchArray(SQLITE3_ASSOC);
         $db->exec("INSERT INTO `userGroupMapping` (userID, groupID) values('".$userSQL['userID']."', '".$group."')");
+        sysinfo('success', $user.' updated successfully!');
       }
+
       redirect($_moduleLink, 0);
   }
 
@@ -57,6 +59,7 @@
         $db->exec("UPDATE `users` SET username='".$user."', firstname='".$firstname."', name='".$name."', active='".$status."' WHERE userID='".$userID."'");
       }
       $db->exec("UPDATE `userGroupMapping` SET groupID='".$group."' WHERE userID='".$userID."'");
+      sysinfo('success', $user.' updated successfully!');
     }
   }
 
@@ -65,6 +68,7 @@
     if(isset($userID) AND $userID != $loginUserID){
       $db->exec("DELETE FROM `users` WHERE userID='".$userID."'");
       $db->exec("DELETE FROM `userGroupMapping` WHERE userID='".$userID."'");
+      sysinfo('success', 'User successfully deleted!');
     }
     redirect($backLink, 0);
   }
@@ -259,5 +263,5 @@
 }
 else {
   sysinfo('danger', 'No Access to this module!');
-  redirect($backLink, 2);
+  redirect($backLink, 0);
 }

assets/tools/ansible/roles/monitoring/files/ose-monitoring

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION="3.2"
+VERSION="3.3"
 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'

assets/tools/version.txt

@@ -1 +1 @@
-3.2
+3.3