Bladeren bron

Add files via upload

Added auto refresh
Trimming on Typing text
yeungalan 5 jaren geleden
bovenliggende
commit
393a34820c
3 gewijzigde bestanden met toevoegingen van 216 en 164 verwijderingen
  1. 190 150
      RemotePlay/embedded.php
  2. 13 7
      RemotePlay/mobileremote.php
  3. 13 7
      RemotePlay/remote.php

+ 190 - 150
RemotePlay/embedded.php

@@ -1,151 +1,191 @@
-<?php
-include_once("../auth.php");
-if(!file_exists("data")){
-	mkdir("data",0777,true);
-}
-if (isset($_GET['fp']) && isset($_GET['rid'])){
-	$rid = $_GET['rid'];
-	$rid = explode(",",$rid)[0];
-	file_put_contents("data/" . $rid . ".inf","fopen," . $_GET['fp']);
-	echo "DONE";
-	exit(0);
-}
-
-function check_file_is_audio( $tmp ) 
-{
-    $allowed = array(
-        'audio/mpeg', 'audio/x-mpeg', 'audio/mpeg3', 'audio/x-mpeg-3', 'audio/aiff', 
-        'audio/mid', 'audio/x-aiff', 'audio/x-flac', 'audio/x-mpequrl','audio/midi', 'audio/x-mid', 
-        'audio/x-midi','audio/wav','audio/x-wav','audio/xm','audio/x-aac','audio/basic',
-        'audio/flac','audio/mp4','audio/x-matroska','audio/ogg','audio/s3m','audio/x-ms-wax',
-        'audio/xm', 'image/jpeg', 'video/mp4'
-    );
-    
-    // check REAL MIME type
-    $finfo = finfo_open(FILEINFO_MIME_TYPE);
-    $type = finfo_file($finfo, $tmp );
-    finfo_close($finfo);
-    
-    // check to see if REAL MIME type is inside $allowed array
-    if( in_array($type, $allowed) ) {
-        return true;
-    } else {
-        return false;
-    }
-}
-
-//Check if the file exists and it is audio file.
-$valid = true;
-if(isset($_GET['filepath']) && file_exists($_GET['filepath'])){
-	//This file exists.
-	$filename = $_GET['filepath'];
-}else{
-	$valid = false;
-}
-
-if (isset($_GET['filename'])){
-	$displayName =  $_GET['filename'];
-}else{
-	$displayName =  basename($filename);
-}
-if (!check_file_is_audio($_GET['filepath'])){
-	//This is not an audio file
-	$valid = false;
-}
-if(!$valid){
-	die("Error. There are problems with the selected files.");
-}
-?>
-<html>
-<head>
-	<link rel="stylesheet" href="../script/tocas/tocas.css">
-	<script src="../script/tocas/tocas.js"></script>
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<script src="../script/jquery.min.js"></script>
-	<script src="../script/ao_module.js"></script>
-	<link rel="manifest" href="manifest.json">
-	<style>
-		body{
-			background-color:#0c0c0c;
-			color:white;
-		}
-		.white{
-			color:white !important;
-		}
-	</style>
-	
-</head>
-<body>
-<br>
-<div class="ts container" style="color:white;">
-	<h5 class="ts header">
-		<i class="white feed icon"></i>
-		<div class="white content">
-			Send to RemotePlay
-			<div class="white sub header">Request Remote Device to play a file</div>
-		</div>
-	</h5>
-	<hr>
-	<p class="white">Target RemotePlay ID</p>
-	<div class="ts basic mini fluid input">
-		<select class="ts basic dropdown" id="remoteID" style="background: black;color: white;width: 100%">
-			<option>Scanning...</option>
-		</select>
-	</div>
-	<br><p class="white">Filename</p>
-	<div class="ts basic mini fluid input">
-		<input id="filename" class="white" type="text" value="<?php echo $displayName;?>" readonly=true>
-	</div>
-	<br><p class="white">Target Filepath</p>
-	<div class="ts basic mini fluid input">
-		<input id="filepath" class="white" type="text" value="<?php echo $filename;?>" readonly=true>
-	</div>
-	<br><br>
-	<div align="right">
-		<button class="ts basic white mini button" onClick="createRequest();">Send</button>
-	</div>
-</div>
-	<script>
-	$(document).ready(function(){
-		$.get("opr.php?opr=scanalive",function(data){
-				var obj = JSON.parse(data);
-				$("#remoteID").html("");
-				$("#remoteID").append($("<option></option>").attr("value", "").text("Not selected"));
-				$.each( obj, function( key, value ) {
-					$("#remoteID").append($("<option></option>").attr("value", value).text(value));
-				});
-				$("#remoteID").val("");
-				var previousRemoteID = ao_module_getStorage("remoteplay","remoteID");
-				if (previousRemoteID !== undefined && $("#remoteID option[value='" + previousRemoteID + "']").length > 0){
-					$("#remoteID").val(previousRemoteID);
-				}
-			});
-	});
-	var rid = $("#rid").text().trim();
-	ao_module_setWindowSize(385,420);
-	ao_module_setWindowTitle("Send to RemotePlay");
-	ao_module_setWindowIcon("feed");
-	
-	$("#remoteID").on("change",function(){
-		ao_module_saveStorage("remoteplay","remoteID",$(this).val());
-	});
-	
-	$("#remoteID").on("keydown",function(e){
-		if (e.keyCode == 13){
-			//Enter is pressed
-			createRequest();
-		}
-	});
-	
-	function createRequest(){
-		var filepath = $("#filepath").val();
-		var remoteID = $("#remoteID").val();
-		$.get("embedded.php?fp=" + filepath + "&rid=" + remoteID,function(data){
-			if (data.includes("ERROR") == false){
-				ao_module_close();
-			}
-		});
-	}
-	</script>
-</body>
+<?php
+include_once("../auth.php");
+if(!file_exists("data")){
+	mkdir("data",0777,true);
+}
+if (isset($_GET['fp']) && isset($_GET['rid'])){
+	$rid = $_GET['rid'];
+	$rid = explode(",",$rid)[0];
+	file_put_contents("data/" . $rid . ".inf","fopen," . $_GET['fp']);
+	echo "DONE";
+	exit(0);
+}
+
+function check_file_is_audio( $tmp ) 
+{
+    $allowed = array(
+        'audio/mpeg', 'audio/x-mpeg', 'audio/mpeg3', 'audio/x-mpeg-3', 'audio/aiff', 
+        'audio/mid', 'audio/x-aiff', 'audio/x-flac', 'audio/x-mpequrl','audio/midi', 'audio/x-mid', 
+        'audio/x-midi','audio/wav','audio/x-wav','audio/xm','audio/x-aac','audio/basic',
+        'audio/flac','audio/mp4','audio/x-matroska','audio/ogg','audio/s3m','audio/x-ms-wax',
+        'audio/xm', 'image/jpeg', 'video/mp4'
+    );
+    
+    // check REAL MIME type
+    $finfo = finfo_open(FILEINFO_MIME_TYPE);
+    $type = finfo_file($finfo, $tmp );
+    finfo_close($finfo);
+    
+    // check to see if REAL MIME type is inside $allowed array
+    if( in_array($type, $allowed) ) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
+//Check if the file exists and it is audio file.
+$valid = true;
+$external = false;
+if(isset($_GET['filepath']) && file_exists($_GET['filepath'])){
+	//This file exists.
+	$filename = $_GET['filepath'];
+	$filepath = $filename;
+}else if (isset($_GET['filepath']) && strpos($_GET['filepath'],"extDiskAccess.php?file=") !== false){
+	//This file is imported from external storage.
+	$external = true;
+	$filename = $_GET['filepath'];
+	$filepath = array_pop(explode("=",$_GET['filepath']));
+}else{
+	$valid = false;
+}
+
+if (isset($_GET['filename'])){
+	$displayName =  $_GET['filename'];
+}else{
+	$displayName =  basename($filename);
+}
+if (!check_file_is_audio($filepath)){
+	//This is not an audio file
+	$valid = false;
+}
+if(!$valid){
+	die("Error. There are problems with the selected files.");
+}
+?>
+<html>
+<head>
+	<link rel="stylesheet" href="../script/tocas/tocas.css">
+	<script src="../script/tocas/tocas.js"></script>
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+	<script src="../script/jquery.min.js"></script>
+	<script src="../script/ao_module.js"></script>
+	<link rel="manifest" href="manifest.json">
+	<style>
+		body{
+			background-color:#0c0c0c;
+			color:white;
+		}
+		.white{
+			color:white !important;
+		}
+	</style>
+	
+</head>
+<body>
+<br>
+<div class="ts container" style="color:white;">
+	<h5 class="ts header">
+		<i class="white feed icon"></i>
+		<div class="white content">
+			Send to RemotePlay
+			<div class="white sub header">Request Remote Device to play a file</div>
+		</div>
+	</h5>
+	<hr>
+	<p class="white">Target RemotePlay ID</p>
+	<div class="ts floating dropdown labeled icon button" style="padding: 0px;padding-right: calc(0.22em + 1em + .78571em * 2) !important;padding-left: 0em !important;background-color: black;color:white;height: 39.97px" width="100%">
+					<div class="text">
+						<div class="ts fluid input" style="right 1px;bottom:1px">
+							<input type="text" style="border-top-right-radius: 0px;border-bottom-right-radius: 0px;background-color: black;color: white!important;border-color: white!important;border-right:0px" placeholder="RemotePlay ID" id="remoteID_tb">
+						</div>
+					</div>
+					<i class="caret down icon" style="left: auto !important;right: 0em !important;background-color: black;"></i>
+					<div class="menu" style="background-color: black !important;"  id="n_remoteID">
+					</div>
+				</div>
+	<br><p class="white">Filename</p>
+	<div class="ts basic mini fluid input">
+		<input id="filename" class="white" type="text" value="<?php echo $displayName;?>" readonly=true>
+	</div>
+	<br><p class="white">Target Filepath</p>
+	<div class="ts basic mini fluid input">
+		<input id="filepath" class="white" type="text" value="<?php echo $filename;?>" readonly=true>
+	</div>
+	<br><br>
+	<div align="right">
+		<button class="ts basic white mini button" onClick="createRequest();">Send</button>
+	</div>
+</div>
+	<script>
+	var rid = $("#rid").text().trim();
+	ao_module_setWindowSize(385,420);
+	
+$(document).ready(function(){
+	ts('.ts.dropdown:not(.basic)').dropdown();
+	$(".ts.fluid.input").click(function(e) {
+		e.stopPropagation();
+	});
+	var h = $(".ts.fluid.input").height();
+	$(".ts.floating.dropdown.labeled.icon.button").attr("style",$(".ts.floating.dropdown.labeled.icon.button").attr("style").replace("39.97",h));
+	//$(".caret.down.icon").attr("style",$(".caret.down.icon").attr("style").replace("39.97",h));
+	update();
+});
+	
+	setInterval(update, 10000);
+function update(){
+		var previousRemoteID = ao_module_getStorage("remoteplay","remoteID");
+	$.get("opr.php?opr=scanalive",function(data){
+		var obj = JSON.parse(data);
+		$("#n_remoteID").html("");
+		$("#n_remoteID").append($('<div class="item" style="color: white!important;"></div>').attr("value", "").text("Not selected"));
+		$.each( obj, function( key, value ) {
+			$("#n_remoteID").append($('<div class="item" style="color: white!important;"></div>').attr("value", value).text(value));
+		});
+		$("#n_remoteID").val("");
+		/*
+		if (previousRemoteID !== undefined && $(".item[value='" + previousRemoteID + "']").length > 0){
+			$("#remoteID_tb").val(previousRemoteID);
+			rid = previousRemoteID;
+		}
+		*/
+		$("#remoteID_tb").val(previousRemoteID);
+		$("#n_remoteID .item").on("click",function(){
+			//console.log($(this).attr("value"));
+			$("#remoteID_tb").val($(this).attr("value"));
+			ao_module_saveStorage("remoteplay","remoteID",$(this).attr("value"));
+			rid = $(this).attr("value");
+		});
+		$("#remoteID_tb").on("change",function(){
+			ao_module_saveStorage("remoteplay","remoteID",$(this).val());
+			rid = $(this).val();
+		});
+	});
+}
+
+	ao_module_setWindowTitle("Send to RemotePlay");
+	ao_module_setWindowIcon("feed");
+	
+	$("#remoteID_tb").on("change",function(){
+		ao_module_saveStorage("remoteplay","remoteID",$(this).val());
+	});
+	
+	$("#remoteID_tb").on("keydown",function(e){
+		if (e.keyCode == 13){
+			//Enter is pressed
+			createRequest();
+		}
+	});
+	
+	function createRequest(){
+		var filepath = $("#filepath").val();
+		var remoteID = $("#remoteID_tb").val();
+		$.get("embedded.php?fp=" + filepath + "&rid=" + remoteID,function(data){
+			if (data.includes("ERROR") == false){
+				ao_module_close();
+			}
+		});
+	}
+	</script>
+</body>
 </html>

+ 13 - 7
RemotePlay/mobileremote.php

@@ -44,13 +44,13 @@ if (isset($_GET['comm']) && isset($_GET['rid'])){
     <div class="row">
         <div class="sixteen wide column">
 			<p class="white">Target RemotePlay ID</p>
-				<div class="ts dropdown" width="100%">
+				<div class="ts floating dropdown labeled icon button" style="padding: 0px;padding-right: calc(0.22em + 1em + .78571em * 2) !important;padding-left: 0em !important;background-color: black;color:white;height: 39.97px" width="100%">
 					<div class="text">
-						<div class="ts fluid input">
-							<input type="text" style="border-top-right-radius: 0px;border-bottom-right-radius: 0px;background-color: black;color: white!important;border-color: white!important" placeholder="RemotePlay ID" id="remoteID_tb">
+						<div class="ts fluid input" style="right 1px;bottom:1px">
+							<input type="text" style="border-top-right-radius: 0px;border-bottom-right-radius: 0px;background-color: black;color: white!important;border-color: white!important;border-right:0px" placeholder="RemotePlay ID" id="remoteID_tb">
 						</div>
 					</div>
-					<i class="caret down icon" style="border: 1px solid white;padding: .78571em 1em;border-radius: .28571rem;background-size: .8em;background-repeat: no-repeat;padding-right: calc(1em + .8em * 1.2);line-height: 1.4385em;border-left: 0px;height: 39.97px;right: 3.2%;border-top-left-radius: 0px;border-bottom-left-radius: 0px;top: 0.4vh;"></i>
+					<i class="caret down icon" style="left: auto !important;right: 0em !important;background-color: black;"></i>
 					<div class="menu" style="background-color: black !important;"  id="n_remoteID">
 					</div>
 				</div>
@@ -139,8 +139,14 @@ $(document).ready(function(){
 		e.stopPropagation();
 	});
 	var h = $(".ts.fluid.input").height();
-	$(".caret.down.icon").attr("style",$(".caret.down.icon").attr("style").replace("39.97",h));
-	var previousRemoteID = ao_module_getStorage("remoteplay","remoteID");
+	$(".ts.floating.dropdown.labeled.icon.button").attr("style",$(".ts.floating.dropdown.labeled.icon.button").attr("style").replace("39.97",h));
+	//$(".caret.down.icon").attr("style",$(".caret.down.icon").attr("style").replace("39.97",h));
+	update();
+});
+
+setInterval(update, 10000);
+function update(){
+		var previousRemoteID = ao_module_getStorage("remoteplay","remoteID");
 	$.get("opr.php?opr=scanalive",function(data){
 		var obj = JSON.parse(data);
 		$("#n_remoteID").html("");
@@ -167,7 +173,7 @@ $(document).ready(function(){
 			rid = $(this).val();
 		});
 	});
-});
+}
 
 $("#vol").on("change",function(){
 	sendCommand("setVol",$(this).val());

+ 13 - 7
RemotePlay/remote.php

@@ -40,13 +40,13 @@ if (isset($_GET['comm']) && isset($_GET['rid'])){
     <div class="sub white header">Control your remote player here!</div>
 </div>
 	<p class="white">Target RemotePlay ID</p>
-	<div class="ts dropdown" width="100%">
+	<div class="ts floating dropdown labeled icon button" style="padding: 0px;padding-right: calc(0.22em + 1em + .78571em * 2) !important;padding-left: 0em !important;background-color: black;color:white;height: 39.97px" width="100%">
 		<div class="text">
-			<div class="ts fluid input">
-				<input type="text" style="border-top-right-radius: 0px;border-bottom-right-radius: 0px;background-color: black;color: white!important;border-color: white!important" placeholder="RemotePlay ID" id="remoteID_tb">
+			<div class="ts fluid input" style="right 1px;bottom:1px">
+				<input type="text" style="border-top-right-radius: 0px;border-bottom-right-radius: 0px;background-color: black;color: white!important;border-color: white!important;border-right:0px" placeholder="RemotePlay ID" id="remoteID_tb">
 			</div>
 		</div>
-		<i class="caret down icon" style="border: 1px solid white;padding: .78571em 1em;border-radius: .28571rem;background-size: .8em;background-repeat: no-repeat;padding-right: calc(1em + .8em * 1.2);line-height: 1.4385em;border-left: 0px;height: 39.97px;right: 3.2%;border-top-left-radius: 0px;border-bottom-left-radius: 0px;top: 0.4vh;"></i>
+		<i class="caret down icon" style="left: auto !important;right: 0em !important;background-color: black;"></i>
 		<div class="menu" style="background-color: black !important;"  id="n_remoteID">
 		</div>
 	</div>
@@ -83,8 +83,14 @@ $(document).ready(function(){
 		e.stopPropagation();
 	});
 	var h = $(".ts.fluid.input").height();
-	$(".caret.down.icon").attr("style",$(".caret.down.icon").attr("style").replace("39.97",h));
-	var previousRemoteID = ao_module_getStorage("remoteplay","remoteID");
+	$(".ts.floating.dropdown.labeled.icon.button").attr("style",$(".ts.floating.dropdown.labeled.icon.button").attr("style").replace("39.97",h));
+	//$(".caret.down.icon").attr("style",$(".caret.down.icon").attr("style").replace("39.97",h));
+	update();
+});
+
+setInterval(update, 10000);
+function update(){
+		var previousRemoteID = ao_module_getStorage("remoteplay","remoteID");
 	$.get("opr.php?opr=scanalive",function(data){
 		var obj = JSON.parse(data);
 		$("#n_remoteID").html("");
@@ -111,7 +117,7 @@ $(document).ready(function(){
 			rid = $(this).val();
 		});
 	});
-});
+}
 
 $("#vol").on("change",function(){
 	sendCommand("setVol",$(this).val());