Просмотр исходного кода

Replaced .system with .html file extension

- Deprecated the use of .system file extension
- Updated tftp icon in system settings
Toby Chui 3 недель назад
Родитель
Сommit
ea2529f385

+ 2 - 2
src/auth.go

@@ -32,9 +32,9 @@ func AuthInit() {
 
 
 	//Create an Authentication Agent
 	//Create an Authentication Agent
 	authAgent = auth.NewAuthenticationAgent("ao_auth", []byte(*session_key), sysdb, *allow_public_registry, func(w http.ResponseWriter, r *http.Request) {
 	authAgent = auth.NewAuthenticationAgent("ao_auth", []byte(*session_key), sysdb, *allow_public_registry, func(w http.ResponseWriter, r *http.Request) {
-		//Login Redirection Handler, redirect it login.system
+		//Login Redirection Handler, redirect it login.html
 		w.Header().Set("Cache-Control", "no-cache, no-store, no-transform, must-revalidate, private, max-age=0")
 		w.Header().Set("Cache-Control", "no-cache, no-store, no-transform, must-revalidate, private, max-age=0")
-		http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.system")+"?redirect="+r.URL.Path, http.StatusTemporaryRedirect)
+		http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.html")+"?redirect="+r.URL.Path, http.StatusTemporaryRedirect)
 	})
 	})
 
 
 	if *allow_autologin {
 	if *allow_autologin {

+ 1 - 1
src/ldap.go

@@ -44,6 +44,6 @@ func ldapInit() {
 	http.HandleFunc("/system/auth/ldap/login", ldapHandler.HandleLogin)
 	http.HandleFunc("/system/auth/ldap/login", ldapHandler.HandleLogin)
 	http.HandleFunc("/system/auth/ldap/setPassword", ldapHandler.HandleSetPassword)
 	http.HandleFunc("/system/auth/ldap/setPassword", ldapHandler.HandleSetPassword)
 	http.HandleFunc("/system/auth/ldap/newPassword", ldapHandler.HandleNewPasswordPage)
 	http.HandleFunc("/system/auth/ldap/newPassword", ldapHandler.HandleNewPasswordPage)
-	http.HandleFunc("/ldapLogin.system", ldapHandler.HandleLoginPage)
+	http.HandleFunc("/ldapLogin.html", ldapHandler.HandleLoginPage)
 	http.HandleFunc("/system/auth/ldap/checkldap", ldapHandler.HandleCheckLDAP)
 	http.HandleFunc("/system/auth/ldap/checkldap", ldapHandler.HandleCheckLDAP)
 }
 }

+ 8 - 8
src/main.router.go

@@ -4,7 +4,7 @@ package main
 	ArOZ Online System Main Request Router
 	ArOZ Online System Main Request Router
 
 
 	This is used to check authentication before actually serving file to the target client
 	This is used to check authentication before actually serving file to the target client
-	This function also handle the special page (login.system and user.system) delivery
+	This function also handle the special page (login.html and user.html) delivery
 */
 */
 
 
 import (
 import (
@@ -27,7 +27,7 @@ func mrouter(h http.Handler) http.Handler {
 		if r.URL.Path == "/favicon.ico" || r.URL.Path == "/manifest.webmanifest" || r.URL.Path == "/robots.txt" || r.URL.Path == "/humans.txt" {
 		if r.URL.Path == "/favicon.ico" || r.URL.Path == "/manifest.webmanifest" || r.URL.Path == "/robots.txt" || r.URL.Path == "/humans.txt" {
 			//Serving web specification files. Allow no auth access.
 			//Serving web specification files. Allow no auth access.
 			h.ServeHTTP(w, r)
 			h.ServeHTTP(w, r)
-		} else if r.URL.Path == "/login.system" {
+		} else if r.URL.Path == "/login.html" {
 			//Login page. Require special treatment for template.
 			//Login page. Require special treatment for template.
 			//Get the redirection address from the request URL
 			//Get the redirection address from the request URL
 			red, _ := utils.GetPara(r, "redirect")
 			red, _ := utils.GetPara(r, "redirect")
@@ -38,7 +38,7 @@ func mrouter(h http.Handler) http.Handler {
 				imgsrc = "./web/img/public/auth_icon.png"
 				imgsrc = "./web/img/public/auth_icon.png"
 			}
 			}
 			imageBase64, _ := utils.LoadImageAsBase64(imgsrc)
 			imageBase64, _ := utils.LoadImageAsBase64(imgsrc)
-			parsedPage, err := utils.Templateload("web/login.system", map[string]string{
+			parsedPage, err := utils.Templateload("web/login.html", map[string]string{
 				"redirection_addr": red,
 				"redirection_addr": red,
 				"usercount":        strconv.Itoa(authAgent.GetUserCounts()),
 				"usercount":        strconv.Itoa(authAgent.GetUserCounts()),
 				"service_logo":     imageBase64,
 				"service_logo":     imageBase64,
@@ -49,10 +49,10 @@ func mrouter(h http.Handler) http.Handler {
 			}
 			}
 			w.Header().Add("Content-Type", "text/html; charset=UTF-8")
 			w.Header().Add("Content-Type", "text/html; charset=UTF-8")
 			w.Write([]byte(parsedPage))
 			w.Write([]byte(parsedPage))
-		} else if r.URL.Path == "/reset.system" && authAgent.GetUserCounts() > 0 {
+		} else if r.URL.Path == "/reset.html" && authAgent.GetUserCounts() > 0 {
 			//Password restart page. Allow access only when user number > 0
 			//Password restart page. Allow access only when user number > 0
 			system_resetpw_handlePasswordReset(w, r)
 			system_resetpw_handlePasswordReset(w, r)
-		} else if r.URL.Path == "/user.system" && authAgent.GetUserCounts() == 0 {
+		} else if r.URL.Path == "/user.html" && authAgent.GetUserCounts() == 0 {
 			//Serve user management page. This only allows serving of such page when the total usercount = 0 (aka System Initiation)
 			//Serve user management page. This only allows serving of such page when the total usercount = 0 (aka System Initiation)
 			h.ServeHTTP(w, r)
 			h.ServeHTTP(w, r)
 
 
@@ -102,7 +102,7 @@ func mrouter(h http.Handler) http.Handler {
 			} else {
 			} else {
 				interfaceModule := userinfo.GetInterfaceModules()
 				interfaceModule := userinfo.GetInterfaceModules()
 				if len(interfaceModule) == 1 && interfaceModule[0] == "Desktop" {
 				if len(interfaceModule) == 1 && interfaceModule[0] == "Desktop" {
-					http.Redirect(w, r, "./desktop.system", http.StatusTemporaryRedirect)
+					http.Redirect(w, r, "./desktop.html", http.StatusTemporaryRedirect)
 				} else if len(interfaceModule) == 1 {
 				} else if len(interfaceModule) == 1 {
 					//User with default interface module not desktop
 					//User with default interface module not desktop
 					modileInfo := moduleHandler.GetModuleInfoByID(interfaceModule[0])
 					modileInfo := moduleHandler.GetModuleInfoByID(interfaceModule[0])
@@ -120,7 +120,7 @@ func mrouter(h http.Handler) http.Handler {
 					http.Redirect(w, r, "./SystemAO/boot/no_interfaceing.html", http.StatusTemporaryRedirect)
 					http.Redirect(w, r, "./SystemAO/boot/no_interfaceing.html", http.StatusTemporaryRedirect)
 				} else {
 				} else {
 					//For unknown operations, send it to desktop
 					//For unknown operations, send it to desktop
-					http.Redirect(w, r, "./desktop.system", http.StatusTemporaryRedirect)
+					http.Redirect(w, r, "./desktop.html", http.StatusTemporaryRedirect)
 				}
 				}
 			}
 			}
 		} else if ((len(r.URL.Path) >= 5 && r.URL.Path[:5] == "/www/") || r.URL.Path == "/www") && *allow_homepage {
 		} else if ((len(r.URL.Path) >= 5 && r.URL.Path[:5] == "/www/") || r.URL.Path == "/www") && *allow_homepage {
@@ -184,7 +184,7 @@ func mrouter(h http.Handler) http.Handler {
 				//Other paths
 				//Other paths
 				//Rediect to login page
 				//Rediect to login page
 				w.Header().Set("Cache-Control", "no-cache, no-store, no-transform, must-revalidate, private, max-age=0")
 				w.Header().Set("Cache-Control", "no-cache, no-store, no-transform, must-revalidate, private, max-age=0")
-				http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.system")+"?redirect="+r.URL.String(), 307)
+				http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.html")+"?redirect="+r.URL.String(), 307)
 			}
 			}
 
 
 		}
 		}

+ 1 - 1
src/mod/auth/ldap/web_login.go

@@ -26,7 +26,7 @@ func (ldap *ldapHandler) HandleLoginPage(w http.ResponseWriter, r *http.Request)
 		imgsrc = "./web/img/public/auth_icon.png"
 		imgsrc = "./web/img/public/auth_icon.png"
 	}
 	}
 	imageBase64, _ := utils.LoadImageAsBase64(imgsrc)
 	imageBase64, _ := utils.LoadImageAsBase64(imgsrc)
-	parsedPage, err := utils.Templateload("web/login.system", map[string]string{
+	parsedPage, err := utils.Templateload("web/login.html", map[string]string{
 		"redirection_addr": red,
 		"redirection_addr": red,
 		"usercount":        strconv.Itoa(ldap.ag.GetUserCounts()),
 		"usercount":        strconv.Itoa(ldap.ag.GetUserCounts()),
 		"service_logo":     imageBase64,
 		"service_logo":     imageBase64,

+ 1 - 1
src/mod/auth/oauth2/oauth2.go

@@ -134,7 +134,7 @@ func (oh *OauthHandler) HandleAuthorize(w http.ResponseWriter, r *http.Request)
 		//also makr the login as fail.
 		//also makr the login as fail.
 		if oh.reg.AllowRegistry {
 		if oh.reg.AllowRegistry {
 			oh.ag.Logger.LogAuthByRequestInfo(username, r.RemoteAddr, time.Now().Unix(), false, "web")
 			oh.ag.Logger.LogAuthByRequestInfo(username, r.RemoteAddr, time.Now().Unix(), false, "web")
-			http.Redirect(w, r, "/public/register/register.system?user="+username, http.StatusFound)
+			http.Redirect(w, r, "/public/register/register.html?user="+username, http.StatusFound)
 		} else {
 		} else {
 			oh.ag.Logger.LogAuthByRequestInfo(username, r.RemoteAddr, time.Now().Unix(), false, "web")
 			oh.ag.Logger.LogAuthByRequestInfo(username, r.RemoteAddr, time.Now().Unix(), false, "web")
 			w.Header().Set("Content-Type", "text/html")
 			w.Header().Set("Content-Type", "text/html")

+ 2 - 2
src/mod/auth/register/register.go

@@ -97,12 +97,12 @@ func (h *RegisterHandler) HandleRegisterInterface(w http.ResponseWriter, r *http
 		//Load the vendor icon as base64
 		//Load the vendor icon as base64
 		imagecontent, _ := readImageFileAsBase64(h.options.VendorIcon)
 		imagecontent, _ := readImageFileAsBase64(h.options.VendorIcon)
 
 
-		s, err := utils.Templateload("./system/auth/register.system", map[string]string{
+		s, err := utils.Templateload("./system/auth/register.html", map[string]string{
 			"host_name":   h.options.Hostname,
 			"host_name":   h.options.Hostname,
 			"vendor_logo": imagecontent,
 			"vendor_logo": imagecontent,
 		})
 		})
 		if err != nil {
 		if err != nil {
-			log.Println("Template not found: system/auth/register.system")
+			log.Println("Template not found: system/auth/register.html")
 			http.NotFound(w, r)
 			http.NotFound(w, r)
 			return
 			return
 		}
 		}

+ 5 - 4
src/mod/share/share.go

@@ -390,7 +390,7 @@ func (s *Manager) HandleShareAccess(w http.ResponseWriter, r *http.Request) {
 					w.WriteHeader(http.StatusUnauthorized)
 					w.WriteHeader(http.StatusUnauthorized)
 					w.Write([]byte("401 - Unauthorized"))
 					w.Write([]byte("401 - Unauthorized"))
 				} else {
 				} else {
-					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.system")+"?redirect=/share/"+id, 307)
+					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.html")+"?redirect=/share/"+id, 307)
 				}
 				}
 				return
 				return
 			} else {
 			} else {
@@ -403,7 +403,7 @@ func (s *Manager) HandleShareAccess(w http.ResponseWriter, r *http.Request) {
 					w.WriteHeader(http.StatusUnauthorized)
 					w.WriteHeader(http.StatusUnauthorized)
 					w.Write([]byte("401 - Unauthorized"))
 					w.Write([]byte("401 - Unauthorized"))
 				} else {
 				} else {
-					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.system")+"?redirect=/share/"+id, 307)
+					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.html")+"?redirect=/share/"+id, 307)
 				}
 				}
 				return
 				return
 			}
 			}
@@ -443,7 +443,7 @@ func (s *Manager) HandleShareAccess(w http.ResponseWriter, r *http.Request) {
 					w.WriteHeader(http.StatusUnauthorized)
 					w.WriteHeader(http.StatusUnauthorized)
 					w.Write([]byte("401 - Unauthorized"))
 					w.Write([]byte("401 - Unauthorized"))
 				} else {
 				} else {
-					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.system")+"?redirect=/share/"+id, 307)
+					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.html")+"?redirect=/share/"+id, 307)
 				}
 				}
 				return
 				return
 			}
 			}
@@ -468,7 +468,7 @@ func (s *Manager) HandleShareAccess(w http.ResponseWriter, r *http.Request) {
 					w.WriteHeader(http.StatusUnauthorized)
 					w.WriteHeader(http.StatusUnauthorized)
 					w.Write([]byte("401 - Unauthorized"))
 					w.Write([]byte("401 - Unauthorized"))
 				} else {
 				} else {
-					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.system")+"?redirect=/share/"+id, 307)
+					http.Redirect(w, r, utils.ConstructRelativePathFromRequestURL(r.RequestURI, "login.html")+"?redirect=/share/"+id, 307)
 				}
 				}
 				return
 				return
 			}
 			}
@@ -1417,3 +1417,4 @@ func getPathHashFromUsernameAndVpath(userinfo *user.User, vpath string) (string,
 	}
 	}
 	return shareEntry.GetPathHash(fsh, vpath, userinfo.Username)
 	return shareEntry.GetPathHash(fsh, vpath, userinfo.Username)
 }
 }
