@@ -29,12 +29,12 @@ |
||
29 | 29 | */ |
30 | 30 | class NullMechanism extends AuthMechanism { |
31 | 31 | |
32 | - public function __construct(IL10N $l) { |
|
33 | - $this |
|
34 | - ->setIdentifier('null::null') |
|
35 | - ->setScheme(self::SCHEME_NULL) |
|
36 | - ->setText($l->t('None')) |
|
37 | - ; |
|
38 | - } |
|
32 | + public function __construct(IL10N $l) { |
|
33 | + $this |
|
34 | + ->setIdentifier('null::null') |
|
35 | + ->setScheme(self::SCHEME_NULL) |
|
36 | + ->setText($l->t('None')) |
|
37 | + ; |
|
38 | + } |
|
39 | 39 | |
40 | 40 | } |
@@ -29,33 +29,33 @@ |
||
29 | 29 | */ |
30 | 30 | trait PriorityTrait { |
31 | 31 | |
32 | - /** @var int initial priority */ |
|
33 | - protected $priority = BackendService::PRIORITY_DEFAULT; |
|
34 | - |
|
35 | - /** |
|
36 | - * @return int |
|
37 | - */ |
|
38 | - public function getPriority() { |
|
39 | - return $this->priority; |
|
40 | - } |
|
41 | - |
|
42 | - /** |
|
43 | - * @param int $priority |
|
44 | - * @return self |
|
45 | - */ |
|
46 | - public function setPriority($priority) { |
|
47 | - $this->priority = $priority; |
|
48 | - return $this; |
|
49 | - } |
|
50 | - |
|
51 | - /** |
|
52 | - * @param PriorityTrait $a |
|
53 | - * @param PriorityTrait $b |
|
54 | - * @return int |
|
55 | - */ |
|
56 | - public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) { |
|
57 | - return ($a->getPriority() - $b->getPriority()); |
|
58 | - } |
|
32 | + /** @var int initial priority */ |
|
33 | + protected $priority = BackendService::PRIORITY_DEFAULT; |
|
34 | + |
|
35 | + /** |
|
36 | + * @return int |
|
37 | + */ |
|
38 | + public function getPriority() { |
|
39 | + return $this->priority; |
|
40 | + } |
|
41 | + |
|
42 | + /** |
|
43 | + * @param int $priority |
|
44 | + * @return self |
|
45 | + */ |
|
46 | + public function setPriority($priority) { |
|
47 | + $this->priority = $priority; |
|
48 | + return $this; |
|
49 | + } |
|
50 | + |
|
51 | + /** |
|
52 | + * @param PriorityTrait $a |
|
53 | + * @param PriorityTrait $b |
|
54 | + * @return int |
|
55 | + */ |
|
56 | + public static function priorityCompare(PriorityTrait $a, PriorityTrait $b) { |
|
57 | + return ($a->getPriority() - $b->getPriority()); |
|
58 | + } |
|
59 | 59 | |
60 | 60 | } |
61 | 61 |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | interface IBackendProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * @since 9.1.0 |
|
35 | - * @return Backend[] |
|
36 | - */ |
|
37 | - public function getBackends(); |
|
33 | + /** |
|
34 | + * @since 9.1.0 |
|
35 | + * @return Backend[] |
|
36 | + */ |
|
37 | + public function getBackends(); |
|
38 | 38 | |
39 | 39 | } |
@@ -30,10 +30,10 @@ |
||
30 | 30 | */ |
31 | 31 | interface IAuthMechanismProvider { |
32 | 32 | |
33 | - /** |
|
34 | - * @since 9.1.0 |
|
35 | - * @return AuthMechanism[] |
|
36 | - */ |
|
37 | - public function getAuthMechanisms(); |
|
33 | + /** |
|
34 | + * @since 9.1.0 |
|
35 | + * @return AuthMechanism[] |
|
36 | + */ |
|
37 | + public function getAuthMechanisms(); |
|
38 | 38 | |
39 | 39 | } |
@@ -31,14 +31,14 @@ |
||
31 | 31 | */ |
32 | 32 | class SessionStorageWrapper extends PermissionsMask { |
33 | 33 | |
34 | - /** |
|
35 | - * @param array $arguments ['storage' => $storage] |
|
36 | - */ |
|
37 | - public function __construct($arguments) { |
|
38 | - // disable sharing permission |
|
39 | - $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE; |
|
40 | - parent::__construct($arguments); |
|
41 | - } |
|
34 | + /** |
|
35 | + * @param array $arguments ['storage' => $storage] |
|
36 | + */ |
|
37 | + public function __construct($arguments) { |
|
38 | + // disable sharing permission |
|
39 | + $arguments['mask'] = Constants::PERMISSION_ALL & ~Constants::PERMISSION_SHARE; |
|
40 | + parent::__construct($arguments); |
|
41 | + } |
|
42 | 42 | |
43 | 43 | } |
44 | 44 |
@@ -93,8 +93,7 @@ |
||
93 | 93 | public function unlink($path) { |
94 | 94 | if ($this->is_dir($path)) { |
95 | 95 | return $this->rmdir($path); |
96 | - } |
|
97 | - else { |
|
96 | + } else { |
|
98 | 97 | $url = $this->constructUrl($path); |
99 | 98 | $result = unlink($url); |
100 | 99 | clearstatcache(true, $url); |
@@ -38,122 +38,122 @@ |
||
38 | 38 | use Icewind\Streams\RetryWrapper; |
39 | 39 | |
40 | 40 | class FTP extends StreamWrapper{ |
41 | - private $password; |
|
42 | - private $user; |
|
43 | - private $host; |
|
44 | - private $secure; |
|
45 | - private $root; |
|
41 | + private $password; |
|
42 | + private $user; |
|
43 | + private $host; |
|
44 | + private $secure; |
|
45 | + private $root; |
|
46 | 46 | |
47 | - private static $tempFiles=array(); |
|
47 | + private static $tempFiles=array(); |
|
48 | 48 | |
49 | - public function __construct($params) { |
|
50 | - if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { |
|
51 | - $this->host=$params['host']; |
|
52 | - $this->user=$params['user']; |
|
53 | - $this->password=$params['password']; |
|
54 | - if (isset($params['secure'])) { |
|
55 | - $this->secure = $params['secure']; |
|
56 | - } else { |
|
57 | - $this->secure = false; |
|
58 | - } |
|
59 | - $this->root=isset($params['root'])?$params['root']:'/'; |
|
60 | - if ( ! $this->root || $this->root[0]!=='/') { |
|
61 | - $this->root='/'.$this->root; |
|
62 | - } |
|
63 | - if (substr($this->root, -1) !== '/') { |
|
64 | - $this->root .= '/'; |
|
65 | - } |
|
66 | - } else { |
|
67 | - throw new \Exception('Creating FTP storage failed'); |
|
68 | - } |
|
49 | + public function __construct($params) { |
|
50 | + if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { |
|
51 | + $this->host=$params['host']; |
|
52 | + $this->user=$params['user']; |
|
53 | + $this->password=$params['password']; |
|
54 | + if (isset($params['secure'])) { |
|
55 | + $this->secure = $params['secure']; |
|
56 | + } else { |
|
57 | + $this->secure = false; |
|
58 | + } |
|
59 | + $this->root=isset($params['root'])?$params['root']:'/'; |
|
60 | + if ( ! $this->root || $this->root[0]!=='/') { |
|
61 | + $this->root='/'.$this->root; |
|
62 | + } |
|
63 | + if (substr($this->root, -1) !== '/') { |
|
64 | + $this->root .= '/'; |
|
65 | + } |
|
66 | + } else { |
|
67 | + throw new \Exception('Creating FTP storage failed'); |
|
68 | + } |
|
69 | 69 | |
70 | - } |
|
70 | + } |
|
71 | 71 | |
72 | - public function getId(){ |
|
73 | - return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root; |
|
74 | - } |
|
72 | + public function getId(){ |
|
73 | + return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root; |
|
74 | + } |
|
75 | 75 | |
76 | - /** |
|
77 | - * construct the ftp url |
|
78 | - * @param string $path |
|
79 | - * @return string |
|
80 | - */ |
|
81 | - public function constructUrl($path) { |
|
82 | - $url='ftp'; |
|
83 | - if ($this->secure) { |
|
84 | - $url.='s'; |
|
85 | - } |
|
86 | - $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
87 | - return $url; |
|
88 | - } |
|
76 | + /** |
|
77 | + * construct the ftp url |
|
78 | + * @param string $path |
|
79 | + * @return string |
|
80 | + */ |
|
81 | + public function constructUrl($path) { |
|
82 | + $url='ftp'; |
|
83 | + if ($this->secure) { |
|
84 | + $url.='s'; |
|
85 | + } |
|
86 | + $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
87 | + return $url; |
|
88 | + } |
|
89 | 89 | |
90 | - /** |
|
91 | - * Unlinks file or directory |
|
92 | - * @param string $path |
|
93 | - */ |
|
94 | - public function unlink($path) { |
|
95 | - if ($this->is_dir($path)) { |
|
96 | - return $this->rmdir($path); |
|
97 | - } |
|
98 | - else { |
|
99 | - $url = $this->constructUrl($path); |
|
100 | - $result = unlink($url); |
|
101 | - clearstatcache(true, $url); |
|
102 | - return $result; |
|
103 | - } |
|
104 | - } |
|
105 | - public function fopen($path,$mode) { |
|
106 | - switch($mode) { |
|
107 | - case 'r': |
|
108 | - case 'rb': |
|
109 | - case 'w': |
|
110 | - case 'wb': |
|
111 | - case 'a': |
|
112 | - case 'ab': |
|
113 | - //these are supported by the wrapper |
|
114 | - $context = stream_context_create(array('ftp' => array('overwrite' => true))); |
|
115 | - $handle = fopen($this->constructUrl($path), $mode, false, $context); |
|
116 | - return RetryWrapper::wrap($handle); |
|
117 | - case 'r+': |
|
118 | - case 'w+': |
|
119 | - case 'wb+': |
|
120 | - case 'a+': |
|
121 | - case 'x': |
|
122 | - case 'x+': |
|
123 | - case 'c': |
|
124 | - case 'c+': |
|
125 | - //emulate these |
|
126 | - if (strrpos($path, '.')!==false) { |
|
127 | - $ext=substr($path, strrpos($path, '.')); |
|
128 | - } else { |
|
129 | - $ext=''; |
|
130 | - } |
|
131 | - $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
|
132 | - if ($this->file_exists($path)) { |
|
133 | - $this->getFile($path, $tmpFile); |
|
134 | - } |
|
135 | - $handle = fopen($tmpFile, $mode); |
|
136 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
137 | - $this->writeBack($tmpFile, $path); |
|
138 | - }); |
|
139 | - } |
|
140 | - return false; |
|
141 | - } |
|
90 | + /** |
|
91 | + * Unlinks file or directory |
|
92 | + * @param string $path |
|
93 | + */ |
|
94 | + public function unlink($path) { |
|
95 | + if ($this->is_dir($path)) { |
|
96 | + return $this->rmdir($path); |
|
97 | + } |
|
98 | + else { |
|
99 | + $url = $this->constructUrl($path); |
|
100 | + $result = unlink($url); |
|
101 | + clearstatcache(true, $url); |
|
102 | + return $result; |
|
103 | + } |
|
104 | + } |
|
105 | + public function fopen($path,$mode) { |
|
106 | + switch($mode) { |
|
107 | + case 'r': |
|
108 | + case 'rb': |
|
109 | + case 'w': |
|
110 | + case 'wb': |
|
111 | + case 'a': |
|
112 | + case 'ab': |
|
113 | + //these are supported by the wrapper |
|
114 | + $context = stream_context_create(array('ftp' => array('overwrite' => true))); |
|
115 | + $handle = fopen($this->constructUrl($path), $mode, false, $context); |
|
116 | + return RetryWrapper::wrap($handle); |
|
117 | + case 'r+': |
|
118 | + case 'w+': |
|
119 | + case 'wb+': |
|
120 | + case 'a+': |
|
121 | + case 'x': |
|
122 | + case 'x+': |
|
123 | + case 'c': |
|
124 | + case 'c+': |
|
125 | + //emulate these |
|
126 | + if (strrpos($path, '.')!==false) { |
|
127 | + $ext=substr($path, strrpos($path, '.')); |
|
128 | + } else { |
|
129 | + $ext=''; |
|
130 | + } |
|
131 | + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
|
132 | + if ($this->file_exists($path)) { |
|
133 | + $this->getFile($path, $tmpFile); |
|
134 | + } |
|
135 | + $handle = fopen($tmpFile, $mode); |
|
136 | + return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
137 | + $this->writeBack($tmpFile, $path); |
|
138 | + }); |
|
139 | + } |
|
140 | + return false; |
|
141 | + } |
|
142 | 142 | |
143 | - public function writeBack($tmpFile, $path) { |
|
144 | - $this->uploadFile($tmpFile, $path); |
|
145 | - unlink($tmpFile); |
|
146 | - } |
|
143 | + public function writeBack($tmpFile, $path) { |
|
144 | + $this->uploadFile($tmpFile, $path); |
|
145 | + unlink($tmpFile); |
|
146 | + } |
|
147 | 147 | |
148 | - /** |
|
149 | - * check if php-ftp is installed |
|
150 | - */ |
|
151 | - public static function checkDependencies() { |
|
152 | - if (function_exists('ftp_login')) { |
|
153 | - return true; |
|
154 | - } else { |
|
155 | - return array('ftp'); |
|
156 | - } |
|
157 | - } |
|
148 | + /** |
|
149 | + * check if php-ftp is installed |
|
150 | + */ |
|
151 | + public static function checkDependencies() { |
|
152 | + if (function_exists('ftp_login')) { |
|
153 | + return true; |
|
154 | + } else { |
|
155 | + return array('ftp'); |
|
156 | + } |
|
157 | + } |
|
158 | 158 | |
159 | 159 | } |
@@ -37,28 +37,28 @@ discard block |
||
37 | 37 | use Icewind\Streams\CallbackWrapper; |
38 | 38 | use Icewind\Streams\RetryWrapper; |
39 | 39 | |
40 | -class FTP extends StreamWrapper{ |
|
40 | +class FTP extends StreamWrapper { |
|
41 | 41 | private $password; |
42 | 42 | private $user; |
43 | 43 | private $host; |
44 | 44 | private $secure; |
45 | 45 | private $root; |
46 | 46 | |
47 | - private static $tempFiles=array(); |
|
47 | + private static $tempFiles = array(); |
|
48 | 48 | |
49 | 49 | public function __construct($params) { |
50 | 50 | if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { |
51 | - $this->host=$params['host']; |
|
52 | - $this->user=$params['user']; |
|
53 | - $this->password=$params['password']; |
|
51 | + $this->host = $params['host']; |
|
52 | + $this->user = $params['user']; |
|
53 | + $this->password = $params['password']; |
|
54 | 54 | if (isset($params['secure'])) { |
55 | 55 | $this->secure = $params['secure']; |
56 | 56 | } else { |
57 | 57 | $this->secure = false; |
58 | 58 | } |
59 | - $this->root=isset($params['root'])?$params['root']:'/'; |
|
60 | - if ( ! $this->root || $this->root[0]!=='/') { |
|
61 | - $this->root='/'.$this->root; |
|
59 | + $this->root = isset($params['root']) ? $params['root'] : '/'; |
|
60 | + if (!$this->root || $this->root[0] !== '/') { |
|
61 | + $this->root = '/'.$this->root; |
|
62 | 62 | } |
63 | 63 | if (substr($this->root, -1) !== '/') { |
64 | 64 | $this->root .= '/'; |
@@ -69,8 +69,8 @@ discard block |
||
69 | 69 | |
70 | 70 | } |
71 | 71 | |
72 | - public function getId(){ |
|
73 | - return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root; |
|
72 | + public function getId() { |
|
73 | + return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root; |
|
74 | 74 | } |
75 | 75 | |
76 | 76 | /** |
@@ -79,11 +79,11 @@ discard block |
||
79 | 79 | * @return string |
80 | 80 | */ |
81 | 81 | public function constructUrl($path) { |
82 | - $url='ftp'; |
|
82 | + $url = 'ftp'; |
|
83 | 83 | if ($this->secure) { |
84 | - $url.='s'; |
|
84 | + $url .= 's'; |
|
85 | 85 | } |
86 | - $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
86 | + $url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
87 | 87 | return $url; |
88 | 88 | } |
89 | 89 | |
@@ -102,8 +102,8 @@ discard block |
||
102 | 102 | return $result; |
103 | 103 | } |
104 | 104 | } |
105 | - public function fopen($path,$mode) { |
|
106 | - switch($mode) { |
|
105 | + public function fopen($path, $mode) { |
|
106 | + switch ($mode) { |
|
107 | 107 | case 'r': |
108 | 108 | case 'rb': |
109 | 109 | case 'w': |
@@ -123,17 +123,17 @@ discard block |
||
123 | 123 | case 'c': |
124 | 124 | case 'c+': |
125 | 125 | //emulate these |
126 | - if (strrpos($path, '.')!==false) { |
|
127 | - $ext=substr($path, strrpos($path, '.')); |
|
126 | + if (strrpos($path, '.') !== false) { |
|
127 | + $ext = substr($path, strrpos($path, '.')); |
|
128 | 128 | } else { |
129 | - $ext=''; |
|
129 | + $ext = ''; |
|
130 | 130 | } |
131 | 131 | $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
132 | 132 | if ($this->file_exists($path)) { |
133 | 133 | $this->getFile($path, $tmpFile); |
134 | 134 | } |
135 | 135 | $handle = fopen($tmpFile, $mode); |
136 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
136 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
137 | 137 | $this->writeBack($tmpFile, $path); |
138 | 138 | }); |
139 | 139 | } |
@@ -30,101 +30,101 @@ |
||
30 | 30 | |
31 | 31 | abstract class StreamWrapper extends \OC\Files\Storage\Common { |
32 | 32 | |
33 | - /** |
|
34 | - * @param string $path |
|
35 | - * @return string|null |
|
36 | - */ |
|
37 | - abstract public function constructUrl($path); |
|
38 | - |
|
39 | - public function mkdir($path) { |
|
40 | - return mkdir($this->constructUrl($path)); |
|
41 | - } |
|
42 | - |
|
43 | - public function rmdir($path) { |
|
44 | - if ($this->is_dir($path) && $this->isDeletable($path)) { |
|
45 | - $dh = $this->opendir($path); |
|
46 | - if (!is_resource($dh)) { |
|
47 | - return false; |
|
48 | - } |
|
49 | - while (($file = readdir($dh)) !== false) { |
|
50 | - if ($this->is_dir($path . '/' . $file)) { |
|
51 | - $this->rmdir($path . '/' . $file); |
|
52 | - } else { |
|
53 | - $this->unlink($path . '/' . $file); |
|
54 | - } |
|
55 | - } |
|
56 | - $url = $this->constructUrl($path); |
|
57 | - $success = rmdir($url); |
|
58 | - clearstatcache(false, $url); |
|
59 | - return $success; |
|
60 | - } else { |
|
61 | - return false; |
|
62 | - } |
|
63 | - } |
|
64 | - |
|
65 | - public function opendir($path) { |
|
66 | - return opendir($this->constructUrl($path)); |
|
67 | - } |
|
68 | - |
|
69 | - public function filetype($path) { |
|
70 | - return @filetype($this->constructUrl($path)); |
|
71 | - } |
|
72 | - |
|
73 | - public function file_exists($path) { |
|
74 | - return file_exists($this->constructUrl($path)); |
|
75 | - } |
|
76 | - |
|
77 | - public function unlink($path) { |
|
78 | - $url = $this->constructUrl($path); |
|
79 | - $success = unlink($url); |
|
80 | - // normally unlink() is supposed to do this implicitly, |
|
81 | - // but doing it anyway just to be sure |
|
82 | - clearstatcache(false, $url); |
|
83 | - return $success; |
|
84 | - } |
|
85 | - |
|
86 | - public function fopen($path, $mode) { |
|
87 | - return fopen($this->constructUrl($path), $mode); |
|
88 | - } |
|
89 | - |
|
90 | - public function touch($path, $mtime = null) { |
|
91 | - if ($this->file_exists($path)) { |
|
92 | - if (is_null($mtime)) { |
|
93 | - $fh = $this->fopen($path, 'a'); |
|
94 | - fwrite($fh, ''); |
|
95 | - fclose($fh); |
|
96 | - |
|
97 | - return true; |
|
98 | - } else { |
|
99 | - return false; //not supported |
|
100 | - } |
|
101 | - } else { |
|
102 | - $this->file_put_contents($path, ''); |
|
103 | - return true; |
|
104 | - } |
|
105 | - } |
|
106 | - |
|
107 | - /** |
|
108 | - * @param string $path |
|
109 | - * @param string $target |
|
110 | - */ |
|
111 | - public function getFile($path, $target) { |
|
112 | - return copy($this->constructUrl($path), $target); |
|
113 | - } |
|
114 | - |
|
115 | - /** |
|
116 | - * @param string $target |
|
117 | - */ |
|
118 | - public function uploadFile($path, $target) { |
|
119 | - return copy($path, $this->constructUrl($target)); |
|
120 | - } |
|
121 | - |
|
122 | - public function rename($path1, $path2) { |
|
123 | - return rename($this->constructUrl($path1), $this->constructUrl($path2)); |
|
124 | - } |
|
125 | - |
|
126 | - public function stat($path) { |
|
127 | - return stat($this->constructUrl($path)); |
|
128 | - } |
|
33 | + /** |
|
34 | + * @param string $path |
|
35 | + * @return string|null |
|
36 | + */ |
|
37 | + abstract public function constructUrl($path); |
|
38 | + |
|
39 | + public function mkdir($path) { |
|
40 | + return mkdir($this->constructUrl($path)); |
|
41 | + } |
|
42 | + |
|
43 | + public function rmdir($path) { |
|
44 | + if ($this->is_dir($path) && $this->isDeletable($path)) { |
|
45 | + $dh = $this->opendir($path); |
|
46 | + if (!is_resource($dh)) { |
|
47 | + return false; |
|
48 | + } |
|
49 | + while (($file = readdir($dh)) !== false) { |
|
50 | + if ($this->is_dir($path . '/' . $file)) { |
|
51 | + $this->rmdir($path . '/' . $file); |
|
52 | + } else { |
|
53 | + $this->unlink($path . '/' . $file); |
|
54 | + } |
|
55 | + } |
|
56 | + $url = $this->constructUrl($path); |
|
57 | + $success = rmdir($url); |
|
58 | + clearstatcache(false, $url); |
|
59 | + return $success; |
|
60 | + } else { |
|
61 | + return false; |
|
62 | + } |
|
63 | + } |
|
64 | + |
|
65 | + public function opendir($path) { |
|
66 | + return opendir($this->constructUrl($path)); |
|
67 | + } |
|
68 | + |
|
69 | + public function filetype($path) { |
|
70 | + return @filetype($this->constructUrl($path)); |
|
71 | + } |
|
72 | + |
|
73 | + public function file_exists($path) { |
|
74 | + return file_exists($this->constructUrl($path)); |
|
75 | + } |
|
76 | + |
|
77 | + public function unlink($path) { |
|
78 | + $url = $this->constructUrl($path); |
|
79 | + $success = unlink($url); |
|
80 | + // normally unlink() is supposed to do this implicitly, |
|
81 | + // but doing it anyway just to be sure |
|
82 | + clearstatcache(false, $url); |
|
83 | + return $success; |
|
84 | + } |
|
85 | + |
|
86 | + public function fopen($path, $mode) { |
|
87 | + return fopen($this->constructUrl($path), $mode); |
|
88 | + } |
|
89 | + |
|
90 | + public function touch($path, $mtime = null) { |
|
91 | + if ($this->file_exists($path)) { |
|
92 | + if (is_null($mtime)) { |
|
93 | + $fh = $this->fopen($path, 'a'); |
|
94 | + fwrite($fh, ''); |
|
95 | + fclose($fh); |
|
96 | + |
|
97 | + return true; |
|
98 | + } else { |
|
99 | + return false; //not supported |
|
100 | + } |
|
101 | + } else { |
|
102 | + $this->file_put_contents($path, ''); |
|
103 | + return true; |
|
104 | + } |
|
105 | + } |
|
106 | + |
|
107 | + /** |
|
108 | + * @param string $path |
|
109 | + * @param string $target |
|
110 | + */ |
|
111 | + public function getFile($path, $target) { |
|
112 | + return copy($this->constructUrl($path), $target); |
|
113 | + } |
|
114 | + |
|
115 | + /** |
|
116 | + * @param string $target |
|
117 | + */ |
|
118 | + public function uploadFile($path, $target) { |
|
119 | + return copy($path, $this->constructUrl($target)); |
|
120 | + } |
|
121 | + |
|
122 | + public function rename($path1, $path2) { |
|
123 | + return rename($this->constructUrl($path1), $this->constructUrl($path2)); |
|
124 | + } |
|
125 | + |
|
126 | + public function stat($path) { |
|
127 | + return stat($this->constructUrl($path)); |
|
128 | + } |
|
129 | 129 | |
130 | 130 | } |
@@ -47,10 +47,10 @@ |
||
47 | 47 | return false; |
48 | 48 | } |
49 | 49 | while (($file = readdir($dh)) !== false) { |
50 | - if ($this->is_dir($path . '/' . $file)) { |
|
51 | - $this->rmdir($path . '/' . $file); |
|
50 | + if ($this->is_dir($path.'/'.$file)) { |
|
51 | + $this->rmdir($path.'/'.$file); |
|
52 | 52 | } else { |
53 | - $this->unlink($path . '/' . $file); |
|
53 | + $this->unlink($path.'/'.$file); |
|
54 | 54 | } |
55 | 55 | } |
56 | 56 | $url = $this->constructUrl($path); |
@@ -43,28 +43,28 @@ |
||
43 | 43 | */ |
44 | 44 | trait StorageModifierTrait { |
45 | 45 | |
46 | - /** |
|
47 | - * Modify a StorageConfig parameters |
|
48 | - * |
|
49 | - * @param StorageConfig $storage |
|
50 | - * @param IUser $user User the storage is being used as |
|
51 | - * @throws InsufficientDataForMeaningfulAnswerException |
|
52 | - * @throws StorageNotAvailableException |
|
53 | - */ |
|
54 | - public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
55 | - } |
|
46 | + /** |
|
47 | + * Modify a StorageConfig parameters |
|
48 | + * |
|
49 | + * @param StorageConfig $storage |
|
50 | + * @param IUser $user User the storage is being used as |
|
51 | + * @throws InsufficientDataForMeaningfulAnswerException |
|
52 | + * @throws StorageNotAvailableException |
|
53 | + */ |
|
54 | + public function manipulateStorageConfig(StorageConfig &$storage, IUser $user = null) { |
|
55 | + } |
|
56 | 56 | |
57 | - /** |
|
58 | - * Wrap a Storage if necessary |
|
59 | - * |
|
60 | - * @param Storage $storage |
|
61 | - * @return Storage |
|
62 | - * @throws InsufficientDataForMeaningfulAnswerException |
|
63 | - * @throws StorageNotAvailableException |
|
64 | - */ |
|
65 | - public function wrapStorage(Storage $storage) { |
|
66 | - return $storage; |
|
67 | - } |
|
57 | + /** |
|
58 | + * Wrap a Storage if necessary |
|
59 | + * |
|
60 | + * @param Storage $storage |
|
61 | + * @return Storage |
|
62 | + * @throws InsufficientDataForMeaningfulAnswerException |
|
63 | + * @throws StorageNotAvailableException |
|
64 | + */ |
|
65 | + public function wrapStorage(Storage $storage) { |
|
66 | + return $storage; |
|
67 | + } |
|
68 | 68 | |
69 | 69 | } |
70 | 70 |
@@ -29,122 +29,122 @@ |
||
29 | 29 | use OCP\Files\Notify\INotifyHandler; |
30 | 30 | |
31 | 31 | class SMBNotifyHandler implements INotifyHandler { |
32 | - /** |
|
33 | - * @var \Icewind\SMB\INotifyHandler |
|
34 | - */ |
|
35 | - private $shareNotifyHandler; |
|
32 | + /** |
|
33 | + * @var \Icewind\SMB\INotifyHandler |
|
34 | + */ |
|
35 | + private $shareNotifyHandler; |
|
36 | 36 | |
37 | - /** |
|
38 | - * @var string |
|
39 | - */ |
|
40 | - private $root; |
|
37 | + /** |
|
38 | + * @var string |
|
39 | + */ |
|
40 | + private $root; |
|
41 | 41 | |
42 | - private $oldRenamePath = null; |
|
42 | + private $oldRenamePath = null; |
|
43 | 43 | |
44 | - /** |
|
45 | - * SMBNotifyHandler constructor. |
|
46 | - * |
|
47 | - * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler |
|
48 | - * @param string $root |
|
49 | - */ |
|
50 | - public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) { |
|
51 | - $this->shareNotifyHandler = $shareNotifyHandler; |
|
52 | - $this->root = $root; |
|
53 | - } |
|
44 | + /** |
|
45 | + * SMBNotifyHandler constructor. |
|
46 | + * |
|
47 | + * @param \Icewind\SMB\INotifyHandler $shareNotifyHandler |
|
48 | + * @param string $root |
|
49 | + */ |
|
50 | + public function __construct(\Icewind\SMB\INotifyHandler $shareNotifyHandler, $root) { |
|
51 | + $this->shareNotifyHandler = $shareNotifyHandler; |
|
52 | + $this->root = $root; |
|
53 | + } |
|
54 | 54 | |
55 | - private function relativePath($fullPath) { |
|
56 | - if ($fullPath === $this->root) { |
|
57 | - return ''; |
|
58 | - } else if (substr($fullPath, 0, strlen($this->root)) === $this->root) { |
|
59 | - return substr($fullPath, strlen($this->root)); |
|
60 | - } else { |
|
61 | - return null; |
|
62 | - } |
|
63 | - } |
|
55 | + private function relativePath($fullPath) { |
|
56 | + if ($fullPath === $this->root) { |
|
57 | + return ''; |
|
58 | + } else if (substr($fullPath, 0, strlen($this->root)) === $this->root) { |
|
59 | + return substr($fullPath, strlen($this->root)); |
|
60 | + } else { |
|
61 | + return null; |
|
62 | + } |
|
63 | + } |
|
64 | 64 | |
65 | - public function listen(callable $callback) { |
|
66 | - $oldRenamePath = null; |
|
67 | - $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) { |
|
68 | - $change = $this->mapChange($shareChange); |
|
69 | - if (!is_null($change)) { |
|
70 | - return $callback($change); |
|
71 | - } else { |
|
72 | - return true; |
|
73 | - } |
|
74 | - }); |
|
75 | - } |
|
65 | + public function listen(callable $callback) { |
|
66 | + $oldRenamePath = null; |
|
67 | + $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) { |
|
68 | + $change = $this->mapChange($shareChange); |
|
69 | + if (!is_null($change)) { |
|
70 | + return $callback($change); |
|
71 | + } else { |
|
72 | + return true; |
|
73 | + } |
|
74 | + }); |
|
75 | + } |
|
76 | 76 | |
77 | - /** |
|
78 | - * Get all changes detected since the start of the notify process or the last call to getChanges |
|
79 | - * |
|
80 | - * @return IChange[] |
|
81 | - */ |
|
82 | - public function getChanges() { |
|
83 | - $shareChanges = $this->shareNotifyHandler->getChanges(); |
|
84 | - $changes = []; |
|
85 | - foreach ($shareChanges as $shareChange) { |
|
86 | - $change = $this->mapChange($shareChange); |
|
87 | - if ($change) { |
|
88 | - $changes[] = $change; |
|
89 | - } |
|
90 | - } |
|
91 | - return $changes; |
|
92 | - } |
|
77 | + /** |
|
78 | + * Get all changes detected since the start of the notify process or the last call to getChanges |
|
79 | + * |
|
80 | + * @return IChange[] |
|
81 | + */ |
|
82 | + public function getChanges() { |
|
83 | + $shareChanges = $this->shareNotifyHandler->getChanges(); |
|
84 | + $changes = []; |
|
85 | + foreach ($shareChanges as $shareChange) { |
|
86 | + $change = $this->mapChange($shareChange); |
|
87 | + if ($change) { |
|
88 | + $changes[] = $change; |
|
89 | + } |
|
90 | + } |
|
91 | + return $changes; |
|
92 | + } |
|
93 | 93 | |
94 | - /** |
|
95 | - * Stop listening for changes |
|
96 | - * |
|
97 | - * Note that any pending changes will be discarded |
|
98 | - */ |
|
99 | - public function stop() { |
|
100 | - $this->shareNotifyHandler->stop(); |
|
101 | - } |
|
94 | + /** |
|
95 | + * Stop listening for changes |
|
96 | + * |
|
97 | + * Note that any pending changes will be discarded |
|
98 | + */ |
|
99 | + public function stop() { |
|
100 | + $this->shareNotifyHandler->stop(); |
|
101 | + } |
|
102 | 102 | |
103 | - /** |
|
104 | - * @param \Icewind\SMB\Change $change |
|
105 | - * @return IChange|null |
|
106 | - */ |
|
107 | - private function mapChange(\Icewind\SMB\Change $change) { |
|
108 | - $path = $this->relativePath($change->getPath()); |
|
109 | - if (is_null($path)) { |
|
110 | - return null; |
|
111 | - } |
|
112 | - if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) { |
|
113 | - $this->oldRenamePath = $path; |
|
114 | - return null; |
|
115 | - } |
|
116 | - $type = $this->mapNotifyType($change->getCode()); |
|
117 | - if (is_null($type)) { |
|
118 | - return null; |
|
119 | - } |
|
120 | - if ($type === IChange::RENAMED) { |
|
121 | - if (!is_null($this->oldRenamePath)) { |
|
122 | - $result = new RenameChange($type, $this->oldRenamePath, $path); |
|
123 | - $this->oldRenamePath = null; |
|
124 | - } else { |
|
125 | - $result = null; |
|
126 | - } |
|
127 | - } else { |
|
128 | - $result = new Change($type, $path); |
|
129 | - } |
|
130 | - return $result; |
|
131 | - } |
|
103 | + /** |
|
104 | + * @param \Icewind\SMB\Change $change |
|
105 | + * @return IChange|null |
|
106 | + */ |
|
107 | + private function mapChange(\Icewind\SMB\Change $change) { |
|
108 | + $path = $this->relativePath($change->getPath()); |
|
109 | + if (is_null($path)) { |
|
110 | + return null; |
|
111 | + } |
|
112 | + if ($change->getCode() === \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_OLD) { |
|
113 | + $this->oldRenamePath = $path; |
|
114 | + return null; |
|
115 | + } |
|
116 | + $type = $this->mapNotifyType($change->getCode()); |
|
117 | + if (is_null($type)) { |
|
118 | + return null; |
|
119 | + } |
|
120 | + if ($type === IChange::RENAMED) { |
|
121 | + if (!is_null($this->oldRenamePath)) { |
|
122 | + $result = new RenameChange($type, $this->oldRenamePath, $path); |
|
123 | + $this->oldRenamePath = null; |
|
124 | + } else { |
|
125 | + $result = null; |
|
126 | + } |
|
127 | + } else { |
|
128 | + $result = new Change($type, $path); |
|
129 | + } |
|
130 | + return $result; |
|
131 | + } |
|
132 | 132 | |
133 | - private function mapNotifyType($smbType) { |
|
134 | - switch ($smbType) { |
|
135 | - case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED: |
|
136 | - return IChange::ADDED; |
|
137 | - case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED: |
|
138 | - return IChange::REMOVED; |
|
139 | - case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED: |
|
140 | - case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM: |
|
141 | - case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM: |
|
142 | - case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM: |
|
143 | - return IChange::MODIFIED; |
|
144 | - case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW: |
|
145 | - return IChange::RENAMED; |
|
146 | - default: |
|
147 | - return null; |
|
148 | - } |
|
149 | - } |
|
133 | + private function mapNotifyType($smbType) { |
|
134 | + switch ($smbType) { |
|
135 | + case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED: |
|
136 | + return IChange::ADDED; |
|
137 | + case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED: |
|
138 | + return IChange::REMOVED; |
|
139 | + case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED: |
|
140 | + case \Icewind\SMB\INotifyHandler::NOTIFY_ADDED_STREAM: |
|
141 | + case \Icewind\SMB\INotifyHandler::NOTIFY_MODIFIED_STREAM: |
|
142 | + case \Icewind\SMB\INotifyHandler::NOTIFY_REMOVED_STREAM: |
|
143 | + return IChange::MODIFIED; |
|
144 | + case \Icewind\SMB\INotifyHandler::NOTIFY_RENAMED_NEW: |
|
145 | + return IChange::RENAMED; |
|
146 | + default: |
|
147 | + return null; |
|
148 | + } |
|
149 | + } |
|
150 | 150 | } |
@@ -64,7 +64,7 @@ |
||
64 | 64 | |
65 | 65 | public function listen(callable $callback) { |
66 | 66 | $oldRenamePath = null; |
67 | - $this->shareNotifyHandler->listen(function (\Icewind\SMB\Change $shareChange) use ($callback) { |
|
67 | + $this->shareNotifyHandler->listen(function(\Icewind\SMB\Change $shareChange) use ($callback) { |
|
68 | 68 | $change = $this->mapChange($shareChange); |
69 | 69 | if (!is_null($change)) { |
70 | 70 | return $callback($change); |