Browse Source

Merge remote-tracking branch 'upstream/main' into ipv6

asmcc 3 years ago
parent
commit
bcbef2dc16

+ 1 - 1
install/deb/templates/web/nginx/php-fpm/owncloud.stpl

@@ -81,7 +81,7 @@ server {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }
 
-    location /vstats/ {
+    location ^~ /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }

+ 1 - 1
install/deb/templates/web/nginx/php-fpm/owncloud.tpl

@@ -76,7 +76,7 @@ server {
         alias   %home%/%user%/web/%domain%/document_errors/;
     }
 
-    location /vstats/ {
+    location ^~ /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }

+ 1 - 1
install/rpm/templates/web/nginx/php-fpm/owncloud.stpl

@@ -73,7 +73,7 @@ server {
         return  404;
     }
 
-    location /vstats/ {
+    location ^~ /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }

+ 1 - 1
install/rpm/templates/web/nginx/php-fpm/owncloud.tpl

@@ -68,7 +68,7 @@ server {
         return  404;
     }
 
-    location /vstats/ {
+    location ^~ /vstats/ {
         alias   %home%/%user%/web/%domain%/stats/;
         include %home%/%user%/web/%domain%/stats/auth.conf*;
     }

+ 2 - 2
web/templates/pages/add_ip.php

@@ -19,7 +19,7 @@
 
 	<form
 		x-data="{
-			showUserTable: <?= empty($v_dedicated) ? "false" : "true" ?>
+			showUserTable: <?= empty($v_dedicated) ? "true" : "false" ?>
 		}"
 		id="vstobjects"
 		name="v_add_ip"
@@ -57,7 +57,7 @@
 					<?= _("Shared") ?>
 				</label>
 			</div>
-			<div x-cloak x-show="showUserTable" id="usrtable">
+			<div x-cloak x-show="!showUserTable" id="usrtable">
 				<div class="u-mb10">
 					<label for="v_owner" class="form-label"><?= _("Assigned user") ?></label>
 					<select class="form-select" name="v_owner" id="v_owner">