+

+ 1 - 1
src/network.go

@@ -450,7 +450,7 @@ func FileServerInit() {
 		ID:                "tftp",
 		ID:                "tftp",
 		Name:              "TFTP",
 		Name:              "TFTP",
 		Desc:              "Trivial File Transfer Protocol Server",
 		Desc:              "Trivial File Transfer Protocol Server",
-		IconPath:          "img/system/network-folder.svg",
+		IconPath:          "img/system/network-folder-black.svg",
 		DefaultPorts:      []int{69},
 		DefaultPorts:      []int{69},
 		Ports:             []int{},
 		Ports:             []int{},
 		ForwardPortIfUpnp: false,
 		ForwardPortIfUpnp: false,

+ 2 - 2
src/register.go

@@ -37,8 +37,8 @@ func RegisterSystemInit() {
 		registerHandler.AllowRegistry = false
 		registerHandler.AllowRegistry = false
 	}
 	}
 
 
-	http.HandleFunc("/public/register/register.system", registerHandler.HandleRegisterInterface)
-	http.HandleFunc("/public/register/handleRegister.system", registerHandler.HandleRegisterRequest)
+	http.HandleFunc("/public/register/register.html", registerHandler.HandleRegisterInterface)
+	http.HandleFunc("/public/register/handleRegister.html", registerHandler.HandleRegisterRequest)
 	http.HandleFunc("/public/register/checkPublicRegister", registerHandler.HandleRegisterCheck)
 	http.HandleFunc("/public/register/checkPublicRegister", registerHandler.HandleRegisterCheck)
 
 
 	//General user functions
 	//General user functions

