Updated network interface icons

build.sh

@@ -43,6 +43,7 @@ rm ../aroz_online_autorelease/system/ao.db
 mv ../aroz_online_autorelease/system/storage.json ../aroz_online_autorelease/system/storage.json.example
 rm -rf ../aroz_online_autorelease/system/aecron/
 rm ../aroz_online_autorelease/system/cron.json
+rm ../aroz_online_autorelease/system/bridge.json
 rm ../aroz_online_autorelease/system/auth/authlog.db
 
 echo "Creating tarball for all required files"

file_system.go

@@ -737,8 +737,19 @@ func system_fs_WebSocketScanTrashBin(w http.ResponseWriter, r *http.Request) {
 	scanningRoots := []string{}
 	//Get all roots to scan
 	for _, storage := range userinfo.GetAllFileSystemHandler() {
-		storageRoot := storage.Path
-		scanningRoots = append(scanningRoots, storageRoot)
+		if storage.Hierarchy == "backup" {
+			//Skip this fsh
+			continue
+		}
+
+		if storage.Hierarchy == "user" {
+			storageRoot := filepath.ToSlash(filepath.Join(storage.Path, "users", userinfo.Username))
+			scanningRoots = append(scanningRoots, storageRoot)
+		} else {
+			storageRoot := storage.Path
+			scanningRoots = append(scanningRoots, storageRoot)
+		}
+
 	}
 
 	for _, rootPath := range scanningRoots {
@@ -929,8 +940,19 @@ func system_fs_listTrash(username string) ([]string, error) {
 	scanningRoots := []string{}
 	//Get all roots to scan
 	for _, storage := range userinfo.GetAllFileSystemHandler() {
-		storageRoot := storage.Path
-		scanningRoots = append(scanningRoots, storageRoot)
+		if storage.Hierarchy == "backup" {
+			//Skip this fsh
+			continue
+		}
+
+		if storage.Hierarchy == "user" {
+			storageRoot := filepath.ToSlash(filepath.Join(storage.Path, "users", userinfo.Username))
+			scanningRoots = append(scanningRoots, storageRoot)
+		} else {
+			storageRoot := storage.Path
+			scanningRoots = append(scanningRoots, storageRoot)
+		}
+
 	}
 
 	files := []string{}

reverseproxy.go

@@ -16,6 +16,7 @@ var (
 
 //Add user customizable reverse proxy
 func ReverseProxtInit() {
+	return //Disabled in v1.115 release
 	dprouter, err := dynamicproxy.NewDynamicProxy(80)
 	if err != nil {
 		log.Println(err.Error())

startup.go

@@ -99,5 +99,4 @@ func RunStartup() {
 
 	//Finally
 	moduleHandler.ModuleSortList() //Sort the system module list
-
 }

web/SystemAO/boot/poweroff.html

@@ -35,7 +35,7 @@
                 <p><i class="checkmark icon"></i> <span id="succmsg"></span></p>
             </div>
             <div class="ui divider"></div>
-            <div class="ui icon yellow message">
+            <div class="ui icon message">
                 <i class="yellow exclamation circle icon"></i>
                 <div class="content">
                     <div class="header">

web/SystemAO/network/hardware.html

@@ -41,6 +41,12 @@
                 return "ethernet.svg";
             }else if (nicname.substr(0,3) == "wlp" || nicname.substr(0,4) == "wlan"){
                 return "wifi.svg";
+            }else if (nicname.includes("isatap")){
+                return "isatap.svg";
+            }else if (nicname.includes("hamachi") || nicname.includes("zerotier") || nicname.includes("openvpn")){
+                return "vpn.svg";
+            }else if (nicname.includes("hyper-v") || nicname.includes("virtualbox")){
+                return "virtualize.svg";
             }
             return "Unknown.png"
         }

web/SystemAO/network/img/isatap.svg

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="圖層_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<path fill="none" stroke="#231815" stroke-width="3" stroke-miterlimit="10" d="M6.334,15.848"/>
+<path fill="none" stroke="#231815" stroke-width="3" stroke-miterlimit="10" d="M125.834,31.75"/>
+<path fill="none" stroke="#FFFFFF" stroke-miterlimit="10" d="M90.632,20.568"/>
+<path fill="none" stroke="#FFFFFF" stroke-miterlimit="10" d="M35.703,37.926"/>
+<path fill="none" stroke="#FFFFFF" stroke-miterlimit="10" d="M90.632,37.926"/>
+<g>
+	<path fill="#231815" d="M61.828,84.504h2.146v8.923h-2.146V84.504z"/>
+	<path fill="#231815" d="M65.465,92.312l1.211-1.476c0.636,0.54,1.463,0.912,2.171,0.912c0.792,0,1.163-0.3,1.163-0.78
+		c0-0.516-0.492-0.684-1.26-1.007l-1.139-0.48c-0.936-0.371-1.811-1.151-1.811-2.446c0-1.499,1.343-2.698,3.238-2.698
+		c1.031,0,2.122,0.396,2.902,1.175l-1.068,1.344c-0.588-0.444-1.139-0.684-1.834-0.684c-0.66,0-1.068,0.264-1.068,0.743
+		c0,0.492,0.564,0.684,1.355,0.996l1.115,0.443c1.104,0.443,1.764,1.188,1.764,2.446c0,1.487-1.248,2.795-3.406,2.795
+		C67.635,93.595,66.388,93.163,65.465,92.312z"/>
+	<path fill="#231815" d="M77.905,91.376h-2.638l-0.516,2.051h-2.184l2.771-8.923h2.566l2.771,8.923h-2.256L77.905,91.376z
+		 M77.498,89.721l-0.192-0.756c-0.239-0.887-0.468-1.954-0.707-2.866h-0.048c-0.217,0.936-0.456,1.979-0.684,2.866l-0.192,0.756
+		H77.498z"/>
+	<path fill="#231815" d="M82.312,86.278H79.9v-1.774h6.98v1.774h-2.423v7.148h-2.146V86.278z"/>
+	<path fill="#231815" d="M91.922,91.376h-2.639l-0.516,2.051h-2.183l2.77-8.923h2.567l2.771,8.923h-2.255L91.922,91.376z
+		 M91.515,89.721l-0.192-0.756c-0.24-0.887-0.468-1.954-0.708-2.866h-0.048c-0.216,0.936-0.456,1.979-0.684,2.866l-0.192,0.756
+		H91.515z"/>
+	<path fill="#231815" d="M95.632,84.504h3.131c1.967,0,3.586,0.695,3.586,2.902c0,2.123-1.644,3.059-3.526,3.059h-1.044v2.962
+		h-2.146V84.504z M98.714,88.773c1.044,0,1.548-0.492,1.548-1.367c0-0.899-0.576-1.212-1.607-1.212h-0.876v2.579H98.714z"/>
+</g>
+<line fill="none" stroke="#231815" stroke-width="8" stroke-miterlimit="10" x1="27.641" y1="44.098" x2="96.016" y2="44.098"/>
+<line fill="none" stroke="#231815" stroke-width="8" stroke-miterlimit="10" x1="32.016" y1="76.348" x2="101.953" y2="76.348"/>
+<polygon fill="#231815" stroke="#231815" stroke-width="4" stroke-miterlimit="10" points="91.064,34.83 102.966,44.098 
+	91.064,53.366 "/>
+<polygon fill="#231815" stroke="#231815" stroke-width="4" stroke-miterlimit="10" points="39.542,85.615 27.641,76.348 
+	39.542,67.08 "/>
+</svg>

web/SystemAO/network/img/virtualize.svg

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="圖層_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="128px" height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g>
+	<g>
+		<line fill="none" stroke="#231815" stroke-width="6" stroke-miterlimit="10" x1="26.875" y1="47.875" x2="29.375" y2="47.875"/>
+		
+			<line fill="none" stroke="#231815" stroke-width="6" stroke-miterlimit="10" stroke-dasharray="4.875,4.875" x1="34.25" y1="47.875" x2="90.313" y2="47.875"/>
+		<line fill="none" stroke="#231815" stroke-width="6" stroke-miterlimit="10" x1="92.75" y1="47.875" x2="95.25" y2="47.875"/>
+	</g>
+</g>
+<g>
+	<g>
+		<line fill="none" stroke="#231815" stroke-width="6" stroke-miterlimit="10" x1="31.25" y1="80.125" x2="33.75" y2="80.125"/>
+		
+			<line fill="none" stroke="#231815" stroke-width="6" stroke-miterlimit="10" stroke-dasharray="4.9952,4.9952" x1="38.745" y1="80.125" x2="96.189" y2="80.125"/>
+		<line fill="none" stroke="#231815" stroke-width="6" stroke-miterlimit="10" x1="98.688" y1="80.125" x2="101.188" y2="80.125"/>
+	</g>
+</g>
+<polygon fill="#231815" stroke="#231815" stroke-width="4" stroke-miterlimit="10" points="90.299,38.607 102.2,47.875 
+	90.299,57.143 "/>
+<polygon fill="#231815" stroke="#231815" stroke-width="4" stroke-miterlimit="10" points="38.776,89.393 26.875,80.125 
+	38.776,70.857 "/>
+</svg>

web/SystemAO/network/img/vpn.svg

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="128px"
+	 height="128px" viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<g id="圖層_1">
+	<line fill="none" stroke="#231815" stroke-width="8" stroke-miterlimit="10" x1="26.875" y1="47.875" x2="95.25" y2="47.875"/>
+	<line fill="none" stroke="#231815" stroke-width="8" stroke-miterlimit="10" x1="31.25" y1="80.125" x2="101.188" y2="80.125"/>
+	<polygon fill="#231815" stroke="#231815" stroke-width="4" stroke-miterlimit="10" points="90.299,38.607 102.2,47.875 
+		90.299,57.143 	"/>
+	<polygon fill="#231815" stroke="#231815" stroke-width="4" stroke-miterlimit="10" points="38.776,89.393 26.875,80.125 
+		38.776,70.857 	"/>
+</g>
+<g id="圖層_2">
+	<path fill="#231815" stroke="#FFFFFF" stroke-width="2" stroke-miterlimit="10" d="M108.305,89.832c0,1.887-1.47,3.417-3.285,3.417
+		H89.84c-1.815,0-3.285-1.53-3.285-3.417V78.986c0-1.887,1.47-3.417,3.285-3.417h15.18c1.815,0,3.285,1.53,3.285,3.417V89.832z"/>
+	<path fill="none" stroke="#231815" stroke-width="3" stroke-miterlimit="10" d="M104.388,78.206v-7.458
+		c0-3.132-2.629-5.666-6.958-5.666c-3.478,0-7.167,2.534-7.167,5.666v7.458"/>
+	<line fill="none" stroke="#231815" stroke-width="3" stroke-miterlimit="10" x1="90.732" y1="68.595" x2="90.734" y2="68.596"/>
+</g>
+</svg>