@@ -95,15 +95,15 @@ discard block |
||
95 | 95 | $tags = $this->tagManager->getTagsByIds([$tagId]); |
96 | 96 | $tag = current($tags); |
97 | 97 | if (!$this->tagManager->canUserSeeTag($tag, $this->user)) { |
98 | - throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign'); |
|
98 | + throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign'); |
|
99 | 99 | } |
100 | 100 | if (!$this->tagManager->canUserAssignTag($tag, $this->user)) { |
101 | - throw new Forbidden('No permission to assign tag ' . $tagId); |
|
101 | + throw new Forbidden('No permission to assign tag '.$tagId); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | $this->tagMapper->assignTags($this->objectId, $this->objectType, $tagId); |
105 | 105 | } catch (TagNotFoundException $e) { |
106 | - throw new PreconditionFailed('Tag with id ' . $tagId . ' does not exist, cannot assign'); |
|
106 | + throw new PreconditionFailed('Tag with id '.$tagId.' does not exist, cannot assign'); |
|
107 | 107 | } |
108 | 108 | } |
109 | 109 | |
@@ -120,11 +120,11 @@ discard block |
||
120 | 120 | return $this->makeNode($tag); |
121 | 121 | } |
122 | 122 | } |
123 | - throw new NotFound('Tag with id ' . $tagId . ' not present for object ' . $this->objectId); |
|
123 | + throw new NotFound('Tag with id '.$tagId.' not present for object '.$this->objectId); |
|
124 | 124 | } catch (\InvalidArgumentException $e) { |
125 | 125 | throw new BadRequest('Invalid tag id', 0, $e); |
126 | 126 | } catch (TagNotFoundException $e) { |
127 | - throw new NotFound('Tag with id ' . $tagId . ' not found', 0, $e); |
|
127 | + throw new NotFound('Tag with id '.$tagId.' not found', 0, $e); |
|
128 | 128 | } |
129 | 129 | } |
130 | 130 |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | require '../../../../3rdparty/autoload.php'; |
24 | 24 | |
25 | 25 | if ($argc !== 6) { |
26 | - echo "Invalid number of arguments" . PHP_EOL; |
|
26 | + echo "Invalid number of arguments".PHP_EOL; |
|
27 | 27 | exit; |
28 | 28 | } |
29 | 29 | |
@@ -37,9 +37,9 @@ discard block |
||
37 | 37 | $t0 = microtime(true); |
38 | 38 | $result = $client->request($method, $uploadUrl, $data, $headers); |
39 | 39 | $t1 = microtime(true); |
40 | - echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL; |
|
41 | - if (!in_array($result['statusCode'], [200, 201])) { |
|
42 | - echo $result['body'] . PHP_EOL; |
|
40 | + echo $result['statusCode']." - ".($t1 - $t0).' seconds'.PHP_EOL; |
|
41 | + if (!in_array($result['statusCode'], [200, 201])) { |
|
42 | + echo $result['body'].PHP_EOL; |
|
43 | 43 | } |
44 | 44 | return $result; |
45 | 45 | } |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | $stream = fopen($file, 'r'); |
66 | 66 | |
67 | 67 | $index = 0; |
68 | -while(!feof($stream)) { |
|
68 | +while (!feof($stream)) { |
|
69 | 69 | request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize)); |
70 | 70 | $index++; |
71 | 71 | } |
@@ -28,15 +28,15 @@ |
||
28 | 28 | OCP\JSON::callCheck(); |
29 | 29 | OCP\JSON::checkAppEnabled('files_versions'); |
30 | 30 | |
31 | -$source = (string)$_GET['source']; |
|
32 | -$start = (int)$_GET['start']; |
|
31 | +$source = (string) $_GET['source']; |
|
32 | +$start = (int) $_GET['start']; |
|
33 | 33 | list ($uid, $filename) = OCA\Files_Versions\Storage::getUidAndFilename($source); |
34 | 34 | $count = 5; //show the newest revisions |
35 | 35 | $versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $source); |
36 | -if( $versions ) { |
|
36 | +if ($versions) { |
|
37 | 37 | |
38 | 38 | $endReached = false; |
39 | - if (count($versions) <= $start+$count) { |
|
39 | + if (count($versions) <= $start + $count) { |
|
40 | 40 | $endReached = true; |
41 | 41 | } |
42 | 42 |
@@ -30,12 +30,12 @@ |
||
30 | 30 | OCP\JSON::checkAppEnabled('files_versions'); |
31 | 31 | OCP\JSON::callCheck(); |
32 | 32 | |
33 | -$file = (string)$_GET['file']; |
|
34 | -$revision=(int)$_GET['revision']; |
|
33 | +$file = (string) $_GET['file']; |
|
34 | +$revision = (int) $_GET['revision']; |
|
35 | 35 | |
36 | -if(OCA\Files_Versions\Storage::rollback( $file, $revision )) { |
|
37 | - OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file ))); |
|
38 | -}else{ |
|
36 | +if (OCA\Files_Versions\Storage::rollback($file, $revision)) { |
|
37 | + OCP\JSON::success(array("data" => array("revision" => $revision, "file" => $file))); |
|
38 | +} else { |
|
39 | 39 | $l = \OC::$server->getL10N('files_versions'); |
40 | - OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) )))); |
|
40 | + OCP\JSON::error(array("data" => array("message" => $l->t("Could not revert: %s", array($file))))); |
|
41 | 41 | } |
@@ -78,7 +78,7 @@ |
||
78 | 78 | $y = 44, |
79 | 79 | $version = '' |
80 | 80 | ) { |
81 | - if($file === '' || $version === '' || $x === 0 || $y === 0) { |
|
81 | + if ($file === '' || $version === '' || $x === 0 || $y === 0) { |
|
82 | 82 | return new DataResponse([], Http::STATUS_BAD_REQUEST); |
83 | 83 | } |
84 | 84 |
@@ -115,7 +115,7 @@ |
||
115 | 115 | \OC_Util::setupFS($user); |
116 | 116 | |
117 | 117 | // Check if this user has a version directory |
118 | - $view = new \OC\Files\View('/' . $user); |
|
118 | + $view = new \OC\Files\View('/'.$user); |
|
119 | 119 | if (!$view->is_dir('/files_versions')) { |
120 | 120 | return false; |
121 | 121 | } |
@@ -107,8 +107,8 @@ |
||
107 | 107 | protected function deleteVersions($user) { |
108 | 108 | \OC_Util::tearDownFS(); |
109 | 109 | \OC_Util::setupFS($user); |
110 | - if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) { |
|
111 | - $this->rootFolder->get('/' . $user . '/files_versions')->delete(); |
|
110 | + if ($this->rootFolder->nodeExists('/'.$user.'/files_versions')) { |
|
111 | + $this->rootFolder->get('/'.$user.'/files_versions')->delete(); |
|
112 | 112 | } |
113 | 113 | } |
114 | 114 |
@@ -86,7 +86,7 @@ |
||
86 | 86 | \OC_Util::setupFS($user); |
87 | 87 | |
88 | 88 | // Check if this user has a versions directory |
89 | - $view = new \OC\Files\View('/' . $user); |
|
89 | + $view = new \OC\Files\View('/'.$user); |
|
90 | 90 | if (!$view->is_dir('/files_versions')) { |
91 | 91 | return false; |
92 | 92 | } |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | /** @var bool */ |
46 | 46 | private $canPurgeToSaveSpace; |
47 | 47 | |
48 | - public function __construct(IConfig $config,ITimeFactory $timeFactory){ |
|
48 | + public function __construct(IConfig $config, ITimeFactory $timeFactory) { |
|
49 | 49 | $this->timeFactory = $timeFactory; |
50 | 50 | $this->retentionObligation = $config->getSystemValue('versions_retention_obligation', 'auto'); |
51 | 51 | |
@@ -58,14 +58,14 @@ discard block |
||
58 | 58 | * Is versions expiration enabled |
59 | 59 | * @return bool |
60 | 60 | */ |
61 | - public function isEnabled(){ |
|
61 | + public function isEnabled() { |
|
62 | 62 | return $this->retentionObligation !== 'disabled'; |
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
66 | 66 | * Is default expiration active |
67 | 67 | */ |
68 | - public function shouldAutoExpire(){ |
|
68 | + public function shouldAutoExpire() { |
|
69 | 69 | return $this->minAge === self::NO_OBLIGATION |
70 | 70 | || $this->maxAge === self::NO_OBLIGATION; |
71 | 71 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | * @param bool $quotaExceeded |
77 | 77 | * @return bool |
78 | 78 | */ |
79 | - public function isExpired($timestamp, $quotaExceeded = false){ |
|
79 | + public function isExpired($timestamp, $quotaExceeded = false) { |
|
80 | 80 | // No expiration if disabled |
81 | 81 | if (!$this->isEnabled()) { |
82 | 82 | return false; |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | $time = $this->timeFactory->getTime(); |
91 | 91 | // Never expire dates in future e.g. misconfiguration or negative time |
92 | 92 | // adjustment |
93 | - if ($time<$timestamp) { |
|
93 | + if ($time < $timestamp) { |
|
94 | 94 | return false; |
95 | 95 | } |
96 | 96 | |
@@ -117,7 +117,7 @@ discard block |
||
117 | 117 | * Get maximal retention obligation as a timestamp |
118 | 118 | * @return int |
119 | 119 | */ |
120 | - public function getMaxAgeAsTimestamp(){ |
|
120 | + public function getMaxAgeAsTimestamp() { |
|
121 | 121 | $maxAge = false; |
122 | 122 | if ($this->isEnabled() && $this->maxAge !== self::NO_OBLIGATION) { |
123 | 123 | $time = $this->timeFactory->getTime(); |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | * Read versions_retention_obligation, validate it |
131 | 131 | * and set private members accordingly |
132 | 132 | */ |
133 | - private function parseRetentionObligation(){ |
|
133 | + private function parseRetentionObligation() { |
|
134 | 134 | $splitValues = explode(',', $this->retentionObligation); |
135 | 135 | if (!isset($splitValues[0])) { |
136 | 136 | $minValue = 'auto'; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | if (!ctype_digit($minValue) && $minValue !== 'auto') { |
150 | 150 | $isValid = false; |
151 | 151 | \OC::$server->getLogger()->warning( |
152 | - $minValue . ' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
152 | + $minValue.' is not a valid value for minimal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
153 | 153 | ['app'=>'files_versions'] |
154 | 154 | ); |
155 | 155 | } |
@@ -157,12 +157,12 @@ discard block |
||
157 | 157 | if (!ctype_digit($maxValue) && $maxValue !== 'auto') { |
158 | 158 | $isValid = false; |
159 | 159 | \OC::$server->getLogger()->warning( |
160 | - $maxValue . ' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
160 | + $maxValue.' is not a valid value for maximal versions retention obligation. Check versions_retention_obligation in your config.php. Falling back to auto.', |
|
161 | 161 | ['app'=>'files_versions'] |
162 | 162 | ); |
163 | 163 | } |
164 | 164 | |
165 | - if (!$isValid){ |
|
165 | + if (!$isValid) { |
|
166 | 166 | $minValue = 'auto'; |
167 | 167 | $maxValue = 'auto'; |
168 | 168 | } |