Compare commits

...

2 Commits

  1. 26
      01.web/src/views/advance/index.vue
  2. 2
      01.web/src/views/login/index.vue
  3. 2
      02.php/app/util/SVNAdmin/Core.php
  4. 24
      02.php/app/util/SVNAdmin/Rep.php
  5. 2
      02.php/config/version.php

26
01.web/src/views/advance/index.vue

@ -12,13 +12,13 @@
</Col> </Col>
<Col span="1"> </Col> <Col span="1"> </Col>
<Col span="6"> <Col span="6">
<Tooltip <!-- <Tooltip
:transfer="true" :transfer="true"
max-width="360" max-width="360"
content="可在命令行模式下执行 server/insta.php 进行Subversion安装和初始化等操作" content="可在命令行模式下执行 server/insta.php 进行Subversion安装和初始化等操作"
> >
<Button type="info">tips</Button> <Button type="info">tips</Button>
</Tooltip> </Tooltip> -->
</Col> </Col>
<Col span="6"> </Col> <Col span="6"> </Col>
</Row> </Row>
@ -41,7 +41,7 @@
</Col> </Col>
<Col span="1"> </Col> <Col span="1"> </Col>
<Col span="6"> <Col span="6">
<Button <!-- <Button
:loading="loadingSvnserveStart" :loading="loadingSvnserveStart"
type="success" type="success"
v-if="formSvn.installed == 1" v-if="formSvn.installed == 1"
@ -54,7 +54,7 @@
v-if="formSvn.installed == 2" v-if="formSvn.installed == 2"
@click="Stop" @click="Stop"
>停止</Button >停止</Button
> > -->
</Col> </Col>
</Row> </Row>
</FormItem> </FormItem>
@ -62,6 +62,7 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<InputNumber <InputNumber
disabled
:min="1" :min="1"
v-model="tempBindPort" v-model="tempBindPort"
@on-change="ChangeEditPort" @on-change="ChangeEditPort"
@ -69,13 +70,13 @@
</Col> </Col>
<Col span="1"> </Col> <Col span="1"> </Col>
<Col span="6"> <Col span="6">
<Button <!-- <Button
type="warning" type="warning"
@click="EditPort" @click="EditPort"
:disabled="disabledEditPort" :disabled="disabledEditPort"
:loading="loadingEditPort" :loading="loadingEditPort"
>修改</Button >修改</Button
> > -->
</Col> </Col>
</Row> </Row>
</FormItem> </FormItem>
@ -83,6 +84,7 @@
<Row> <Row>
<Col span="12"> <Col span="12">
<Input <Input
disabled
v-model="tempBindHost" v-model="tempBindHost"
@on-change="ChangeEditHost" @on-change="ChangeEditHost"
placeholder="默认地址:0.0.0.0" placeholder="默认地址:0.0.0.0"
@ -90,7 +92,7 @@
</Col> </Col>
<Col span="1"> </Col> <Col span="1"> </Col>
<Col span="6"> <Col span="6">
<Tooltip <!-- <Tooltip
:transfer="true" :transfer="true"
max-width="350" max-width="350"
content="请注意,如果您的机器为公网服务器且非弹性IP,则可能会绑定失败。原因与云服务器厂商分配公网IP给服务器的方式有关。如果绑定失败,建议配置使用自定义主机名代替检出地址。" content="请注意,如果您的机器为公网服务器且非弹性IP,则可能会绑定失败。原因与云服务器厂商分配公网IP给服务器的方式有关。如果绑定失败,建议配置使用自定义主机名代替检出地址。"
@ -102,7 +104,7 @@
:loading="loadingEditHost" :loading="loadingEditHost"
>修改</Button >修改</Button
> >
</Tooltip> </Tooltip> -->
</Col> </Col>
</Row> </Row>
</FormItem> </FormItem>
@ -134,7 +136,7 @@
v-model="formSvn.enable" v-model="formSvn.enable"
@on-change="EditEnable" @on-change="EditEnable"
> >
<Radio label="bindHost">绑定主机</Radio> <Radio label="bindHost" disabled>绑定主机</Radio>
<Radio label="manageHost">自定义主机</Radio> <Radio label="manageHost">自定义主机</Radio>
</RadioGroup> </RadioGroup>
</Col> </Col>
@ -146,9 +148,9 @@
</TabPane> </TabPane>
<TabPane label="配置文件" name="2"> <TabPane label="配置文件" name="2">
<Card :bordered="false" :dis-hover="true" style="width: 620px"> <Card :bordered="false" :dis-hover="true" style="width: 620px">
<Alert <!-- <Alert
>可在命令行模式下执行 server/insta.php 进行目录更换操作 >可在命令行模式下执行 server/insta.php 进行目录更换操作
</Alert> </Alert> -->
<Form :label-width="160" label-position="left"> <Form :label-width="160" label-position="left">
<FormItem <FormItem
:label="item.key" :label="item.key"
@ -597,7 +599,7 @@ export default {
* 版本信息 * 版本信息
*/ */
version: { version: {
current_verson: "2.3.2", current_verson: "2.3.3",
php_version: "5.5 <= PHP < 8.0", php_version: "5.5 <= PHP < 8.0",
database: "MYSQL、SQLite", database: "MYSQL、SQLite",
github: "https://github.com/witersen/SvnAdminV2.0", github: "https://github.com/witersen/SvnAdminV2.0",

2
01.web/src/views/login/index.vue

@ -5,7 +5,7 @@
<template> <template>
<div class="login"> <div class="login">
<div class="login-con"> <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"> <div class="form-con">
<Form <Form
ref="formUserLogin" ref="formUserLogin"

2
02.php/app/util/SVNAdmin/Core.php

@ -163,7 +163,7 @@ class Core
* 等 * 等
* *
* %s => $repName * %s => $repName
* %s => $repPaht str_replace('/', '\/', $repPath) * %s => $repPaht str_replace(['^', '$', '+', '*', '{', '}', '.', '(', ')', '[', ']', '%', '/'], ['\^', '\$', '\+', '\*', '\{', '\}', '\.', '\(', '\)', '\[', '\]', '\%', '\/'], $repPath)
* *
* @var string * @var string
*/ */

24
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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
$temp1 = trim($authzContentPreg[1][0]); $temp1 = trim($authzContentPreg[1][0]);
if (empty($temp1)) { 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
return '1'; return '1';
} else { } 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])) { if (array_key_exists(0, $authzContentPreg[0])) {
return str_replace($authzContentPreg[0][0], "", $authzContent); return str_replace($authzContentPreg[0][0], "", $authzContent);
} else { } else {

2
02.php/config/version.php

@ -12,5 +12,5 @@
* 用户请不要自行修改 以免影响后续升级检测 * 用户请不要自行修改 以免影响后续升级检测
*/ */
return [ return [
'version' => '2.3.2' 'version' => '2.3.3'
]; ];

Loading…
Cancel
Save