Ver código fonte

Enhanced support for both BIN and HEX filename

Yeung Alan 5 anos atrás
pai
commit
f9d1140b61
2 arquivos alterados com 11 adições e 3 exclusões
  1. 1 1
      Photo/index.js
  2. 10 2
      Photo/index.php

+ 1 - 1
Photo/index.js

@@ -34,7 +34,7 @@
 		  }
 		  //Update the folder path shown on file explorer (?
 		  if (folder_path != ""){
-				$('#folderdir').html(folder_path);
+				$('#folderdir').html(ao_module_codec.decodeHexFoldername(folder_path));
 		  }else{
 				$('#folderdir').html('Unsorted');
 		  }

+ 10 - 2
Photo/index.php

@@ -119,9 +119,17 @@ include '../auth.php';
 				foreach ($dirs as $folder){
 						$folder = str_replace("storage/","",$folder);
 						if ($folderpath == $folder){
-							echo "<a class='active item' Onclick='changeFolderView(".'"' . $folder . '"'.")'>".hex2bin($folder).'</a>';	
+							if(ctype_xdigit($folder)){
+								echo "<a class='active item' Onclick='changeFolderView(".'"' . $folder . '"'.")'>".hex2bin($folder).'</a>';
+							}else{
+								echo "<a class='active item' Onclick='changeFolderView(".'"' . $folder . '"'.")'>".$folder.'</a>';
+							}
 						}else{
-							echo "<a class='item' Onclick='changeFolderView(".'"' . $folder . '"'.")'>".hex2bin($folder).'</a>';
+							if(ctype_xdigit($folder)){
+								echo "<a class='item' Onclick='changeFolderView(".'"' . $folder . '"'.")'>".hex2bin($folder).'</a>';
+							}else{
+								echo "<a class='item' Onclick='changeFolderView(".'"' . $folder . '"'.")'>".$folder.'</a>';
+							}
 						}
 				}
 			?>