From 6ea91af7059517b440ef914325b4da04e675ce44 Mon Sep 17 00:00:00 2001
From: witersen <1801168257@qq.com>
Date: Sat, 30 Jul 2022 02:40:41 +0800
Subject: [PATCH] =?UTF-8?q?v2.3.3=E5=8F=91=E5=B8=83=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=96=87=E4=BB=B6=E6=88=96=E6=96=87=E4=BB=B6=E5=A4=B9?=
 =?UTF-8?q?=E4=B8=AD=E5=AD=98=E5=9C=A8=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E6=97=B6=E9=80=A0=E6=88=90=E7=9A=84=E6=9D=83=E9=99=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 01.web/src/views/advance/index.vue |  2 +-
 01.web/src/views/login/index.vue   |  2 +-
 02.php/app/util/SVNAdmin/Rep.php   | 24 ++++++++++++------------
 02.php/config/version.php          |  2 +-
 README.md                          |  2 +-
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/01.web/src/views/advance/index.vue b/01.web/src/views/advance/index.vue
index 37bdb5e..b0e419c 100644
--- a/01.web/src/views/advance/index.vue
+++ b/01.web/src/views/advance/index.vue
@@ -597,7 +597,7 @@ export default {
        * 版本信息
        */
       version: {
-        current_verson: "2.3.2",
+        current_verson: "2.3.3",
         php_version: "5.5 <= PHP < 8.0",
         database: "MYSQL、SQLite",
         github: "https://github.com/witersen/SvnAdminV2.0",
diff --git a/01.web/src/views/login/index.vue b/01.web/src/views/login/index.vue
index 25b16e1..943168d 100644
--- a/01.web/src/views/login/index.vue
+++ b/01.web/src/views/login/index.vue
@@ -5,7 +5,7 @@
 <template>
   <div class="login">
     <div class="login-con">
-      <Card icon="log-in" title="SVNAdmin V2.3.2" :bordered="false">
+      <Card icon="log-in" title="SVNAdmin V2.3.3" :bordered="false">
         <div class="form-con">
           <Form
             ref="formUserLogin"
diff --git a/02.php/app/util/SVNAdmin/Rep.php b/02.php/app/util/SVNAdmin/Rep.php
index 8e91795..63d3991 100644
--- a/02.php/app/util/SVNAdmin/Rep.php
+++ b/02.php/app/util/SVNAdmin/Rep.php
@@ -41,7 +41,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -89,7 +89,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -138,7 +138,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -186,7 +186,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -227,7 +227,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -302,7 +302,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -360,7 +360,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -417,7 +417,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -491,7 +491,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -551,7 +551,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             $temp1 = trim($authzContentPreg[1][0]);
             if (empty($temp1)) {
@@ -610,7 +610,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITHOUT_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITHOUT_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             return '1';
         } else {
@@ -633,7 +633,7 @@ class Rep extends Core
             }
         }
 
-        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace('/', '\/', $repPath)), $authzContent, $authzContentPreg);
+        preg_match_all(sprintf($this->REG_AUTHZ_REP_SPECIAL_PATH_WITH_CON, $repName, str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)), $authzContent, $authzContentPreg);
         if (array_key_exists(0, $authzContentPreg[0])) {
             return str_replace($authzContentPreg[0][0], "", $authzContent);
         } else {
diff --git a/02.php/config/version.php b/02.php/config/version.php
index 0f598bb..6789365 100644
--- a/02.php/config/version.php
+++ b/02.php/config/version.php
@@ -12,5 +12,5 @@
  * 用户请不要自行修改 以免影响后续升级检测
  */
 return [
-    'version' => '2.3.2'
+    'version' => '2.3.3'
 ];
diff --git a/README.md b/README.md
index eb88700..2286729 100644
--- a/README.md
+++ b/README.md
@@ -194,7 +194,7 @@ php svnadmin.php console
       docker cp svnadmintemp:/home/svnadmin ./
       
       #停止并删除临时容器
-      dockeer stop svnadmintemp && docker rm svnadmintemp
+      docker stop svnadmintemp && docker rm svnadmintemp
       
       #启动正式容器
       docker run -d -p 80:80 -p 3690:3690 -v /home/svnadmin/:/home/svnadmin/ --privileged witersencom/svnadmin:2.3.2