@@ -63,10 +63,10 @@ |
||
63 | 63 | */ |
64 | 64 | protected function execute(InputInterface $input, OutputInterface $output) { |
65 | 65 | $appid = $input->getArgument('appid'); |
66 | - $path = (string)$input->getOption('path'); |
|
66 | + $path = (string) $input->getOption('path'); |
|
67 | 67 | $result = $this->checker->verifyAppSignature($appid, $path); |
68 | 68 | $this->writeArrayInOutputFormat($input, $output, $result); |
69 | - if (count($result)>0){ |
|
69 | + if (count($result) > 0) { |
|
70 | 70 | return 1; |
71 | 71 | } |
72 | 72 | } |
@@ -58,13 +58,13 @@ |
||
58 | 58 | * @since 13.0.0 |
59 | 59 | */ |
60 | 60 | protected function getValidatedType($type) { |
61 | - $type = trim((string)$type); |
|
61 | + $type = trim((string) $type); |
|
62 | 62 | |
63 | - if($type === '') { |
|
63 | + if ($type === '') { |
|
64 | 64 | throw new \InvalidArgumentException('Type must not be empty'); |
65 | 65 | } |
66 | 66 | |
67 | - if($type === 'exact') { |
|
67 | + if ($type === 'exact') { |
|
68 | 68 | throw new \InvalidArgumentException('Provided type is a reserved word'); |
69 | 69 | } |
70 | 70 |
@@ -52,7 +52,7 @@ |
||
52 | 52 | */ |
53 | 53 | public function generate($name, $parameters = array(), $absolute = false) { |
54 | 54 | asort($parameters); |
55 | - $key = $this->context->getHost() . '#' . $this->context->getBaseUrl() . $name . sha1(json_encode($parameters)) . (int)$absolute; |
|
55 | + $key = $this->context->getHost().'#'.$this->context->getBaseUrl().$name.sha1(json_encode($parameters)).(int) $absolute; |
|
56 | 56 | $cachedKey = $this->cache->get($key); |
57 | 57 | if ($cachedKey) { |
58 | 58 | return $cachedKey; |
@@ -60,7 +60,7 @@ |
||
60 | 60 | $userSession, |
61 | 61 | $groupManager, |
62 | 62 | function($name) { |
63 | - $nodes = \OC::$server->getUserFolder()->getById((int)$name); |
|
63 | + $nodes = \OC::$server->getUserFolder()->getById((int) $name); |
|
64 | 64 | return !empty($nodes); |
65 | 65 | } |
66 | 66 | ), |
@@ -97,7 +97,7 @@ discard block |
||
97 | 97 | } |
98 | 98 | |
99 | 99 | $propFind->handle(self::PROPERTY_NAME_COUNT, function() use ($node) { |
100 | - return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId()); |
|
100 | + return $this->commentsManager->getNumberOfCommentsForObject('files', (string) $node->getId()); |
|
101 | 101 | }); |
102 | 102 | |
103 | 103 | $propFind->handle(self::PROPERTY_NAME_HREF, function() use ($node) { |
@@ -129,13 +129,13 @@ discard block |
||
129 | 129 | * @return mixed|string |
130 | 130 | */ |
131 | 131 | public function getCommentsLink(Node $node) { |
132 | - $href = $this->server->getBaseUri(); |
|
132 | + $href = $this->server->getBaseUri(); |
|
133 | 133 | $entryPoint = strpos($href, '/remote.php/'); |
134 | - if($entryPoint === false) { |
|
134 | + if ($entryPoint === false) { |
|
135 | 135 | // in case we end up somewhere else, unexpectedly. |
136 | 136 | return null; |
137 | 137 | } |
138 | - $commentsPart = 'dav/comments/files/' . rawurldecode($node->getId()); |
|
138 | + $commentsPart = 'dav/comments/files/'.rawurldecode($node->getId()); |
|
139 | 139 | $href = substr_replace($href, $commentsPart, $entryPoint + strlen('/remote.php/')); |
140 | 140 | return $href; |
141 | 141 | } |
@@ -149,13 +149,13 @@ discard block |
||
149 | 149 | */ |
150 | 150 | public function getUnreadCount(Node $node) { |
151 | 151 | $user = $this->userSession->getUser(); |
152 | - if(is_null($user)) { |
|
152 | + if (is_null($user)) { |
|
153 | 153 | return null; |
154 | 154 | } |
155 | 155 | |
156 | - $lastRead = $this->commentsManager->getReadMark('files', (string)$node->getId(), $user); |
|
156 | + $lastRead = $this->commentsManager->getReadMark('files', (string) $node->getId(), $user); |
|
157 | 157 | |
158 | - return $this->commentsManager->getNumberOfCommentsForObject('files', (string)$node->getId(), $lastRead); |
|
158 | + return $this->commentsManager->getNumberOfCommentsForObject('files', (string) $node->getId(), $lastRead); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | } |
@@ -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 | } |
@@ -175,13 +175,13 @@ discard block |
||
175 | 175 | $this->canPurgeToSaveSpace = true; |
176 | 176 | } elseif ($minValue !== 'auto' && $maxValue === 'auto') { |
177 | 177 | // Keep for X days but delete anytime if space needed |
178 | - $this->minAge = (int)$minValue; |
|
178 | + $this->minAge = (int) $minValue; |
|
179 | 179 | $this->maxAge = self::NO_OBLIGATION; |
180 | 180 | $this->canPurgeToSaveSpace = true; |
181 | 181 | } elseif ($minValue === 'auto' && $maxValue !== 'auto') { |
182 | 182 | // Delete anytime if space needed, Delete all older than max automatically |
183 | 183 | $this->minAge = self::NO_OBLIGATION; |
184 | - $this->maxAge = (int)$maxValue; |
|
184 | + $this->maxAge = (int) $maxValue; |
|
185 | 185 | $this->canPurgeToSaveSpace = true; |
186 | 186 | } elseif ($minValue !== 'auto' && $maxValue !== 'auto') { |
187 | 187 | // Delete all older than max OR older than min if space needed |
@@ -191,8 +191,8 @@ discard block |
||
191 | 191 | $maxValue = $minValue; |
192 | 192 | } |
193 | 193 | |
194 | - $this->minAge = (int)$minValue; |
|
195 | - $this->maxAge = (int)$maxValue; |
|
194 | + $this->minAge = (int) $minValue; |
|
195 | + $this->maxAge = (int) $maxValue; |
|
196 | 196 | $this->canPurgeToSaveSpace = false; |
197 | 197 | } |
198 | 198 | } |
@@ -90,16 +90,16 @@ discard block |
||
90 | 90 | * @throws \InvalidArgumentException |
91 | 91 | */ |
92 | 92 | protected function validateOffsetAndLimit($offset, $limit) { |
93 | - if($limit < 0) { |
|
93 | + if ($limit < 0) { |
|
94 | 94 | throw new \InvalidArgumentException('limit must be 0 or greater'); |
95 | 95 | } |
96 | - if($offset < 0) { |
|
96 | + if ($offset < 0) { |
|
97 | 97 | throw new \InvalidArgumentException('offset must be 0 or greater'); |
98 | 98 | } |
99 | - if($limit === 0 && $offset !== 0) { |
|
99 | + if ($limit === 0 && $offset !== 0) { |
|
100 | 100 | throw new \InvalidArgumentException('offset must be 0 if limit is also set to 0'); |
101 | 101 | } |
102 | - if($offset > 0 && ($offset % $limit !== 0)) { |
|
102 | + if ($offset > 0 && ($offset % $limit !== 0)) { |
|
103 | 103 | throw new \InvalidArgumentException('offset must be a multiple of limit'); |
104 | 104 | } |
105 | 105 | } |
@@ -109,11 +109,11 @@ discard block |
||
109 | 109 | $configPrefixes = $helper->getServerConfigurationPrefixes(true); |
110 | 110 | $ldapWrapper = new LDAP(); |
111 | 111 | |
112 | - $offset = (int)$input->getOption('offset'); |
|
113 | - $limit = (int)$input->getOption('limit'); |
|
112 | + $offset = (int) $input->getOption('offset'); |
|
113 | + $limit = (int) $input->getOption('limit'); |
|
114 | 114 | $this->validateOffsetAndLimit($offset, $limit); |
115 | 115 | |
116 | - if($input->getOption('group')) { |
|
116 | + if ($input->getOption('group')) { |
|
117 | 117 | $proxy = new Group_Proxy($configPrefixes, $ldapWrapper, \OC::$server->query('LDAPGroupPluginManager')); |
118 | 118 | $getMethod = 'getGroups'; |
119 | 119 | $printID = false; |
@@ -136,8 +136,8 @@ discard block |
||
136 | 136 | } |
137 | 137 | |
138 | 138 | $result = $proxy->$getMethod($input->getArgument('search'), $limit, $offset); |
139 | - foreach($result as $id => $name) { |
|
140 | - $line = $name . ($printID ? ' ('.$id.')' : ''); |
|
139 | + foreach ($result as $id => $name) { |
|
140 | + $line = $name.($printID ? ' ('.$id.')' : ''); |
|
141 | 141 | $output->writeln($line); |
142 | 142 | } |
143 | 143 | } |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | */ |
72 | 72 | public function run(IOutput $output) { |
73 | 73 | $installedVersion = $this->config->getAppValue('user_ldap', 'installed_version', '1.2.1'); |
74 | - if(version_compare($installedVersion, '1.2.1') !== -1) { |
|
74 | + if (version_compare($installedVersion, '1.2.1') !== -1) { |
|
75 | 75 | return; |
76 | 76 | } |
77 | 77 | |
@@ -82,15 +82,15 @@ discard block |
||
82 | 82 | do { |
83 | 83 | $retry = false; |
84 | 84 | $records = $mapper->getList($offset, $batchSize); |
85 | - if(count($records) === 0){ |
|
85 | + if (count($records) === 0) { |
|
86 | 86 | continue; |
87 | 87 | } |
88 | 88 | try { |
89 | 89 | $this->jobList->add($jobClass, ['records' => $records]); |
90 | 90 | $offset += $batchSize; |
91 | 91 | } catch (\InvalidArgumentException $e) { |
92 | - if(strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | - $batchSize = (int)floor(count($records) * 0.8); |
|
92 | + if (strpos($e->getMessage(), 'Background job arguments can\'t exceed 4000') !== false) { |
|
93 | + $batchSize = (int) floor(count($records) * 0.8); |
|
94 | 94 | $retry = true; |
95 | 95 | } |
96 | 96 | } |
@@ -32,13 +32,13 @@ |
||
32 | 32 | $serverConnections = $helper->getServerConfigurationPrefixes(); |
33 | 33 | sort($serverConnections); |
34 | 34 | $lk = array_pop($serverConnections); |
35 | -$ln = (int)str_replace('s', '', $lk); |
|
36 | -$nk = 's'.str_pad($ln+1, 2, '0', STR_PAD_LEFT); |
|
35 | +$ln = (int) str_replace('s', '', $lk); |
|
36 | +$nk = 's'.str_pad($ln + 1, 2, '0', STR_PAD_LEFT); |
|
37 | 37 | |
38 | 38 | $resultData = array('configPrefix' => $nk); |
39 | 39 | |
40 | 40 | $newConfig = new \OCA\User_LDAP\Configuration($nk, false); |
41 | -if(isset($_POST['copyConfig'])) { |
|
41 | +if (isset($_POST['copyConfig'])) { |
|
42 | 42 | $originalConfig = new \OCA\User_LDAP\Configuration($_POST['copyConfig']); |
43 | 43 | $newConfig->setConfiguration($originalConfig->getConfiguration()); |
44 | 44 | } else { |