@@ -77,7 +77,7 @@ |
||
77 | 77 | $maxCharIndex = strlen($characters) - 1; |
78 | 78 | $randomString = ''; |
79 | 79 | |
80 | - while($length > 0) { |
|
80 | + while ($length > 0) { |
|
81 | 81 | $randomNumber = \random_int(0, $maxCharIndex); |
82 | 82 | $randomString .= $characters[$randomNumber]; |
83 | 83 | $length--; |
@@ -54,19 +54,19 @@ |
||
54 | 54 | |
55 | 55 | // If string starts with "file://" ignore the certificate |
56 | 56 | $query = 'file://'; |
57 | - if(strtolower(substr($data, 0, strlen($query))) === $query) { |
|
57 | + if (strtolower(substr($data, 0, strlen($query))) === $query) { |
|
58 | 58 | throw new \Exception('Certificate could not get parsed.'); |
59 | 59 | } |
60 | 60 | |
61 | 61 | $info = openssl_x509_parse($data); |
62 | - if(!is_array($info)) { |
|
62 | + if (!is_array($info)) { |
|
63 | 63 | throw new \Exception('Certificate could not get parsed.'); |
64 | 64 | } |
65 | 65 | |
66 | 66 | $this->commonName = isset($info['subject']['CN']) ? $info['subject']['CN'] : null; |
67 | 67 | $this->organization = isset($info['subject']['O']) ? $info['subject']['O'] : null; |
68 | - $this->issueDate = new \DateTime('@' . $info['validFrom_time_t'], $gmt); |
|
69 | - $this->expireDate = new \DateTime('@' . $info['validTo_time_t'], $gmt); |
|
68 | + $this->issueDate = new \DateTime('@'.$info['validFrom_time_t'], $gmt); |
|
69 | + $this->expireDate = new \DateTime('@'.$info['validTo_time_t'], $gmt); |
|
70 | 70 | $this->issuerName = isset($info['issuer']['CN']) ? $info['issuer']['CN'] : null; |
71 | 71 | $this->issuerOrganization = isset($info['issuer']['O']) ? $info['issuer']['O'] : null; |
72 | 72 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | * @return bool |
78 | 78 | */ |
79 | 79 | public function verify(array $data) { |
80 | - if(isset($data['message']) |
|
80 | + if (isset($data['message']) |
|
81 | 81 | && isset($data['signature']) |
82 | 82 | && isset($data['message']['signer']) |
83 | 83 | ) { |
@@ -85,9 +85,9 @@ discard block |
||
85 | 85 | $userId = substr($data['message']['signer'], 0, $location); |
86 | 86 | |
87 | 87 | $user = $this->userManager->get($userId); |
88 | - if($user !== null) { |
|
88 | + if ($user !== null) { |
|
89 | 89 | $key = $this->keyManager->getKey($user); |
90 | - return (bool)openssl_verify( |
|
90 | + return (bool) openssl_verify( |
|
91 | 91 | json_encode($data['message']), |
92 | 92 | base64_decode($data['signature']), |
93 | 93 | $key->getPublic(), |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | return array(); |
81 | 81 | } |
82 | 82 | |
83 | - $path = $this->getPathToCertificates() . 'uploads/'; |
|
83 | + $path = $this->getPathToCertificates().'uploads/'; |
|
84 | 84 | if (!$this->view->is_dir($path)) { |
85 | 85 | return array(); |
86 | 86 | } |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | while (false !== ($file = readdir($handle))) { |
93 | 93 | if ($file != '.' && $file != '..') { |
94 | 94 | try { |
95 | - $result[] = new Certificate($this->view->file_get_contents($path . $file), $file); |
|
95 | + $result[] = new Certificate($this->view->file_get_contents($path.$file), $file); |
|
96 | 96 | } catch (\Exception $e) { |
97 | 97 | } |
98 | 98 | } |
@@ -112,18 +112,18 @@ discard block |
||
112 | 112 | $this->view->mkdir($path); |
113 | 113 | } |
114 | 114 | |
115 | - $defaultCertificates = file_get_contents(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); |
|
115 | + $defaultCertificates = file_get_contents(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt'); |
|
116 | 116 | if (strlen($defaultCertificates) < 1024) { // sanity check to verify that we have some content for our bundle |
117 | 117 | // log as exception so we have a stacktrace |
118 | 118 | $this->logger->logException(new \Exception('Shipped ca-bundle is empty, refusing to create certificate bundle')); |
119 | 119 | return; |
120 | 120 | } |
121 | 121 | |
122 | - $fhCerts = $this->view->fopen($path . '/rootcerts.crt', 'w'); |
|
122 | + $fhCerts = $this->view->fopen($path.'/rootcerts.crt', 'w'); |
|
123 | 123 | |
124 | 124 | // Write user certificates |
125 | 125 | foreach ($certs as $cert) { |
126 | - $file = $path . '/uploads/' . $cert->getName(); |
|
126 | + $file = $path.'/uploads/'.$cert->getName(); |
|
127 | 127 | $data = $this->view->file_get_contents($file); |
128 | 128 | if (strpos($data, 'BEGIN CERTIFICATE')) { |
129 | 129 | fwrite($fhCerts, $data); |
@@ -157,13 +157,13 @@ discard block |
||
157 | 157 | throw new \Exception('Filename is not valid'); |
158 | 158 | } |
159 | 159 | |
160 | - $dir = $this->getPathToCertificates() . 'uploads/'; |
|
160 | + $dir = $this->getPathToCertificates().'uploads/'; |
|
161 | 161 | if (!$this->view->file_exists($dir)) { |
162 | 162 | $this->view->mkdir($dir); |
163 | 163 | } |
164 | 164 | |
165 | 165 | try { |
166 | - $file = $dir . $name; |
|
166 | + $file = $dir.$name; |
|
167 | 167 | $certificateObject = new Certificate($certificate, $name); |
168 | 168 | $this->view->file_put_contents($file, $certificate); |
169 | 169 | $this->createCertificateBundle(); |
@@ -184,9 +184,9 @@ discard block |
||
184 | 184 | if (!Filesystem::isValidPath($name)) { |
185 | 185 | return false; |
186 | 186 | } |
187 | - $path = $this->getPathToCertificates() . 'uploads/'; |
|
188 | - if ($this->view->file_exists($path . $name)) { |
|
189 | - $this->view->unlink($path . $name); |
|
187 | + $path = $this->getPathToCertificates().'uploads/'; |
|
188 | + if ($this->view->file_exists($path.$name)) { |
|
189 | + $this->view->unlink($path.$name); |
|
190 | 190 | $this->createCertificateBundle(); |
191 | 191 | } |
192 | 192 | return true; |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | if ($uid === '') { |
203 | 203 | $uid = $this->uid; |
204 | 204 | } |
205 | - return $this->getPathToCertificates($uid) . 'rootcerts.crt'; |
|
205 | + return $this->getPathToCertificates($uid).'rootcerts.crt'; |
|
206 | 206 | } |
207 | 207 | |
208 | 208 | /** |
@@ -234,7 +234,7 @@ discard block |
||
234 | 234 | if ($uid === '') { |
235 | 235 | $uid = $this->uid; |
236 | 236 | } |
237 | - $path = is_null($uid) ? '/files_external/' : '/' . $uid . '/files_external/'; |
|
237 | + $path = is_null($uid) ? '/files_external/' : '/'.$uid.'/files_external/'; |
|
238 | 238 | |
239 | 239 | return $path; |
240 | 240 | } |
@@ -259,7 +259,7 @@ discard block |
||
259 | 259 | $sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null)); |
260 | 260 | } |
261 | 261 | |
262 | - $sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) { |
|
262 | + $sourceMTime = array_reduce($sourceMTimes, function($max, $mtime) { |
|
263 | 263 | return max($max, $mtime); |
264 | 264 | }, 0); |
265 | 265 | return $sourceMTime > $this->view->filemtime($targetBundle); |
@@ -271,7 +271,7 @@ discard block |
||
271 | 271 | * @return int |
272 | 272 | */ |
273 | 273 | protected function getFilemtimeOfCaBundle() { |
274 | - return filemtime(\OC::$SERVERROOT . '/resources/config/ca-bundle.crt'); |
|
274 | + return filemtime(\OC::$SERVERROOT.'/resources/config/ca-bundle.crt'); |
|
275 | 275 | } |
276 | 276 | |
277 | 277 | } |
@@ -65,13 +65,13 @@ discard block |
||
65 | 65 | * @return string |
66 | 66 | */ |
67 | 67 | private function buildFileNameWithSuffix($absolutePath, $postFix = '') { |
68 | - if($postFix !== '') { |
|
69 | - $postFix = '.' . ltrim($postFix, '.'); |
|
68 | + if ($postFix !== '') { |
|
69 | + $postFix = '.'.ltrim($postFix, '.'); |
|
70 | 70 | $postFix = str_replace(['\\', '/'], '', $postFix); |
71 | 71 | $absolutePath .= '-'; |
72 | 72 | } |
73 | 73 | |
74 | - return $absolutePath . $postFix; |
|
74 | + return $absolutePath.$postFix; |
|
75 | 75 | } |
76 | 76 | |
77 | 77 | /** |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | |
92 | 92 | // If a postfix got specified sanitize it and create a postfixed |
93 | 93 | // temporary file |
94 | - if($postFix !== '') { |
|
94 | + if ($postFix !== '') { |
|
95 | 95 | $fileNameWithPostfix = $this->buildFileNameWithSuffix($file, $postFix); |
96 | 96 | touch($fileNameWithPostfix); |
97 | 97 | chmod($fileNameWithPostfix, 0600); |
@@ -127,11 +127,11 @@ discard block |
||
127 | 127 | $this->current[] = $uniqueFileName; |
128 | 128 | |
129 | 129 | // Build a name without postfix |
130 | - $path = $this->buildFileNameWithSuffix($uniqueFileName . '-folder', $postFix); |
|
130 | + $path = $this->buildFileNameWithSuffix($uniqueFileName.'-folder', $postFix); |
|
131 | 131 | mkdir($path, 0700); |
132 | 132 | $this->current[] = $path; |
133 | 133 | |
134 | - return $path . '/'; |
|
134 | + return $path.'/'; |
|
135 | 135 | } else { |
136 | 136 | $this->log->warning( |
137 | 137 | 'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions', |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | if ($dh) { |
191 | 191 | while (($file = readdir($dh)) !== false) { |
192 | 192 | if (substr($file, 0, 7) === self::TMP_PREFIX) { |
193 | - $path = $this->tmpBaseDir . '/' . $file; |
|
193 | + $path = $this->tmpBaseDir.'/'.$file; |
|
194 | 194 | $mtime = filemtime($path); |
195 | 195 | if ($mtime < $cutOfTime) { |
196 | 196 | $files[] = $path; |
@@ -75,7 +75,7 @@ |
||
75 | 75 | */ |
76 | 76 | public function getCloudId($user, $remote) { |
77 | 77 | // TODO check what the correct url is for remote (asking the remote) |
78 | - return new CloudId($user. '@' . $remote, $user, $remote); |
|
78 | + return new CloudId($user.'@'.$remote, $user, $remote); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -27,7 +27,7 @@ |
||
27 | 27 | private $query; |
28 | 28 | |
29 | 29 | //FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous |
30 | - public function __construct($message, $query = null){ |
|
30 | + public function __construct($message, $query = null) { |
|
31 | 31 | parent::__construct($message); |
32 | 32 | $this->query = $query; |
33 | 33 | } |
@@ -55,10 +55,10 @@ discard block |
||
55 | 55 | * and can not be created. |
56 | 56 | */ |
57 | 57 | if (!file_exists(self::$logFile)) { |
58 | - if(!is_writable(dirname(self::$logFile))) { |
|
58 | + if (!is_writable(dirname(self::$logFile))) { |
|
59 | 59 | self::$logFile = $defaultLogFile; |
60 | 60 | } else { |
61 | - if(!touch(self::$logFile)) { |
|
61 | + if (!touch(self::$logFile)) { |
|
62 | 62 | self::$logFile = $defaultLogFile; |
63 | 63 | } |
64 | 64 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | $time = $time->format($format); |
97 | 97 | $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--'; |
98 | 98 | $method = is_string($request->getMethod()) ? $request->getMethod() : '--'; |
99 | - if($config->getValue('installed', false)) { |
|
99 | + if ($config->getValue('installed', false)) { |
|
100 | 100 | $user = (\OC_User::getUser()) ? \OC_User::getUser() : '--'; |
101 | 101 | } else { |
102 | 102 | $user = '--'; |
@@ -135,7 +135,7 @@ discard block |
||
135 | 135 | * @param int $offset |
136 | 136 | * @return array |
137 | 137 | */ |
138 | - public static function getEntries($limit=50, $offset=0) { |
|
138 | + public static function getEntries($limit = 50, $offset = 0) { |
|
139 | 139 | self::init(); |
140 | 140 | $minLevel = \OC::$server->getSystemConfig()->getValue("loglevel", \OCP\Util::WARN); |
141 | 141 | $entries = array(); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | $entriesCount = 0; |
148 | 148 | $lines = 0; |
149 | 149 | // Loop through each character of the file looking for new lines |
150 | - while ($pos >= 0 && ($limit === null ||$entriesCount < $limit)) { |
|
150 | + while ($pos >= 0 && ($limit === null || $entriesCount < $limit)) { |
|
151 | 151 | fseek($handle, $pos); |
152 | 152 | $ch = fgetc($handle); |
153 | 153 | if ($ch == "\n" || $pos == 0) { |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | return preg_replace('/\/\/(.*):(.*)@/', '//xxx:xxx@', $msg); |
41 | 41 | } |
42 | 42 | |
43 | - public static function register($debug=false) { |
|
43 | + public static function register($debug = false) { |
|
44 | 44 | $handler = new ErrorHandler(); |
45 | 45 | |
46 | 46 | if ($debug) { |
@@ -62,9 +62,9 @@ discard block |
||
62 | 62 | //Fatal errors handler |
63 | 63 | public static function onShutdown() { |
64 | 64 | $error = error_get_last(); |
65 | - if($error && self::$logger) { |
|
65 | + if ($error && self::$logger) { |
|
66 | 66 | //ob_end_clean(); |
67 | - $msg = $error['message'] . ' at ' . $error['file'] . '#' . $error['line']; |
|
67 | + $msg = $error['message'].' at '.$error['file'].'#'.$error['line']; |
|
68 | 68 | self::$logger->critical(self::removePassword($msg), array('app' => 'PHP')); |
69 | 69 | } |
70 | 70 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | public static function onException($exception) { |
78 | 78 | $class = get_class($exception); |
79 | 79 | $msg = $exception->getMessage(); |
80 | - $msg = "$class: $msg at " . $exception->getFile() . '#' . $exception->getLine(); |
|
80 | + $msg = "$class: $msg at ".$exception->getFile().'#'.$exception->getLine(); |
|
81 | 81 | self::$logger->critical(self::removePassword($msg), ['app' => 'PHP']); |
82 | 82 | } |
83 | 83 | |
@@ -86,14 +86,14 @@ discard block |
||
86 | 86 | if (error_reporting() === 0) { |
87 | 87 | return; |
88 | 88 | } |
89 | - $msg = $message . ' at ' . $file . '#' . $line; |
|
89 | + $msg = $message.' at '.$file.'#'.$line; |
|
90 | 90 | self::$logger->error(self::removePassword($msg), array('app' => 'PHP')); |
91 | 91 | |
92 | 92 | } |
93 | 93 | |
94 | 94 | //Recoverable handler which catch all errors, warnings and notices |
95 | 95 | public static function onAll($number, $message, $file, $line) { |
96 | - $msg = $message . ' at ' . $file . '#' . $line; |
|
96 | + $msg = $message.' at '.$file.'#'.$line; |
|
97 | 97 | self::$logger->debug(self::removePassword($msg), array('app' => 'PHP')); |
98 | 98 | |
99 | 99 | } |