+ 0 - 0
src/system/auth/register.system → src/system/auth/register.html


+ 2 - 2
src/web/SystemAO/boot/interface_selector.html

@@ -71,7 +71,7 @@
                         var targetPath = mod.StartDir;
                         var targetPath = mod.StartDir;
                         if (targetPath == ""){
                         if (targetPath == ""){
                             //Redirect to desktop
                             //Redirect to desktop
-                            window.location.href = "../../desktop.system";
+                            window.location.href = "../../desktop.html";
                         }else{
                         }else{
                             //Redirect to module
                             //Redirect to module
                             window.location.href = "../../" + targetPath;
                             window.location.href = "../../" + targetPath;
@@ -89,7 +89,7 @@
             }
             }
             if (path == ""){
             if (path == ""){
                 //Redirect to desktop
                 //Redirect to desktop
-                window.location.href = "../../desktop.system";
+                window.location.href = "../../desktop.html";
             }else{
             }else{
                 //Redirect to module
                 //Redirect to module
                 window.location.href = "../../" + path;
                 window.location.href = "../../" + path;

+ 7 - 3
src/web/SystemAO/system_setting/index.html

@@ -119,6 +119,9 @@
                             
                             
                     });
                     });
 
 
+                }else{
+                    //No hash, load default Info page
+                    initSettingGroup("Info");
                 }
                 }
                  pageStateRestored = true;
                  pageStateRestored = true;
             }
             }
