[*] some preg_match

some preg_match

Author: breeze2

src/SvnAdmin.php

@@ -20,10 +20,11 @@ public function create($path, array $options = null)
             throw new SvnException('Empty path parameter for "svnadmin create" command.');
         }
 
-        $pattern   = '/^([a-z0-9\_\-.]+)$/i';
+        // 目录名过滤特殊字符
+        $un_pattern   = '/[\'\"\?\*\|\/\\\\<>: ]+/'; // (\\\\) means (\)
         $repo_name = basename($path);
-
-        if (!preg_match($pattern, $repo_name)) {
+        // 不影响中文目录
+        if (preg_match($un_pattern, $repo_name)) {
             throw new SvnException('Invalid repository name: ' . $repo_name . '');
         }
 

src/SvnConfAuthz.php

@@ -382,6 +382,7 @@ public function addRepositoryPath($repopath)
         }
 
         // Validate the $repopath string.
+        // 不影响中文目录
         $pattern = '/^[A-Za-z0-9\_\-.]+:\/.*$/i';
         if ($repopath != "/" && !preg_match($pattern, $repopath)) {
             throw new SvnException('Invalid repository name. (Pattern: ' . $pattern . ')');
@@ -432,6 +433,7 @@ public function groupExists($groupname)
     public function createGroup($groupname)
     {
         // Validate the groupname.
+        // 组名正则
         $pattern = '/^[A-Za-z0-9\-\_]+$/i';
         if (!preg_match($pattern, $groupname)) {
             throw new SvnException('Invalid group name "' . $groupname .

src/traits/SvnEncode.php

@@ -40,7 +40,9 @@ public function encodeUrlPath($uri, $escape = true)
         }
 
         // Automatic prepend the 'file://' prefix (if nothing else is given).
-        if (preg_match('/^[a-z0-9+]+:\/\//i', $uri) == 0) {
+        // 不影响中文目录
+        $pattern = '/^[a-z0-9+]+:\/\//i';
+        if (preg_match($pattern, $uri) == 0) {
             if (strpos($uri, '/') === 0) {
                 $uri = 'file://' . $uri;
             } else {

tests/config.php

@@ -5,8 +5,8 @@
         'PARENT'        => '/home/breeze/http/svn/repos',
         'TYPE'          => array('COMPANY' => 'company', 'PERSON' => 'person'),
         'SVNADMIN'      => '/usr/bin/svnadmin',
-        'SVNCONF'       => '/conf',
         'SVNCLIENT'     => '/usr/bin/svn',
+        'SVNCONF'       => '/conf',
         'SVNCONF_AUTHZ' => '/conf/authz',
     ),
 );

tests/test.php

@@ -4,10 +4,19 @@
 use BL\LibSvn\SvnClient as Svn;
 use BL\LibSvn\SvnConfAuthz as SvnAuthz;
 
-require '../vendor/autoload.php';
+require __DIR__ . '/../vendor/autoload.php';
 
 $config = require __DIR__ . '/config.php';
 
 var_dump(__DIR__);
+$parent_dir    = $config['SVN']['PARENT'];
 $svnclient_bin = $config['SVN']['SVNCLIENT'];
-$svn = new Svn($svnclient_bin);
+$svnadmin_bin  = $config['SVN']['SVNADMIN'];
+
+$svn = $svnclient = new Svn($svnclient_bin);
+$svnadmin = new SvnAdmin($svnadmin_bin);
+
+$name = 'test123';
+$parent_dir = __DIR__;
+$repo = $parent_dir . '/' . $name;
+$result = $svnadmin->create($repo);