@@ -29,17 +29,13 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | namespace OCA\FederatedFileSharing\Controller; |
| 31 | 31 | |
| 32 | -use OC\Files\Filesystem; |
|
| 33 | 32 | use OC\HintException; |
| 34 | -use OC\Share\Helper; |
|
| 35 | 33 | use OCA\FederatedFileSharing\AddressHandler; |
| 36 | 34 | use OCA\FederatedFileSharing\FederatedShareProvider; |
| 37 | -use OCA\Files_Sharing\External\Manager; |
|
| 38 | 35 | use OCP\AppFramework\Controller; |
| 39 | 36 | use OCP\AppFramework\Http; |
| 40 | 37 | use OCP\AppFramework\Http\JSONResponse; |
| 41 | 38 | use OCP\Federation\ICloudIdManager; |
| 42 | -use OCP\Files\StorageInvalidException; |
|
| 43 | 39 | use OCP\Http\Client\IClientService; |
| 44 | 40 | use OCP\IL10N; |
| 45 | 41 | use OCP\ILogger; |
@@ -47,7 +43,6 @@ discard block |
||
| 47 | 43 | use OCP\ISession; |
| 48 | 44 | use OCP\IUserSession; |
| 49 | 45 | use OCP\Share\IManager; |
| 50 | -use OCP\Util; |
|
| 51 | 46 | |
| 52 | 47 | /** |
| 53 | 48 | * Class MountPublicLinkController |
@@ -53,7 +53,6 @@ |
||
| 53 | 53 | use OCP\Files\Storage\INotifyStorage; |
| 54 | 54 | use OCP\Files\StorageNotAvailableException; |
| 55 | 55 | use OCP\ILogger; |
| 56 | -use OCP\Util; |
|
| 57 | 56 | |
| 58 | 57 | class SMB extends Common implements INotifyStorage { |
| 59 | 58 | /** |
@@ -36,7 +36,6 @@ |
||
| 36 | 36 | use OCP\Http\Client\IClientService; |
| 37 | 37 | use OCP\IConfig; |
| 38 | 38 | use OCP\ILogger; |
| 39 | -use OCP\Util; |
|
| 40 | 39 | |
| 41 | 40 | abstract class Fetcher { |
| 42 | 41 | const INVALIDATE_AFTER_SECONDS = 300; |
@@ -34,7 +34,6 @@ |
||
| 34 | 34 | namespace OC\Files\Storage; |
| 35 | 35 | |
| 36 | 36 | use Exception; |
| 37 | -use GuzzleHttp\Exception\RequestException; |
|
| 38 | 37 | use OCP\ILogger; |
| 39 | 38 | use Psr\Http\Message\ResponseInterface; |
| 40 | 39 | use Icewind\Streams\CallbackWrapper; |
@@ -36,13 +36,11 @@ |
||
| 36 | 36 | namespace OC; |
| 37 | 37 | |
| 38 | 38 | use InterfaSys\LogNormalizer\Normalizer; |
| 39 | - |
|
| 40 | 39 | use OC\Log\ExceptionSerializer; |
| 41 | 40 | use OCP\Log\IFileBased; |
| 42 | 41 | use OCP\Log\IWriter; |
| 43 | 42 | use OCP\ILogger; |
| 44 | 43 | use OCP\Support\CrashReport\IRegistry; |
| 45 | -use OCP\Util; |
|
| 46 | 44 | |
| 47 | 45 | /** |
| 48 | 46 | * logging utilities |
@@ -46,7 +46,6 @@ |
||
| 46 | 46 | use OCP\Settings\ISettings; |
| 47 | 47 | use OCP\Settings\IManager; |
| 48 | 48 | use OCP\Settings\ISection; |
| 49 | -use OCP\Util; |
|
| 50 | 49 | |
| 51 | 50 | class Manager implements IManager { |
| 52 | 51 | /** @var ILogger */ |
@@ -104,8 +104,7 @@ |
||
| 104 | 104 | $connection->executeUpdate($query); |
| 105 | 105 | $query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'"; |
| 106 | 106 | $connection->executeUpdate($query); |
| 107 | - } |
|
| 108 | - catch (\Exception $ex){ |
|
| 107 | + } catch (\Exception $ex){ |
|
| 109 | 108 | $this->logger->logException($ex, [ |
| 110 | 109 | 'message' => 'Database user creation failed.', |
| 111 | 110 | 'level' => ILogger::ERROR, |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | $this->path=$source; |
| 48 | 48 | $this->zip=new \ZipArchive(); |
| 49 | 49 | if($this->zip->open($source, \ZipArchive::CREATE)) { |
| 50 | - }else{ |
|
| 50 | + } else{ |
|
| 51 | 51 | \OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, ILogger::WARN); |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -68,7 +68,7 @@ discard block |
||
| 68 | 68 | public function addFile($path, $source='') { |
| 69 | 69 | if($source and $source[0]=='/' and file_exists($source)) { |
| 70 | 70 | $result=$this->zip->addFile($source, $path); |
| 71 | - }else{ |
|
| 71 | + } else{ |
|
| 72 | 72 | $result=$this->zip->addFromString($path, $source); |
| 73 | 73 | } |
| 74 | 74 | if($result) { |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | public function remove($path) { |
| 178 | 178 | if($this->fileExists($path.'/')) { |
| 179 | 179 | return $this->zip->deleteName($path.'/'); |
| 180 | - }else{ |
|
| 180 | + } else{ |
|
| 181 | 181 | return $this->zip->deleteName($path); |
| 182 | 182 | } |
| 183 | 183 | } |
@@ -196,7 +196,7 @@ discard block |
||
| 196 | 196 | //in the archive when the stream is closed |
| 197 | 197 | if(strrpos($path, '.')!==false) { |
| 198 | 198 | $ext=substr($path, strrpos($path, '.')); |
| 199 | - }else{ |
|
| 199 | + } else{ |
|
| 200 | 200 | $ext=''; |
| 201 | 201 | } |
| 202 | 202 | $tmpFile = \OC::$server->getTempManager()->getTemporaryFile($ext); |
@@ -225,7 +225,7 @@ discard block |
||
| 225 | 225 | private function stripPath($path) { |
| 226 | 226 | if(!$path || $path[0]=='/') { |
| 227 | 227 | return substr($path, 1); |
| 228 | - }else{ |
|
| 228 | + } else{ |
|
| 229 | 229 | return $path; |
| 230 | 230 | } |
| 231 | 231 | } |
@@ -459,7 +459,7 @@ |
||
| 459 | 459 | $appDir = OC_App::getInstallPath() . '/' . $appId; |
| 460 | 460 | OC_Helper::rmdirr($appDir); |
| 461 | 461 | return true; |
| 462 | - }else{ |
|
| 462 | + } else{ |
|
| 463 | 463 | \OCP\Util::writeLog('core', 'can\'t remove app '.$appId.'. It is not installed.', ILogger::ERROR); |
| 464 | 464 | |
| 465 | 465 | return false; |