@@ -129,11 +132,12 @@
                 initMainSideMenu(function(){
                 initMainSideMenu(function(){
                     //Menu is now loaded
                     //Menu is now loaded
                     hideToolBar();
                     hideToolBar();
-                     if (!pageStateRestored){
+                    if (!pageStateRestored){
                         restorePageFromHash();
                         restorePageFromHash();
-                    }else{
-                        initSettingGroup("Info");
+                        return;
                     }
                     }
+
+                    initSettingGroup("Info");
                 });
                 });
             });
             });
  
  

+ 1 - 1
src/web/SystemAO/users/editUser.html

@@ -236,7 +236,7 @@
                             initContents();
                             initContents();
                             $("#confirmUpdate").stop().finish().slideDown('fast').delay(3000).slideUp('fast');
                             $("#confirmUpdate").stop().finish().slideDown('fast').delay(3000).slideUp('fast');
                             console.log(data);
                             console.log(data);
-                            $("#tmppw").val(location.protocol + '//' + location.host + "/reset.system?acc=" + username +  "&rkey=" + data);
+                            $("#tmppw").val(location.protocol + '//' + location.host + "/reset.html?acc=" + username +  "&rkey=" + data);
                             $("#tmppwui").slideDown('fast');
                             $("#tmppwui").slideDown('fast');
                         }
                         }
                     }
                     }

