@@ -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,120 +38,120 @@ |
||
| 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 | - public function __construct($params) { |
|
| 48 | - if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { |
|
| 49 | - $this->host=$params['host']; |
|
| 50 | - $this->user=$params['user']; |
|
| 51 | - $this->password=$params['password']; |
|
| 52 | - if (isset($params['secure'])) { |
|
| 53 | - $this->secure = $params['secure']; |
|
| 54 | - } else { |
|
| 55 | - $this->secure = false; |
|
| 56 | - } |
|
| 57 | - $this->root=isset($params['root'])?$params['root']:'/'; |
|
| 58 | - if ( ! $this->root || $this->root[0]!=='/') { |
|
| 59 | - $this->root='/'.$this->root; |
|
| 60 | - } |
|
| 61 | - if (substr($this->root, -1) !== '/') { |
|
| 62 | - $this->root .= '/'; |
|
| 63 | - } |
|
| 64 | - } else { |
|
| 65 | - throw new \Exception('Creating FTP storage failed'); |
|
| 66 | - } |
|
| 47 | + public function __construct($params) { |
|
| 48 | + if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { |
|
| 49 | + $this->host=$params['host']; |
|
| 50 | + $this->user=$params['user']; |
|
| 51 | + $this->password=$params['password']; |
|
| 52 | + if (isset($params['secure'])) { |
|
| 53 | + $this->secure = $params['secure']; |
|
| 54 | + } else { |
|
| 55 | + $this->secure = false; |
|
| 56 | + } |
|
| 57 | + $this->root=isset($params['root'])?$params['root']:'/'; |
|
| 58 | + if ( ! $this->root || $this->root[0]!=='/') { |
|
| 59 | + $this->root='/'.$this->root; |
|
| 60 | + } |
|
| 61 | + if (substr($this->root, -1) !== '/') { |
|
| 62 | + $this->root .= '/'; |
|
| 63 | + } |
|
| 64 | + } else { |
|
| 65 | + throw new \Exception('Creating FTP storage failed'); |
|
| 66 | + } |
|
| 67 | 67 | |
| 68 | - } |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - public function getId(){ |
|
| 71 | - return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root; |
|
| 72 | - } |
|
| 70 | + public function getId(){ |
|
| 71 | + return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - /** |
|
| 75 | - * construct the ftp url |
|
| 76 | - * @param string $path |
|
| 77 | - * @return string |
|
| 78 | - */ |
|
| 79 | - public function constructUrl($path) { |
|
| 80 | - $url='ftp'; |
|
| 81 | - if ($this->secure) { |
|
| 82 | - $url.='s'; |
|
| 83 | - } |
|
| 84 | - $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
| 85 | - return $url; |
|
| 86 | - } |
|
| 74 | + /** |
|
| 75 | + * construct the ftp url |
|
| 76 | + * @param string $path |
|
| 77 | + * @return string |
|
| 78 | + */ |
|
| 79 | + public function constructUrl($path) { |
|
| 80 | + $url='ftp'; |
|
| 81 | + if ($this->secure) { |
|
| 82 | + $url.='s'; |
|
| 83 | + } |
|
| 84 | + $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
| 85 | + return $url; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - /** |
|
| 89 | - * Unlinks file or directory |
|
| 90 | - * @param string $path |
|
| 91 | - */ |
|
| 92 | - public function unlink($path) { |
|
| 93 | - if ($this->is_dir($path)) { |
|
| 94 | - return $this->rmdir($path); |
|
| 95 | - } |
|
| 96 | - else { |
|
| 97 | - $url = $this->constructUrl($path); |
|
| 98 | - $result = unlink($url); |
|
| 99 | - clearstatcache(true, $url); |
|
| 100 | - return $result; |
|
| 101 | - } |
|
| 102 | - } |
|
| 103 | - public function fopen($path,$mode) { |
|
| 104 | - switch($mode) { |
|
| 105 | - case 'r': |
|
| 106 | - case 'rb': |
|
| 107 | - case 'w': |
|
| 108 | - case 'wb': |
|
| 109 | - case 'a': |
|
| 110 | - case 'ab': |
|
| 111 | - //these are supported by the wrapper |
|
| 112 | - $context = stream_context_create(array('ftp' => array('overwrite' => true))); |
|
| 113 | - $handle = fopen($this->constructUrl($path), $mode, false, $context); |
|
| 114 | - return RetryWrapper::wrap($handle); |
|
| 115 | - case 'r+': |
|
| 116 | - case 'w+': |
|
| 117 | - case 'wb+': |
|
| 118 | - case 'a+': |
|
| 119 | - case 'x': |
|
| 120 | - case 'x+': |
|
| 121 | - case 'c': |
|
| 122 | - case 'c+': |
|
| 123 | - //emulate these |
|
| 124 | - if (strrpos($path, '.')!==false) { |
|
| 125 | - $ext=substr($path, strrpos($path, '.')); |
|
| 126 | - } else { |
|
| 127 | - $ext=''; |
|
| 128 | - } |
|
| 129 | - $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
|
| 130 | - if ($this->file_exists($path)) { |
|
| 131 | - $this->getFile($path, $tmpFile); |
|
| 132 | - } |
|
| 133 | - $handle = fopen($tmpFile, $mode); |
|
| 134 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 135 | - $this->writeBack($tmpFile, $path); |
|
| 136 | - }); |
|
| 137 | - } |
|
| 138 | - return false; |
|
| 139 | - } |
|
| 88 | + /** |
|
| 89 | + * Unlinks file or directory |
|
| 90 | + * @param string $path |
|
| 91 | + */ |
|
| 92 | + public function unlink($path) { |
|
| 93 | + if ($this->is_dir($path)) { |
|
| 94 | + return $this->rmdir($path); |
|
| 95 | + } |
|
| 96 | + else { |
|
| 97 | + $url = $this->constructUrl($path); |
|
| 98 | + $result = unlink($url); |
|
| 99 | + clearstatcache(true, $url); |
|
| 100 | + return $result; |
|
| 101 | + } |
|
| 102 | + } |
|
| 103 | + public function fopen($path,$mode) { |
|
| 104 | + switch($mode) { |
|
| 105 | + case 'r': |
|
| 106 | + case 'rb': |
|
| 107 | + case 'w': |
|
| 108 | + case 'wb': |
|
| 109 | + case 'a': |
|
| 110 | + case 'ab': |
|
| 111 | + //these are supported by the wrapper |
|
| 112 | + $context = stream_context_create(array('ftp' => array('overwrite' => true))); |
|
| 113 | + $handle = fopen($this->constructUrl($path), $mode, false, $context); |
|
| 114 | + return RetryWrapper::wrap($handle); |
|
| 115 | + case 'r+': |
|
| 116 | + case 'w+': |
|
| 117 | + case 'wb+': |
|
| 118 | + case 'a+': |
|
| 119 | + case 'x': |
|
| 120 | + case 'x+': |
|
| 121 | + case 'c': |
|
| 122 | + case 'c+': |
|
| 123 | + //emulate these |
|
| 124 | + if (strrpos($path, '.')!==false) { |
|
| 125 | + $ext=substr($path, strrpos($path, '.')); |
|
| 126 | + } else { |
|
| 127 | + $ext=''; |
|
| 128 | + } |
|
| 129 | + $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
|
| 130 | + if ($this->file_exists($path)) { |
|
| 131 | + $this->getFile($path, $tmpFile); |
|
| 132 | + } |
|
| 133 | + $handle = fopen($tmpFile, $mode); |
|
| 134 | + return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 135 | + $this->writeBack($tmpFile, $path); |
|
| 136 | + }); |
|
| 137 | + } |
|
| 138 | + return false; |
|
| 139 | + } |
|
| 140 | 140 | |
| 141 | - public function writeBack($tmpFile, $path) { |
|
| 142 | - $this->uploadFile($tmpFile, $path); |
|
| 143 | - unlink($tmpFile); |
|
| 144 | - } |
|
| 141 | + public function writeBack($tmpFile, $path) { |
|
| 142 | + $this->uploadFile($tmpFile, $path); |
|
| 143 | + unlink($tmpFile); |
|
| 144 | + } |
|
| 145 | 145 | |
| 146 | - /** |
|
| 147 | - * check if php-ftp is installed |
|
| 148 | - */ |
|
| 149 | - public static function checkDependencies() { |
|
| 150 | - if (function_exists('ftp_login')) { |
|
| 151 | - return true; |
|
| 152 | - } else { |
|
| 153 | - return array('ftp'); |
|
| 154 | - } |
|
| 155 | - } |
|
| 146 | + /** |
|
| 147 | + * check if php-ftp is installed |
|
| 148 | + */ |
|
| 149 | + public static function checkDependencies() { |
|
| 150 | + if (function_exists('ftp_login')) { |
|
| 151 | + return true; |
|
| 152 | + } else { |
|
| 153 | + return array('ftp'); |
|
| 154 | + } |
|
| 155 | + } |
|
| 156 | 156 | |
| 157 | 157 | } |
@@ -37,7 +37,7 @@ 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; |
@@ -46,17 +46,17 @@ discard block |
||
| 46 | 46 | |
| 47 | 47 | public function __construct($params) { |
| 48 | 48 | if (isset($params['host']) && isset($params['user']) && isset($params['password'])) { |
| 49 | - $this->host=$params['host']; |
|
| 50 | - $this->user=$params['user']; |
|
| 51 | - $this->password=$params['password']; |
|
| 49 | + $this->host = $params['host']; |
|
| 50 | + $this->user = $params['user']; |
|
| 51 | + $this->password = $params['password']; |
|
| 52 | 52 | if (isset($params['secure'])) { |
| 53 | 53 | $this->secure = $params['secure']; |
| 54 | 54 | } else { |
| 55 | 55 | $this->secure = false; |
| 56 | 56 | } |
| 57 | - $this->root=isset($params['root'])?$params['root']:'/'; |
|
| 58 | - if ( ! $this->root || $this->root[0]!=='/') { |
|
| 59 | - $this->root='/'.$this->root; |
|
| 57 | + $this->root = isset($params['root']) ? $params['root'] : '/'; |
|
| 58 | + if (!$this->root || $this->root[0] !== '/') { |
|
| 59 | + $this->root = '/'.$this->root; |
|
| 60 | 60 | } |
| 61 | 61 | if (substr($this->root, -1) !== '/') { |
| 62 | 62 | $this->root .= '/'; |
@@ -67,8 +67,8 @@ discard block |
||
| 67 | 67 | |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | - public function getId(){ |
|
| 71 | - return 'ftp::' . $this->user . '@' . $this->host . '/' . $this->root; |
|
| 70 | + public function getId() { |
|
| 71 | + return 'ftp::'.$this->user.'@'.$this->host.'/'.$this->root; |
|
| 72 | 72 | } |
| 73 | 73 | |
| 74 | 74 | /** |
@@ -77,11 +77,11 @@ discard block |
||
| 77 | 77 | * @return string |
| 78 | 78 | */ |
| 79 | 79 | public function constructUrl($path) { |
| 80 | - $url='ftp'; |
|
| 80 | + $url = 'ftp'; |
|
| 81 | 81 | if ($this->secure) { |
| 82 | - $url.='s'; |
|
| 82 | + $url .= 's'; |
|
| 83 | 83 | } |
| 84 | - $url.='://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
| 84 | + $url .= '://'.urlencode($this->user).':'.urlencode($this->password).'@'.$this->host.$this->root.$path; |
|
| 85 | 85 | return $url; |
| 86 | 86 | } |
| 87 | 87 | |
@@ -100,8 +100,8 @@ discard block |
||
| 100 | 100 | return $result; |
| 101 | 101 | } |
| 102 | 102 | } |
| 103 | - public function fopen($path,$mode) { |
|
| 104 | - switch($mode) { |
|
| 103 | + public function fopen($path, $mode) { |
|
| 104 | + switch ($mode) { |
|
| 105 | 105 | case 'r': |
| 106 | 106 | case 'rb': |
| 107 | 107 | case 'w': |
@@ -121,17 +121,17 @@ discard block |
||
| 121 | 121 | case 'c': |
| 122 | 122 | case 'c+': |
| 123 | 123 | //emulate these |
| 124 | - if (strrpos($path, '.')!==false) { |
|
| 125 | - $ext=substr($path, strrpos($path, '.')); |
|
| 124 | + if (strrpos($path, '.') !== false) { |
|
| 125 | + $ext = substr($path, strrpos($path, '.')); |
|
| 126 | 126 | } else { |
| 127 | - $ext=''; |
|
| 127 | + $ext = ''; |
|
| 128 | 128 | } |
| 129 | 129 | $tmpFile = \OC::$server->getTempManager()->getTemporaryFile(); |
| 130 | 130 | if ($this->file_exists($path)) { |
| 131 | 131 | $this->getFile($path, $tmpFile); |
| 132 | 132 | } |
| 133 | 133 | $handle = fopen($tmpFile, $mode); |
| 134 | - return CallbackWrapper::wrap($handle, null, null, function () use ($path, $tmpFile) { |
|
| 134 | + return CallbackWrapper::wrap($handle, null, null, function() use ($path, $tmpFile) { |
|
| 135 | 135 | $this->writeBack($tmpFile, $path); |
| 136 | 136 | }); |
| 137 | 137 | } |
@@ -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); |
@@ -35,398 +35,398 @@ |
||
| 35 | 35 | * External storage configuration |
| 36 | 36 | */ |
| 37 | 37 | class StorageConfig implements \JsonSerializable { |
| 38 | - const MOUNT_TYPE_ADMIN = 1; |
|
| 39 | - const MOUNT_TYPE_PERSONAl = 2; |
|
| 40 | - |
|
| 41 | - /** |
|
| 42 | - * Storage config id |
|
| 43 | - * |
|
| 44 | - * @var int |
|
| 45 | - */ |
|
| 46 | - private $id; |
|
| 47 | - |
|
| 48 | - /** |
|
| 49 | - * Backend |
|
| 50 | - * |
|
| 51 | - * @var Backend |
|
| 52 | - */ |
|
| 53 | - private $backend; |
|
| 54 | - |
|
| 55 | - /** |
|
| 56 | - * Authentication mechanism |
|
| 57 | - * |
|
| 58 | - * @var AuthMechanism |
|
| 59 | - */ |
|
| 60 | - private $authMechanism; |
|
| 61 | - |
|
| 62 | - /** |
|
| 63 | - * Backend options |
|
| 64 | - * |
|
| 65 | - * @var array |
|
| 66 | - */ |
|
| 67 | - private $backendOptions = []; |
|
| 68 | - |
|
| 69 | - /** |
|
| 70 | - * Mount point path, relative to the user's "files" folder |
|
| 71 | - * |
|
| 72 | - * @var string |
|
| 73 | - */ |
|
| 74 | - private $mountPoint; |
|
| 75 | - |
|
| 76 | - /** |
|
| 77 | - * Storage status |
|
| 78 | - * |
|
| 79 | - * @var int |
|
| 80 | - */ |
|
| 81 | - private $status; |
|
| 82 | - |
|
| 83 | - /** |
|
| 84 | - * Status message |
|
| 85 | - * |
|
| 86 | - * @var string |
|
| 87 | - */ |
|
| 88 | - private $statusMessage; |
|
| 89 | - |
|
| 90 | - /** |
|
| 91 | - * Priority |
|
| 92 | - * |
|
| 93 | - * @var int |
|
| 94 | - */ |
|
| 95 | - private $priority; |
|
| 96 | - |
|
| 97 | - /** |
|
| 98 | - * List of users who have access to this storage |
|
| 99 | - * |
|
| 100 | - * @var array |
|
| 101 | - */ |
|
| 102 | - private $applicableUsers = []; |
|
| 103 | - |
|
| 104 | - /** |
|
| 105 | - * List of groups that have access to this storage |
|
| 106 | - * |
|
| 107 | - * @var array |
|
| 108 | - */ |
|
| 109 | - private $applicableGroups = []; |
|
| 110 | - |
|
| 111 | - /** |
|
| 112 | - * Mount-specific options |
|
| 113 | - * |
|
| 114 | - * @var array |
|
| 115 | - */ |
|
| 116 | - private $mountOptions = []; |
|
| 117 | - |
|
| 118 | - /** |
|
| 119 | - * Whether it's a personal or admin mount |
|
| 120 | - * |
|
| 121 | - * @var int |
|
| 122 | - */ |
|
| 123 | - private $type; |
|
| 124 | - |
|
| 125 | - /** |
|
| 126 | - * Creates a storage config |
|
| 127 | - * |
|
| 128 | - * @param int|null $id config id or null for a new config |
|
| 129 | - */ |
|
| 130 | - public function __construct($id = null) { |
|
| 131 | - $this->id = $id; |
|
| 132 | - $this->mountOptions['enable_sharing'] = false; |
|
| 133 | - } |
|
| 134 | - |
|
| 135 | - /** |
|
| 136 | - * Returns the configuration id |
|
| 137 | - * |
|
| 138 | - * @return int |
|
| 139 | - */ |
|
| 140 | - public function getId() { |
|
| 141 | - return $this->id; |
|
| 142 | - } |
|
| 143 | - |
|
| 144 | - /** |
|
| 145 | - * Sets the configuration id |
|
| 146 | - * |
|
| 147 | - * @param int $id configuration id |
|
| 148 | - */ |
|
| 149 | - public function setId($id) { |
|
| 150 | - $this->id = $id; |
|
| 151 | - } |
|
| 152 | - |
|
| 153 | - /** |
|
| 154 | - * Returns mount point path relative to the user's |
|
| 155 | - * "files" folder. |
|
| 156 | - * |
|
| 157 | - * @return string path |
|
| 158 | - */ |
|
| 159 | - public function getMountPoint() { |
|
| 160 | - return $this->mountPoint; |
|
| 161 | - } |
|
| 162 | - |
|
| 163 | - /** |
|
| 164 | - * Sets mount point path relative to the user's |
|
| 165 | - * "files" folder. |
|
| 166 | - * The path will be normalized. |
|
| 167 | - * |
|
| 168 | - * @param string $mountPoint path |
|
| 169 | - */ |
|
| 170 | - public function setMountPoint($mountPoint) { |
|
| 171 | - $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint); |
|
| 172 | - } |
|
| 173 | - |
|
| 174 | - /** |
|
| 175 | - * @return Backend |
|
| 176 | - */ |
|
| 177 | - public function getBackend() { |
|
| 178 | - return $this->backend; |
|
| 179 | - } |
|
| 180 | - |
|
| 181 | - /** |
|
| 182 | - * @param Backend $backend |
|
| 183 | - */ |
|
| 184 | - public function setBackend(Backend $backend) { |
|
| 185 | - $this->backend= $backend; |
|
| 186 | - } |
|
| 187 | - |
|
| 188 | - /** |
|
| 189 | - * @return AuthMechanism |
|
| 190 | - */ |
|
| 191 | - public function getAuthMechanism() { |
|
| 192 | - return $this->authMechanism; |
|
| 193 | - } |
|
| 194 | - |
|
| 195 | - /** |
|
| 196 | - * @param AuthMechanism $authMechanism |
|
| 197 | - */ |
|
| 198 | - public function setAuthMechanism(AuthMechanism $authMechanism) { |
|
| 199 | - $this->authMechanism = $authMechanism; |
|
| 200 | - } |
|
| 201 | - |
|
| 202 | - /** |
|
| 203 | - * Returns the external storage backend-specific options |
|
| 204 | - * |
|
| 205 | - * @return array backend options |
|
| 206 | - */ |
|
| 207 | - public function getBackendOptions() { |
|
| 208 | - return $this->backendOptions; |
|
| 209 | - } |
|
| 210 | - |
|
| 211 | - /** |
|
| 212 | - * Sets the external storage backend-specific options |
|
| 213 | - * |
|
| 214 | - * @param array $backendOptions backend options |
|
| 215 | - */ |
|
| 216 | - public function setBackendOptions($backendOptions) { |
|
| 217 | - if($this->getBackend() instanceof Backend) { |
|
| 218 | - $parameters = $this->getBackend()->getParameters(); |
|
| 219 | - foreach($backendOptions as $key => $value) { |
|
| 220 | - if(isset($parameters[$key])) { |
|
| 221 | - switch ($parameters[$key]->getType()) { |
|
| 222 | - case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
|
| 223 | - $value = (bool)$value; |
|
| 224 | - break; |
|
| 225 | - } |
|
| 226 | - $backendOptions[$key] = $value; |
|
| 227 | - } |
|
| 228 | - } |
|
| 229 | - } |
|
| 230 | - |
|
| 231 | - $this->backendOptions = $backendOptions; |
|
| 232 | - } |
|
| 233 | - |
|
| 234 | - /** |
|
| 235 | - * @param string $key |
|
| 236 | - * @return mixed |
|
| 237 | - */ |
|
| 238 | - public function getBackendOption($key) { |
|
| 239 | - if (isset($this->backendOptions[$key])) { |
|
| 240 | - return $this->backendOptions[$key]; |
|
| 241 | - } |
|
| 242 | - return null; |
|
| 243 | - } |
|
| 244 | - |
|
| 245 | - /** |
|
| 246 | - * @param string $key |
|
| 247 | - * @param mixed $value |
|
| 248 | - */ |
|
| 249 | - public function setBackendOption($key, $value) { |
|
| 250 | - $this->backendOptions[$key] = $value; |
|
| 251 | - } |
|
| 252 | - |
|
| 253 | - /** |
|
| 254 | - * Returns the mount priority |
|
| 255 | - * |
|
| 256 | - * @return int priority |
|
| 257 | - */ |
|
| 258 | - public function getPriority() { |
|
| 259 | - return $this->priority; |
|
| 260 | - } |
|
| 261 | - |
|
| 262 | - /** |
|
| 263 | - * Sets the mount priotity |
|
| 264 | - * |
|
| 265 | - * @param int $priority priority |
|
| 266 | - */ |
|
| 267 | - public function setPriority($priority) { |
|
| 268 | - $this->priority = $priority; |
|
| 269 | - } |
|
| 270 | - |
|
| 271 | - /** |
|
| 272 | - * Returns the users for which to mount this storage |
|
| 273 | - * |
|
| 274 | - * @return array applicable users |
|
| 275 | - */ |
|
| 276 | - public function getApplicableUsers() { |
|
| 277 | - return $this->applicableUsers; |
|
| 278 | - } |
|
| 279 | - |
|
| 280 | - /** |
|
| 281 | - * Sets the users for which to mount this storage |
|
| 282 | - * |
|
| 283 | - * @param array|null $applicableUsers applicable users |
|
| 284 | - */ |
|
| 285 | - public function setApplicableUsers($applicableUsers) { |
|
| 286 | - if (is_null($applicableUsers)) { |
|
| 287 | - $applicableUsers = []; |
|
| 288 | - } |
|
| 289 | - $this->applicableUsers = $applicableUsers; |
|
| 290 | - } |
|
| 291 | - |
|
| 292 | - /** |
|
| 293 | - * Returns the groups for which to mount this storage |
|
| 294 | - * |
|
| 295 | - * @return array applicable groups |
|
| 296 | - */ |
|
| 297 | - public function getApplicableGroups() { |
|
| 298 | - return $this->applicableGroups; |
|
| 299 | - } |
|
| 300 | - |
|
| 301 | - /** |
|
| 302 | - * Sets the groups for which to mount this storage |
|
| 303 | - * |
|
| 304 | - * @param array|null $applicableGroups applicable groups |
|
| 305 | - */ |
|
| 306 | - public function setApplicableGroups($applicableGroups) { |
|
| 307 | - if (is_null($applicableGroups)) { |
|
| 308 | - $applicableGroups = []; |
|
| 309 | - } |
|
| 310 | - $this->applicableGroups = $applicableGroups; |
|
| 311 | - } |
|
| 312 | - |
|
| 313 | - /** |
|
| 314 | - * Returns the mount-specific options |
|
| 315 | - * |
|
| 316 | - * @return array mount specific options |
|
| 317 | - */ |
|
| 318 | - public function getMountOptions() { |
|
| 319 | - return $this->mountOptions; |
|
| 320 | - } |
|
| 321 | - |
|
| 322 | - /** |
|
| 323 | - * Sets the mount-specific options |
|
| 324 | - * |
|
| 325 | - * @param array $mountOptions applicable groups |
|
| 326 | - */ |
|
| 327 | - public function setMountOptions($mountOptions) { |
|
| 328 | - if (is_null($mountOptions)) { |
|
| 329 | - $mountOptions = []; |
|
| 330 | - } |
|
| 331 | - $this->mountOptions = $mountOptions; |
|
| 332 | - } |
|
| 333 | - |
|
| 334 | - /** |
|
| 335 | - * @param string $key |
|
| 336 | - * @return mixed |
|
| 337 | - */ |
|
| 338 | - public function getMountOption($key) { |
|
| 339 | - if (isset($this->mountOptions[$key])) { |
|
| 340 | - return $this->mountOptions[$key]; |
|
| 341 | - } |
|
| 342 | - return null; |
|
| 343 | - } |
|
| 344 | - |
|
| 345 | - /** |
|
| 346 | - * @param string $key |
|
| 347 | - * @param mixed $value |
|
| 348 | - */ |
|
| 349 | - public function setMountOption($key, $value) { |
|
| 350 | - $this->mountOptions[$key] = $value; |
|
| 351 | - } |
|
| 352 | - |
|
| 353 | - /** |
|
| 354 | - * Gets the storage status, whether the config worked last time |
|
| 355 | - * |
|
| 356 | - * @return int $status status |
|
| 357 | - */ |
|
| 358 | - public function getStatus() { |
|
| 359 | - return $this->status; |
|
| 360 | - } |
|
| 361 | - |
|
| 362 | - /** |
|
| 363 | - * Gets the message describing the storage status |
|
| 364 | - * |
|
| 365 | - * @return string|null |
|
| 366 | - */ |
|
| 367 | - public function getStatusMessage() { |
|
| 368 | - return $this->statusMessage; |
|
| 369 | - } |
|
| 370 | - |
|
| 371 | - /** |
|
| 372 | - * Sets the storage status, whether the config worked last time |
|
| 373 | - * |
|
| 374 | - * @param int $status status |
|
| 375 | - * @param string|null $message optional message |
|
| 376 | - */ |
|
| 377 | - public function setStatus($status, $message = null) { |
|
| 378 | - $this->status = $status; |
|
| 379 | - $this->statusMessage = $message; |
|
| 380 | - } |
|
| 381 | - |
|
| 382 | - /** |
|
| 383 | - * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 384 | - */ |
|
| 385 | - public function getType() { |
|
| 386 | - return $this->type; |
|
| 387 | - } |
|
| 388 | - |
|
| 389 | - /** |
|
| 390 | - * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 391 | - */ |
|
| 392 | - public function setType($type) { |
|
| 393 | - $this->type = $type; |
|
| 394 | - } |
|
| 395 | - |
|
| 396 | - /** |
|
| 397 | - * Serialize config to JSON |
|
| 398 | - * |
|
| 399 | - * @return array |
|
| 400 | - */ |
|
| 401 | - public function jsonSerialize() { |
|
| 402 | - $result = []; |
|
| 403 | - if (!is_null($this->id)) { |
|
| 404 | - $result['id'] = $this->id; |
|
| 405 | - } |
|
| 406 | - $result['mountPoint'] = $this->mountPoint; |
|
| 407 | - $result['backend'] = $this->backend->getIdentifier(); |
|
| 408 | - $result['authMechanism'] = $this->authMechanism->getIdentifier(); |
|
| 409 | - $result['backendOptions'] = $this->backendOptions; |
|
| 410 | - if (!is_null($this->priority)) { |
|
| 411 | - $result['priority'] = $this->priority; |
|
| 412 | - } |
|
| 413 | - if (!empty($this->applicableUsers)) { |
|
| 414 | - $result['applicableUsers'] = $this->applicableUsers; |
|
| 415 | - } |
|
| 416 | - if (!empty($this->applicableGroups)) { |
|
| 417 | - $result['applicableGroups'] = $this->applicableGroups; |
|
| 418 | - } |
|
| 419 | - if (!empty($this->mountOptions)) { |
|
| 420 | - $result['mountOptions'] = $this->mountOptions; |
|
| 421 | - } |
|
| 422 | - if (!is_null($this->status)) { |
|
| 423 | - $result['status'] = $this->status; |
|
| 424 | - } |
|
| 425 | - if (!is_null($this->statusMessage)) { |
|
| 426 | - $result['statusMessage'] = $this->statusMessage; |
|
| 427 | - } |
|
| 428 | - $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
|
| 429 | - $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
| 430 | - return $result; |
|
| 431 | - } |
|
| 38 | + const MOUNT_TYPE_ADMIN = 1; |
|
| 39 | + const MOUNT_TYPE_PERSONAl = 2; |
|
| 40 | + |
|
| 41 | + /** |
|
| 42 | + * Storage config id |
|
| 43 | + * |
|
| 44 | + * @var int |
|
| 45 | + */ |
|
| 46 | + private $id; |
|
| 47 | + |
|
| 48 | + /** |
|
| 49 | + * Backend |
|
| 50 | + * |
|
| 51 | + * @var Backend |
|
| 52 | + */ |
|
| 53 | + private $backend; |
|
| 54 | + |
|
| 55 | + /** |
|
| 56 | + * Authentication mechanism |
|
| 57 | + * |
|
| 58 | + * @var AuthMechanism |
|
| 59 | + */ |
|
| 60 | + private $authMechanism; |
|
| 61 | + |
|
| 62 | + /** |
|
| 63 | + * Backend options |
|
| 64 | + * |
|
| 65 | + * @var array |
|
| 66 | + */ |
|
| 67 | + private $backendOptions = []; |
|
| 68 | + |
|
| 69 | + /** |
|
| 70 | + * Mount point path, relative to the user's "files" folder |
|
| 71 | + * |
|
| 72 | + * @var string |
|
| 73 | + */ |
|
| 74 | + private $mountPoint; |
|
| 75 | + |
|
| 76 | + /** |
|
| 77 | + * Storage status |
|
| 78 | + * |
|
| 79 | + * @var int |
|
| 80 | + */ |
|
| 81 | + private $status; |
|
| 82 | + |
|
| 83 | + /** |
|
| 84 | + * Status message |
|
| 85 | + * |
|
| 86 | + * @var string |
|
| 87 | + */ |
|
| 88 | + private $statusMessage; |
|
| 89 | + |
|
| 90 | + /** |
|
| 91 | + * Priority |
|
| 92 | + * |
|
| 93 | + * @var int |
|
| 94 | + */ |
|
| 95 | + private $priority; |
|
| 96 | + |
|
| 97 | + /** |
|
| 98 | + * List of users who have access to this storage |
|
| 99 | + * |
|
| 100 | + * @var array |
|
| 101 | + */ |
|
| 102 | + private $applicableUsers = []; |
|
| 103 | + |
|
| 104 | + /** |
|
| 105 | + * List of groups that have access to this storage |
|
| 106 | + * |
|
| 107 | + * @var array |
|
| 108 | + */ |
|
| 109 | + private $applicableGroups = []; |
|
| 110 | + |
|
| 111 | + /** |
|
| 112 | + * Mount-specific options |
|
| 113 | + * |
|
| 114 | + * @var array |
|
| 115 | + */ |
|
| 116 | + private $mountOptions = []; |
|
| 117 | + |
|
| 118 | + /** |
|
| 119 | + * Whether it's a personal or admin mount |
|
| 120 | + * |
|
| 121 | + * @var int |
|
| 122 | + */ |
|
| 123 | + private $type; |
|
| 124 | + |
|
| 125 | + /** |
|
| 126 | + * Creates a storage config |
|
| 127 | + * |
|
| 128 | + * @param int|null $id config id or null for a new config |
|
| 129 | + */ |
|
| 130 | + public function __construct($id = null) { |
|
| 131 | + $this->id = $id; |
|
| 132 | + $this->mountOptions['enable_sharing'] = false; |
|
| 133 | + } |
|
| 134 | + |
|
| 135 | + /** |
|
| 136 | + * Returns the configuration id |
|
| 137 | + * |
|
| 138 | + * @return int |
|
| 139 | + */ |
|
| 140 | + public function getId() { |
|
| 141 | + return $this->id; |
|
| 142 | + } |
|
| 143 | + |
|
| 144 | + /** |
|
| 145 | + * Sets the configuration id |
|
| 146 | + * |
|
| 147 | + * @param int $id configuration id |
|
| 148 | + */ |
|
| 149 | + public function setId($id) { |
|
| 150 | + $this->id = $id; |
|
| 151 | + } |
|
| 152 | + |
|
| 153 | + /** |
|
| 154 | + * Returns mount point path relative to the user's |
|
| 155 | + * "files" folder. |
|
| 156 | + * |
|
| 157 | + * @return string path |
|
| 158 | + */ |
|
| 159 | + public function getMountPoint() { |
|
| 160 | + return $this->mountPoint; |
|
| 161 | + } |
|
| 162 | + |
|
| 163 | + /** |
|
| 164 | + * Sets mount point path relative to the user's |
|
| 165 | + * "files" folder. |
|
| 166 | + * The path will be normalized. |
|
| 167 | + * |
|
| 168 | + * @param string $mountPoint path |
|
| 169 | + */ |
|
| 170 | + public function setMountPoint($mountPoint) { |
|
| 171 | + $this->mountPoint = \OC\Files\Filesystem::normalizePath($mountPoint); |
|
| 172 | + } |
|
| 173 | + |
|
| 174 | + /** |
|
| 175 | + * @return Backend |
|
| 176 | + */ |
|
| 177 | + public function getBackend() { |
|
| 178 | + return $this->backend; |
|
| 179 | + } |
|
| 180 | + |
|
| 181 | + /** |
|
| 182 | + * @param Backend $backend |
|
| 183 | + */ |
|
| 184 | + public function setBackend(Backend $backend) { |
|
| 185 | + $this->backend= $backend; |
|
| 186 | + } |
|
| 187 | + |
|
| 188 | + /** |
|
| 189 | + * @return AuthMechanism |
|
| 190 | + */ |
|
| 191 | + public function getAuthMechanism() { |
|
| 192 | + return $this->authMechanism; |
|
| 193 | + } |
|
| 194 | + |
|
| 195 | + /** |
|
| 196 | + * @param AuthMechanism $authMechanism |
|
| 197 | + */ |
|
| 198 | + public function setAuthMechanism(AuthMechanism $authMechanism) { |
|
| 199 | + $this->authMechanism = $authMechanism; |
|
| 200 | + } |
|
| 201 | + |
|
| 202 | + /** |
|
| 203 | + * Returns the external storage backend-specific options |
|
| 204 | + * |
|
| 205 | + * @return array backend options |
|
| 206 | + */ |
|
| 207 | + public function getBackendOptions() { |
|
| 208 | + return $this->backendOptions; |
|
| 209 | + } |
|
| 210 | + |
|
| 211 | + /** |
|
| 212 | + * Sets the external storage backend-specific options |
|
| 213 | + * |
|
| 214 | + * @param array $backendOptions backend options |
|
| 215 | + */ |
|
| 216 | + public function setBackendOptions($backendOptions) { |
|
| 217 | + if($this->getBackend() instanceof Backend) { |
|
| 218 | + $parameters = $this->getBackend()->getParameters(); |
|
| 219 | + foreach($backendOptions as $key => $value) { |
|
| 220 | + if(isset($parameters[$key])) { |
|
| 221 | + switch ($parameters[$key]->getType()) { |
|
| 222 | + case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
|
| 223 | + $value = (bool)$value; |
|
| 224 | + break; |
|
| 225 | + } |
|
| 226 | + $backendOptions[$key] = $value; |
|
| 227 | + } |
|
| 228 | + } |
|
| 229 | + } |
|
| 230 | + |
|
| 231 | + $this->backendOptions = $backendOptions; |
|
| 232 | + } |
|
| 233 | + |
|
| 234 | + /** |
|
| 235 | + * @param string $key |
|
| 236 | + * @return mixed |
|
| 237 | + */ |
|
| 238 | + public function getBackendOption($key) { |
|
| 239 | + if (isset($this->backendOptions[$key])) { |
|
| 240 | + return $this->backendOptions[$key]; |
|
| 241 | + } |
|
| 242 | + return null; |
|
| 243 | + } |
|
| 244 | + |
|
| 245 | + /** |
|
| 246 | + * @param string $key |
|
| 247 | + * @param mixed $value |
|
| 248 | + */ |
|
| 249 | + public function setBackendOption($key, $value) { |
|
| 250 | + $this->backendOptions[$key] = $value; |
|
| 251 | + } |
|
| 252 | + |
|
| 253 | + /** |
|
| 254 | + * Returns the mount priority |
|
| 255 | + * |
|
| 256 | + * @return int priority |
|
| 257 | + */ |
|
| 258 | + public function getPriority() { |
|
| 259 | + return $this->priority; |
|
| 260 | + } |
|
| 261 | + |
|
| 262 | + /** |
|
| 263 | + * Sets the mount priotity |
|
| 264 | + * |
|
| 265 | + * @param int $priority priority |
|
| 266 | + */ |
|
| 267 | + public function setPriority($priority) { |
|
| 268 | + $this->priority = $priority; |
|
| 269 | + } |
|
| 270 | + |
|
| 271 | + /** |
|
| 272 | + * Returns the users for which to mount this storage |
|
| 273 | + * |
|
| 274 | + * @return array applicable users |
|
| 275 | + */ |
|
| 276 | + public function getApplicableUsers() { |
|
| 277 | + return $this->applicableUsers; |
|
| 278 | + } |
|
| 279 | + |
|
| 280 | + /** |
|
| 281 | + * Sets the users for which to mount this storage |
|
| 282 | + * |
|
| 283 | + * @param array|null $applicableUsers applicable users |
|
| 284 | + */ |
|
| 285 | + public function setApplicableUsers($applicableUsers) { |
|
| 286 | + if (is_null($applicableUsers)) { |
|
| 287 | + $applicableUsers = []; |
|
| 288 | + } |
|
| 289 | + $this->applicableUsers = $applicableUsers; |
|
| 290 | + } |
|
| 291 | + |
|
| 292 | + /** |
|
| 293 | + * Returns the groups for which to mount this storage |
|
| 294 | + * |
|
| 295 | + * @return array applicable groups |
|
| 296 | + */ |
|
| 297 | + public function getApplicableGroups() { |
|
| 298 | + return $this->applicableGroups; |
|
| 299 | + } |
|
| 300 | + |
|
| 301 | + /** |
|
| 302 | + * Sets the groups for which to mount this storage |
|
| 303 | + * |
|
| 304 | + * @param array|null $applicableGroups applicable groups |
|
| 305 | + */ |
|
| 306 | + public function setApplicableGroups($applicableGroups) { |
|
| 307 | + if (is_null($applicableGroups)) { |
|
| 308 | + $applicableGroups = []; |
|
| 309 | + } |
|
| 310 | + $this->applicableGroups = $applicableGroups; |
|
| 311 | + } |
|
| 312 | + |
|
| 313 | + /** |
|
| 314 | + * Returns the mount-specific options |
|
| 315 | + * |
|
| 316 | + * @return array mount specific options |
|
| 317 | + */ |
|
| 318 | + public function getMountOptions() { |
|
| 319 | + return $this->mountOptions; |
|
| 320 | + } |
|
| 321 | + |
|
| 322 | + /** |
|
| 323 | + * Sets the mount-specific options |
|
| 324 | + * |
|
| 325 | + * @param array $mountOptions applicable groups |
|
| 326 | + */ |
|
| 327 | + public function setMountOptions($mountOptions) { |
|
| 328 | + if (is_null($mountOptions)) { |
|
| 329 | + $mountOptions = []; |
|
| 330 | + } |
|
| 331 | + $this->mountOptions = $mountOptions; |
|
| 332 | + } |
|
| 333 | + |
|
| 334 | + /** |
|
| 335 | + * @param string $key |
|
| 336 | + * @return mixed |
|
| 337 | + */ |
|
| 338 | + public function getMountOption($key) { |
|
| 339 | + if (isset($this->mountOptions[$key])) { |
|
| 340 | + return $this->mountOptions[$key]; |
|
| 341 | + } |
|
| 342 | + return null; |
|
| 343 | + } |
|
| 344 | + |
|
| 345 | + /** |
|
| 346 | + * @param string $key |
|
| 347 | + * @param mixed $value |
|
| 348 | + */ |
|
| 349 | + public function setMountOption($key, $value) { |
|
| 350 | + $this->mountOptions[$key] = $value; |
|
| 351 | + } |
|
| 352 | + |
|
| 353 | + /** |
|
| 354 | + * Gets the storage status, whether the config worked last time |
|
| 355 | + * |
|
| 356 | + * @return int $status status |
|
| 357 | + */ |
|
| 358 | + public function getStatus() { |
|
| 359 | + return $this->status; |
|
| 360 | + } |
|
| 361 | + |
|
| 362 | + /** |
|
| 363 | + * Gets the message describing the storage status |
|
| 364 | + * |
|
| 365 | + * @return string|null |
|
| 366 | + */ |
|
| 367 | + public function getStatusMessage() { |
|
| 368 | + return $this->statusMessage; |
|
| 369 | + } |
|
| 370 | + |
|
| 371 | + /** |
|
| 372 | + * Sets the storage status, whether the config worked last time |
|
| 373 | + * |
|
| 374 | + * @param int $status status |
|
| 375 | + * @param string|null $message optional message |
|
| 376 | + */ |
|
| 377 | + public function setStatus($status, $message = null) { |
|
| 378 | + $this->status = $status; |
|
| 379 | + $this->statusMessage = $message; |
|
| 380 | + } |
|
| 381 | + |
|
| 382 | + /** |
|
| 383 | + * @return int self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 384 | + */ |
|
| 385 | + public function getType() { |
|
| 386 | + return $this->type; |
|
| 387 | + } |
|
| 388 | + |
|
| 389 | + /** |
|
| 390 | + * @param int $type self::MOUNT_TYPE_ADMIN or self::MOUNT_TYPE_PERSONAl |
|
| 391 | + */ |
|
| 392 | + public function setType($type) { |
|
| 393 | + $this->type = $type; |
|
| 394 | + } |
|
| 395 | + |
|
| 396 | + /** |
|
| 397 | + * Serialize config to JSON |
|
| 398 | + * |
|
| 399 | + * @return array |
|
| 400 | + */ |
|
| 401 | + public function jsonSerialize() { |
|
| 402 | + $result = []; |
|
| 403 | + if (!is_null($this->id)) { |
|
| 404 | + $result['id'] = $this->id; |
|
| 405 | + } |
|
| 406 | + $result['mountPoint'] = $this->mountPoint; |
|
| 407 | + $result['backend'] = $this->backend->getIdentifier(); |
|
| 408 | + $result['authMechanism'] = $this->authMechanism->getIdentifier(); |
|
| 409 | + $result['backendOptions'] = $this->backendOptions; |
|
| 410 | + if (!is_null($this->priority)) { |
|
| 411 | + $result['priority'] = $this->priority; |
|
| 412 | + } |
|
| 413 | + if (!empty($this->applicableUsers)) { |
|
| 414 | + $result['applicableUsers'] = $this->applicableUsers; |
|
| 415 | + } |
|
| 416 | + if (!empty($this->applicableGroups)) { |
|
| 417 | + $result['applicableGroups'] = $this->applicableGroups; |
|
| 418 | + } |
|
| 419 | + if (!empty($this->mountOptions)) { |
|
| 420 | + $result['mountOptions'] = $this->mountOptions; |
|
| 421 | + } |
|
| 422 | + if (!is_null($this->status)) { |
|
| 423 | + $result['status'] = $this->status; |
|
| 424 | + } |
|
| 425 | + if (!is_null($this->statusMessage)) { |
|
| 426 | + $result['statusMessage'] = $this->statusMessage; |
|
| 427 | + } |
|
| 428 | + $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
|
| 429 | + $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
| 430 | + return $result; |
|
| 431 | + } |
|
| 432 | 432 | } |
@@ -182,7 +182,7 @@ discard block |
||
| 182 | 182 | * @param Backend $backend |
| 183 | 183 | */ |
| 184 | 184 | public function setBackend(Backend $backend) { |
| 185 | - $this->backend= $backend; |
|
| 185 | + $this->backend = $backend; |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
@@ -214,13 +214,13 @@ discard block |
||
| 214 | 214 | * @param array $backendOptions backend options |
| 215 | 215 | */ |
| 216 | 216 | public function setBackendOptions($backendOptions) { |
| 217 | - if($this->getBackend() instanceof Backend) { |
|
| 217 | + if ($this->getBackend() instanceof Backend) { |
|
| 218 | 218 | $parameters = $this->getBackend()->getParameters(); |
| 219 | - foreach($backendOptions as $key => $value) { |
|
| 220 | - if(isset($parameters[$key])) { |
|
| 219 | + foreach ($backendOptions as $key => $value) { |
|
| 220 | + if (isset($parameters[$key])) { |
|
| 221 | 221 | switch ($parameters[$key]->getType()) { |
| 222 | 222 | case \OCA\Files_External\Lib\DefinitionParameter::VALUE_BOOLEAN: |
| 223 | - $value = (bool)$value; |
|
| 223 | + $value = (bool) $value; |
|
| 224 | 224 | break; |
| 225 | 225 | } |
| 226 | 226 | $backendOptions[$key] = $value; |
@@ -426,7 +426,7 @@ discard block |
||
| 426 | 426 | $result['statusMessage'] = $this->statusMessage; |
| 427 | 427 | } |
| 428 | 428 | $result['userProvided'] = $this->authMechanism instanceof IUserProvided; |
| 429 | - $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal': 'system'; |
|
| 429 | + $result['type'] = ($this->getType() === self::MOUNT_TYPE_PERSONAl) ? 'personal' : 'system'; |
|
| 430 | 430 | return $result; |
| 431 | 431 | } |
| 432 | 432 | } |
@@ -33,73 +33,73 @@ |
||
| 33 | 33 | */ |
| 34 | 34 | class LegacyBackend extends Backend { |
| 35 | 35 | |
| 36 | - use LegacyDependencyCheckPolyfill { |
|
| 37 | - LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies; |
|
| 38 | - } |
|
| 36 | + use LegacyDependencyCheckPolyfill { |
|
| 37 | + LegacyDependencyCheckPolyfill::checkDependencies as doCheckDependencies; |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - /** @var bool */ |
|
| 41 | - protected $hasDependencies = false; |
|
| 40 | + /** @var bool */ |
|
| 41 | + protected $hasDependencies = false; |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @param string $class |
|
| 45 | - * @param array $definition |
|
| 46 | - * @param Builtin $authMechanism |
|
| 47 | - */ |
|
| 48 | - public function __construct($class, array $definition, Builtin $authMechanism) { |
|
| 49 | - $this |
|
| 50 | - ->setIdentifier($class) |
|
| 51 | - ->setStorageClass($class) |
|
| 52 | - ->setText($definition['backend']) |
|
| 53 | - ->addAuthScheme(Builtin::SCHEME_BUILTIN) |
|
| 54 | - ->setLegacyAuthMechanism($authMechanism) |
|
| 55 | - ; |
|
| 43 | + /** |
|
| 44 | + * @param string $class |
|
| 45 | + * @param array $definition |
|
| 46 | + * @param Builtin $authMechanism |
|
| 47 | + */ |
|
| 48 | + public function __construct($class, array $definition, Builtin $authMechanism) { |
|
| 49 | + $this |
|
| 50 | + ->setIdentifier($class) |
|
| 51 | + ->setStorageClass($class) |
|
| 52 | + ->setText($definition['backend']) |
|
| 53 | + ->addAuthScheme(Builtin::SCHEME_BUILTIN) |
|
| 54 | + ->setLegacyAuthMechanism($authMechanism) |
|
| 55 | + ; |
|
| 56 | 56 | |
| 57 | - foreach ($definition['configuration'] as $name => $placeholder) { |
|
| 58 | - $flags = DefinitionParameter::FLAG_NONE; |
|
| 59 | - $type = DefinitionParameter::VALUE_TEXT; |
|
| 60 | - if ($placeholder[0] === '&') { |
|
| 61 | - $flags = DefinitionParameter::FLAG_OPTIONAL; |
|
| 62 | - $placeholder = substr($placeholder, 1); |
|
| 63 | - } |
|
| 64 | - switch ($placeholder[0]) { |
|
| 65 | - case '!': |
|
| 66 | - $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | - $placeholder = substr($placeholder, 1); |
|
| 68 | - break; |
|
| 69 | - case '*': |
|
| 70 | - $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | - $placeholder = substr($placeholder, 1); |
|
| 72 | - break; |
|
| 73 | - case '#': |
|
| 74 | - $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | - $placeholder = substr($placeholder, 1); |
|
| 76 | - break; |
|
| 77 | - } |
|
| 78 | - $this->addParameter((new DefinitionParameter($name, $placeholder)) |
|
| 79 | - ->setType($type) |
|
| 80 | - ->setFlags($flags) |
|
| 81 | - ); |
|
| 82 | - } |
|
| 57 | + foreach ($definition['configuration'] as $name => $placeholder) { |
|
| 58 | + $flags = DefinitionParameter::FLAG_NONE; |
|
| 59 | + $type = DefinitionParameter::VALUE_TEXT; |
|
| 60 | + if ($placeholder[0] === '&') { |
|
| 61 | + $flags = DefinitionParameter::FLAG_OPTIONAL; |
|
| 62 | + $placeholder = substr($placeholder, 1); |
|
| 63 | + } |
|
| 64 | + switch ($placeholder[0]) { |
|
| 65 | + case '!': |
|
| 66 | + $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | + $placeholder = substr($placeholder, 1); |
|
| 68 | + break; |
|
| 69 | + case '*': |
|
| 70 | + $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | + $placeholder = substr($placeholder, 1); |
|
| 72 | + break; |
|
| 73 | + case '#': |
|
| 74 | + $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | + $placeholder = substr($placeholder, 1); |
|
| 76 | + break; |
|
| 77 | + } |
|
| 78 | + $this->addParameter((new DefinitionParameter($name, $placeholder)) |
|
| 79 | + ->setType($type) |
|
| 80 | + ->setFlags($flags) |
|
| 81 | + ); |
|
| 82 | + } |
|
| 83 | 83 | |
| 84 | - if (isset($definition['priority'])) { |
|
| 85 | - $this->setPriority($definition['priority']); |
|
| 86 | - } |
|
| 87 | - if (isset($definition['custom'])) { |
|
| 88 | - $this->addCustomJs($definition['custom']); |
|
| 89 | - } |
|
| 90 | - if (isset($definition['has_dependencies']) && $definition['has_dependencies']) { |
|
| 91 | - $this->hasDependencies = true; |
|
| 92 | - } |
|
| 93 | - } |
|
| 84 | + if (isset($definition['priority'])) { |
|
| 85 | + $this->setPriority($definition['priority']); |
|
| 86 | + } |
|
| 87 | + if (isset($definition['custom'])) { |
|
| 88 | + $this->addCustomJs($definition['custom']); |
|
| 89 | + } |
|
| 90 | + if (isset($definition['has_dependencies']) && $definition['has_dependencies']) { |
|
| 91 | + $this->hasDependencies = true; |
|
| 92 | + } |
|
| 93 | + } |
|
| 94 | 94 | |
| 95 | - /** |
|
| 96 | - * @return MissingDependency[] |
|
| 97 | - */ |
|
| 98 | - public function checkDependencies() { |
|
| 99 | - if ($this->hasDependencies) { |
|
| 100 | - return $this->doCheckDependencies(); |
|
| 101 | - } |
|
| 102 | - return []; |
|
| 103 | - } |
|
| 95 | + /** |
|
| 96 | + * @return MissingDependency[] |
|
| 97 | + */ |
|
| 98 | + public function checkDependencies() { |
|
| 99 | + if ($this->hasDependencies) { |
|
| 100 | + return $this->doCheckDependencies(); |
|
| 101 | + } |
|
| 102 | + return []; |
|
| 103 | + } |
|
| 104 | 104 | |
| 105 | 105 | } |
@@ -62,18 +62,18 @@ |
||
| 62 | 62 | $placeholder = substr($placeholder, 1); |
| 63 | 63 | } |
| 64 | 64 | switch ($placeholder[0]) { |
| 65 | - case '!': |
|
| 66 | - $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | - $placeholder = substr($placeholder, 1); |
|
| 68 | - break; |
|
| 69 | - case '*': |
|
| 70 | - $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | - $placeholder = substr($placeholder, 1); |
|
| 72 | - break; |
|
| 73 | - case '#': |
|
| 74 | - $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | - $placeholder = substr($placeholder, 1); |
|
| 76 | - break; |
|
| 65 | + case '!': |
|
| 66 | + $type = DefinitionParameter::VALUE_BOOLEAN; |
|
| 67 | + $placeholder = substr($placeholder, 1); |
|
| 68 | + break; |
|
| 69 | + case '*': |
|
| 70 | + $type = DefinitionParameter::VALUE_PASSWORD; |
|
| 71 | + $placeholder = substr($placeholder, 1); |
|
| 72 | + break; |
|
| 73 | + case '#': |
|
| 74 | + $type = DefinitionParameter::VALUE_HIDDEN; |
|
| 75 | + $placeholder = substr($placeholder, 1); |
|
| 76 | + break; |
|
| 77 | 77 | } |
| 78 | 78 | $this->addParameter((new DefinitionParameter($name, $placeholder)) |
| 79 | 79 | ->setType($type) |
@@ -27,39 +27,39 @@ |
||
| 27 | 27 | */ |
| 28 | 28 | class MissingDependency { |
| 29 | 29 | |
| 30 | - /** @var string */ |
|
| 31 | - private $dependency; |
|
| 30 | + /** @var string */ |
|
| 31 | + private $dependency; |
|
| 32 | 32 | |
| 33 | - /** @var string|null Custom message */ |
|
| 34 | - private $message = null; |
|
| 33 | + /** @var string|null Custom message */ |
|
| 34 | + private $message = null; |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * @param string $dependency |
|
| 38 | - */ |
|
| 39 | - public function __construct($dependency) { |
|
| 40 | - $this->dependency = $dependency; |
|
| 41 | - } |
|
| 36 | + /** |
|
| 37 | + * @param string $dependency |
|
| 38 | + */ |
|
| 39 | + public function __construct($dependency) { |
|
| 40 | + $this->dependency = $dependency; |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - /** |
|
| 44 | - * @return string |
|
| 45 | - */ |
|
| 46 | - public function getDependency() { |
|
| 47 | - return $this->dependency; |
|
| 48 | - } |
|
| 43 | + /** |
|
| 44 | + * @return string |
|
| 45 | + */ |
|
| 46 | + public function getDependency() { |
|
| 47 | + return $this->dependency; |
|
| 48 | + } |
|
| 49 | 49 | |
| 50 | - /** |
|
| 51 | - * @return string|null |
|
| 52 | - */ |
|
| 53 | - public function getMessage() { |
|
| 54 | - return $this->message; |
|
| 55 | - } |
|
| 50 | + /** |
|
| 51 | + * @return string|null |
|
| 52 | + */ |
|
| 53 | + public function getMessage() { |
|
| 54 | + return $this->message; |
|
| 55 | + } |
|
| 56 | 56 | |
| 57 | - /** |
|
| 58 | - * @param string $message |
|
| 59 | - * @return self |
|
| 60 | - */ |
|
| 61 | - public function setMessage($message) { |
|
| 62 | - $this->message = $message; |
|
| 63 | - return $this; |
|
| 64 | - } |
|
| 57 | + /** |
|
| 58 | + * @param string $message |
|
| 59 | + * @return self |
|
| 60 | + */ |
|
| 61 | + public function setMessage($message) { |
|
| 62 | + $this->message = $message; |
|
| 63 | + return $this; |
|
| 64 | + } |
|
| 65 | 65 | } |
@@ -29,14 +29,14 @@ |
||
| 29 | 29 | */ |
| 30 | 30 | trait DependencyTrait { |
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Check if object is valid for use |
|
| 34 | - * |
|
| 35 | - * @return MissingDependency[] Unsatisfied dependencies |
|
| 36 | - */ |
|
| 37 | - public function checkDependencies() { |
|
| 38 | - return []; // no dependencies by default |
|
| 39 | - } |
|
| 32 | + /** |
|
| 33 | + * Check if object is valid for use |
|
| 34 | + * |
|
| 35 | + * @return MissingDependency[] Unsatisfied dependencies |
|
| 36 | + */ |
|
| 37 | + public function checkDependencies() { |
|
| 38 | + return []; // no dependencies by default |
|
| 39 | + } |
|
| 40 | 40 | |
| 41 | 41 | } |
| 42 | 42 | |
@@ -18,14 +18,14 @@ |
||
| 18 | 18 | <tr> |
| 19 | 19 | <th id='headerName' class="hidden column-name"> |
| 20 | 20 | <div id="headerName-container"> |
| 21 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
| 21 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
| 22 | 22 | </div> |
| 23 | 23 | </th> |
| 24 | 24 | <th id="headerSize" class="hidden column-size"> |
| 25 | 25 | <a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a> |
| 26 | 26 | </th> |
| 27 | 27 | <th id="headerDate" class="hidden column-mtime"> |
| 28 | - <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a> |
|
| 28 | + <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a> |
|
| 29 | 29 | </th> |
| 30 | 30 | </tr> |
| 31 | 31 | </thead> |