@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | |
32 | 32 | $dir = '/'; |
33 | 33 | if (isset($_POST['dir'])) { |
34 | - $dir = rtrim((string)$_POST['dir'], '/'). '/'; |
|
34 | + $dir = rtrim((string) $_POST['dir'], '/').'/'; |
|
35 | 35 | } |
36 | 36 | $allFiles = false; |
37 | -if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true') { |
|
37 | +if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') { |
|
38 | 38 | $allFiles = true; |
39 | 39 | $list = array(); |
40 | 40 | $dirListing = true; |
@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | foreach (OCA\Files_Trashbin\Helper::getTrashFiles($dir, \OCP\User::getUser()) as $file) { |
45 | 45 | $fileName = $file['name']; |
46 | 46 | if (!$dirListing) { |
47 | - $fileName .= '.d' . $file['mtime']; |
|
47 | + $fileName .= '.d'.$file['mtime']; |
|
48 | 48 | } |
49 | 49 | $list[] = $fileName; |
50 | 50 | } |
@@ -57,21 +57,21 @@ discard block |
||
57 | 57 | |
58 | 58 | $i = 0; |
59 | 59 | foreach ($list as $file) { |
60 | - $path = $dir . '/' . $file; |
|
60 | + $path = $dir.'/'.$file; |
|
61 | 61 | if ($dir === '/') { |
62 | 62 | $file = ltrim($file, '/'); |
63 | 63 | $delimiter = strrpos($file, '.d'); |
64 | 64 | $filename = substr($file, 0, $delimiter); |
65 | - $timestamp = substr($file, $delimiter+2); |
|
65 | + $timestamp = substr($file, $delimiter + 2); |
|
66 | 66 | } else { |
67 | 67 | $path_parts = pathinfo($file); |
68 | 68 | $filename = $path_parts['basename']; |
69 | 69 | $timestamp = null; |
70 | 70 | } |
71 | 71 | |
72 | - if ( !OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp) ) { |
|
72 | + if (!OCA\Files_Trashbin\Trashbin::restore($path, $filename, $timestamp)) { |
|
73 | 73 | $error[] = $filename; |
74 | - \OCP\Util::writeLog('trashbin', 'can\'t restore ' . $filename, \OCP\Util::ERROR); |
|
74 | + \OCP\Util::writeLog('trashbin', 'can\'t restore '.$filename, \OCP\Util::ERROR); |
|
75 | 75 | } else { |
76 | 76 | $success[$i]['filename'] = $file; |
77 | 77 | $success[$i]['timestamp'] = $timestamp; |
@@ -80,9 +80,9 @@ discard block |
||
80 | 80 | |
81 | 81 | } |
82 | 82 | |
83 | -if ( $error ) { |
|
83 | +if ($error) { |
|
84 | 84 | $filelist = ''; |
85 | - foreach ( $error as $e ) { |
|
85 | + foreach ($error as $e) { |
|
86 | 86 | $filelist .= $e.', '; |
87 | 87 | } |
88 | 88 | $l = OC::$server->getL10N('files_trashbin'); |
@@ -25,8 +25,8 @@ |
||
25 | 25 | \OC::$server->getSession()->close(); |
26 | 26 | |
27 | 27 | // Load the files |
28 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
29 | -$sortAttribute = isset($_GET['sort']) ? (string)$_GET['sort'] : 'name'; |
|
28 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
29 | +$sortAttribute = isset($_GET['sort']) ? (string) $_GET['sort'] : 'name'; |
|
30 | 30 | $sortDirection = isset($_GET['sortdirection']) ? ($_GET['sortdirection'] === 'desc') : false; |
31 | 31 | $data = array(); |
32 | 32 |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | $folder = isset($_POST['dir']) ? $_POST['dir'] : '/'; |
32 | 32 | |
33 | 33 | // "empty trash" command |
34 | -if (isset($_POST['allfiles']) && (string)$_POST['allfiles'] === 'true'){ |
|
34 | +if (isset($_POST['allfiles']) && (string) $_POST['allfiles'] === 'true') { |
|
35 | 35 | $deleteAll = true; |
36 | 36 | if ($folder === '/' || $folder === '') { |
37 | 37 | OCA\Files_Trashbin\Trashbin::deleteAll(); |
@@ -43,11 +43,11 @@ discard block |
||
43 | 43 | } |
44 | 44 | else { |
45 | 45 | $deleteAll = false; |
46 | - $files = (string)$_POST['files']; |
|
46 | + $files = (string) $_POST['files']; |
|
47 | 47 | $list = json_decode($files); |
48 | 48 | } |
49 | 49 | |
50 | -$folder = rtrim($folder, '/') . '/'; |
|
50 | +$folder = rtrim($folder, '/').'/'; |
|
51 | 51 | $error = array(); |
52 | 52 | $success = array(); |
53 | 53 | |
@@ -57,16 +57,16 @@ discard block |
||
57 | 57 | $file = ltrim($file, '/'); |
58 | 58 | $delimiter = strrpos($file, '.d'); |
59 | 59 | $filename = substr($file, 0, $delimiter); |
60 | - $timestamp = substr($file, $delimiter+2); |
|
60 | + $timestamp = substr($file, $delimiter + 2); |
|
61 | 61 | } else { |
62 | - $filename = $folder . '/' . $file; |
|
62 | + $filename = $folder.'/'.$file; |
|
63 | 63 | $timestamp = null; |
64 | 64 | } |
65 | 65 | |
66 | 66 | OCA\Files_Trashbin\Trashbin::delete($filename, \OCP\User::getUser(), $timestamp); |
67 | 67 | if (OCA\Files_Trashbin\Trashbin::file_exists($filename, $timestamp)) { |
68 | 68 | $error[] = $filename; |
69 | - \OCP\Util::writeLog('trashbin','can\'t delete ' . $filename . ' permanently.', \OCP\Util::ERROR); |
|
69 | + \OCP\Util::writeLog('trashbin', 'can\'t delete '.$filename.' permanently.', \OCP\Util::ERROR); |
|
70 | 70 | } |
71 | 71 | // only list deleted files if not deleting everything |
72 | 72 | else if (!$deleteAll) { |
@@ -76,9 +76,9 @@ discard block |
||
76 | 76 | } |
77 | 77 | } |
78 | 78 | |
79 | -if ( $error ) { |
|
79 | +if ($error) { |
|
80 | 80 | $filelist = ''; |
81 | - foreach ( $error as $e ) { |
|
81 | + foreach ($error as $e) { |
|
82 | 82 | $filelist .= $e.', '; |
83 | 83 | } |
84 | 84 | $l = \OC::$server->getL10N('files_trashbin'); |
@@ -117,7 +117,7 @@ |
||
117 | 117 | \OC_Util::setupFS($user); |
118 | 118 | |
119 | 119 | // Check if this user has a trashbin directory |
120 | - $view = new \OC\Files\View('/' . $user); |
|
120 | + $view = new \OC\Files\View('/'.$user); |
|
121 | 121 | if (!$view->is_dir('/files_trashbin/files')) { |
122 | 122 | return false; |
123 | 123 | } |
@@ -107,8 +107,8 @@ |
||
107 | 107 | protected function removeDeletedFiles($uid) { |
108 | 108 | \OC_Util::tearDownFS(); |
109 | 109 | \OC_Util::setupFS($uid); |
110 | - if ($this->rootFolder->nodeExists('/' . $uid . '/files_trashbin')) { |
|
111 | - $this->rootFolder->get('/' . $uid . '/files_trashbin')->delete(); |
|
110 | + if ($this->rootFolder->nodeExists('/'.$uid.'/files_trashbin')) { |
|
111 | + $this->rootFolder->get('/'.$uid.'/files_trashbin')->delete(); |
|
112 | 112 | $query = $this->dbConnection->getQueryBuilder(); |
113 | 113 | $query->delete('files_trash') |
114 | 114 | ->where($query->expr()->eq('user', $query->createParameter('uid'))) |
@@ -59,7 +59,7 @@ |
||
59 | 59 | * @param string $value |
60 | 60 | * @return bool |
61 | 61 | */ |
62 | - public function executeCheck($operator, $value) { |
|
62 | + public function executeCheck($operator, $value) { |
|
63 | 63 | $actualValue = $this->getActualValue(); |
64 | 64 | return $this->executeStringCheck($operator, $value, $actualValue); |
65 | 65 | } |
@@ -109,8 +109,8 @@ |
||
109 | 109 | throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1); |
110 | 110 | } |
111 | 111 | |
112 | - $regexValue = '\"' . self::REGEX_TIME . ' ' . self::REGEX_TIMEZONE . '\"'; |
|
113 | - $result = preg_match('/^\[' . $regexValue . ',' . $regexValue . '\]$/', $value, $matches); |
|
112 | + $regexValue = '\"'.self::REGEX_TIME.' '.self::REGEX_TIMEZONE.'\"'; |
|
113 | + $result = preg_match('/^\['.$regexValue.','.$regexValue.'\]$/', $value, $matches); |
|
114 | 114 | if (!$result) { |
115 | 115 | throw new \UnexpectedValueException($this->l->t('The given time span is invalid'), 2); |
116 | 116 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | * @param string $value |
48 | 48 | * @return bool |
49 | 49 | */ |
50 | - public function executeCheck($operator, $value) { |
|
50 | + public function executeCheck($operator, $value) { |
|
51 | 51 | $actualValue = $this->getActualValue(); |
52 | 52 | if (in_array($operator, ['is', '!is'])) { |
53 | 53 | switch ($value) { |
@@ -70,10 +70,10 @@ discard block |
||
70 | 70 | return $this->url; |
71 | 71 | } |
72 | 72 | |
73 | - $this->url = $this->request->getServerProtocol() . '://';// E.g. http(s) + :// |
|
74 | - $this->url .= $this->request->getServerHost();// E.g. localhost |
|
75 | - $this->url .= $this->request->getScriptName();// E.g. /nextcloud/index.php |
|
76 | - $this->url .= $this->request->getPathInfo();// E.g. /apps/files_texteditor/ajax/loadfile |
|
73 | + $this->url = $this->request->getServerProtocol().'://'; // E.g. http(s) + :// |
|
74 | + $this->url .= $this->request->getServerHost(); // E.g. localhost |
|
75 | + $this->url .= $this->request->getScriptName(); // E.g. /nextcloud/index.php |
|
76 | + $this->url .= $this->request->getPathInfo(); // E.g. /apps/files_texteditor/ajax/loadfile |
|
77 | 77 | |
78 | 78 | return $this->url; // E.g. https://localhost/nextcloud/index.php/apps/files_texteditor/ajax/loadfile |
79 | 79 | } |
@@ -323,7 +323,7 @@ |
||
323 | 323 | * @return int Check unique ID |
324 | 324 | */ |
325 | 325 | protected function addCheck($class, $operator, $value) { |
326 | - $hash = md5($class . '::' . $operator . '::' . $value); |
|
326 | + $hash = md5($class.'::'.$operator.'::'.$value); |
|
327 | 327 | |
328 | 328 | $query = $this->connection->getQueryBuilder(); |
329 | 329 | $query->select('id') |