+ 1 - 1
src/web/SystemAO/users/userList.html

@@ -322,7 +322,7 @@
 
 
             function showNewUserUI(){
             function showNewUserUI(){
                 ao_module_newfw({
                 ao_module_newfw({
-                    url: "user.system",
+                    url: "user.html",
                     width: 530,
                     width: 530,
                     height: 740,
                     height: 740,
                     appicon: "SystemAO/users/img/user-white.svg",
                     appicon: "SystemAO/users/img/user-white.svg",

+ 1 - 1
src/web/SystemAO/www/index_legacy.html

@@ -23,7 +23,7 @@
         <!-- Main website content goes here-->
         <!-- Main website content goes here-->
         <br><br>
         <br><br>
         <div class="ui container">
         <div class="ui container">
-            <a class="ui black right floated button" href="../login.system"><i class="key icon"></i>Login</a>
+            <a class="ui black right floated button" href="../login.html"><i class="key icon"></i>Login</a>
             <h1>My Home</h1>
             <h1>My Home</h1>
             <div class="ui divider"></div>
             <div class="ui divider"></div>
             <div class="ui two column stackable grid">
             <div class="ui two column stackable grid">

+ 2 - 2
src/web/desktop.system → src/web/desktop.html

@@ -1094,7 +1094,7 @@
     <script>
     <script>
         //Force redirection if it is on mobile
         //Force redirection if it is on mobile
         if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
         if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
-            window.location.href = "mobile.system";
+            window.location.href = "mobile.html";
         }
         }
     </script>
     </script>
 </head>
 </head>
@@ -2025,7 +2025,7 @@
                     console.log("Unable to open module " + moduleName);
                     console.log("Unable to open module " + moduleName);
                     if (data.error == "Not logged in."){
                     if (data.error == "Not logged in."){
                         //Session expired
                         //Session expired
-                        window.location.href = "login.system";
+                        window.location.href = "login.html";
                     }
                     }
                 } else {
                 } else {
                     //Launch the given module
                     //Launch the given module

Разница между файлами не показана из-за своего большого размера
+ 27 - 0
src/web/img/system/network-folder-black.ai


+ 23 - 0
src/web/img/system/network-folder-black.svg

@@ -0,0 +1,23 @@
+<?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="圖層_2">
+	<polygon points="110.998,23.424 110.998,84.064 17.001,84.064 17.001,13.652 48.449,13.469 55.315,23.669 	"/>
+</g>
+<g id="圖層_3">
+	<polygon fill="#3E3A39" points="110.998,84.064 17.001,84.064 17.087,31.401 110.57,31.401 	"/>
+	<g>
+		<path fill="#FFFFFF" d="M41.777,55.843l7.216-2.331l5.772-1.998v-0.148l-5.772-1.999l-7.216-2.331v-5.402l19.648,7.548v4.515
+			l-19.648,7.548V55.843z"/>
+		<path fill="#FFFFFF" d="M63.385,67.869h20.128v3.662H63.385V67.869z"/>
+	</g>
+</g>
+<g id="圖層_4">
+	<rect x="17.001" y="103.51" fill="#443F5D" width="93.997" height="4.691"/>
+	<rect x="60.985" y="84.064" fill="#443F5D" width="6.029" height="19.445"/>
+	<path fill="#55516E" d="M72.935,110.512c0,2.221-1.8,4.02-4.021,4.02h-9.827c-2.221,0-4.021-1.799-4.021-4.02v-9.828
+		c0-2.221,1.8-4.021,4.021-4.021h9.827c2.221,0,4.021,1.801,4.021,4.021V110.512z"/>
+</g>
+</svg>

+ 0 - 0
src/web/login.system → src/web/login.html


+ 0 - 0
src/web/mobile.system → src/web/mobile.html


+ 0 - 0
src/web/reset.system → src/web/reset.html


+ 101 - 100
src/web/robots.txt

@@ -3,74 +3,74 @@
 # If you want SEO on your cloud system, remove this file from the web root.
 # If you want SEO on your cloud system, remove this file from the web root.
 
 
 User-agent: Applebot
 User-agent: Applebot
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: baiduspider
 User-agent: baiduspider
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: Bingbot
 User-agent: Bingbot
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: Discordbot
 User-agent: Discordbot
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: facebookexternalhit
 User-agent: facebookexternalhit
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: Googlebot
 User-agent: Googlebot
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
@@ -79,58 +79,58 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: ia_archiver
 User-agent: ia_archiver
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: LinkedInBot
 User-agent: LinkedInBot
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: msnbot
 User-agent: msnbot
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
 User-agent: Naverbot
 User-agent: Naverbot
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
@@ -139,11 +139,11 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: seznambot
 User-agent: seznambot
@@ -151,11 +151,11 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: Slurp
 User-agent: Slurp
@@ -163,11 +163,11 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: teoma
 User-agent: teoma
@@ -175,11 +175,11 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: TelegramBot
 User-agent: TelegramBot
@@ -188,11 +188,11 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: Twitterbot
 User-agent: Twitterbot
@@ -200,11 +200,11 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: Yandex
 User-agent: Yandex
@@ -212,11 +212,11 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: Yeti
 User-agent: Yeti
@@ -224,22 +224,23 @@ Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /img/
 Disallow: /img/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /login.system
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /login.html
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 
 
 User-agent: *
 User-agent: *
-Allow: /login.system
+Allow: /login.html
 Disallow: /SystemAO/
 Disallow: /SystemAO/
 Disallow: /system/
 Disallow: /system/
 Disallow: /index.html
 Disallow: /index.html
-Disallow: /mobile.system
-Disallow: /desktop.system
-Disallow: /reset.system
-Disallow: /user.system
+Disallow: /mobile.html
+Disallow: /desktop.html
+Disallow: /reset.html
+Disallow: /user.html
 Disallow: /homepage/
 Disallow: /homepage/
 Disallow: /fileview/
 Disallow: /fileview/
 
 
+

+ 1 - 1
src/web/user.system → src/web/user.html

@@ -165,7 +165,7 @@
                                     window.location.href = "SystemAO/closeTabInsturction.html"
                                     window.location.href = "SystemAO/closeTabInsturction.html"
                                 }
                                 }
                             }else{
                             }else{
-                                window.location.href = "/login.system";
+                                window.location.href = "/login.html";
                             }
                             }
                         });
                         });
                        
                        

Некоторые файлы не были показаны из-за большого количества измененных файлов