diff options
author | VirtualTam <virtualtam@flibidi.net> | 2018-10-13 00:19:03 +0200 |
---|---|---|
committer | VirtualTam <virtualtam@flibidi.net> | 2018-12-02 22:39:16 +0100 |
commit | f211e417bf637b8a83988175c29ee072c69f7642 (patch) | |
tree | c33378b38ff1bd16e90934b5c60467a7e0395f53 | |
parent | 04ec8fedd91642d4c0fc96258868086b8a51c899 (diff) | |
download | Shaarli-f211e417bf637b8a83988175c29ee072c69f7642.tar.gz Shaarli-f211e417bf637b8a83988175c29ee072c69f7642.tar.zst Shaarli-f211e417bf637b8a83988175c29ee072c69f7642.zip |
lint: apply phpcbf to application/
Signed-off-by: VirtualTam <virtualtam@flibidi.net>
23 files changed, 98 insertions, 93 deletions
diff --git a/application/ApplicationUtils.php b/application/ApplicationUtils.php index 911873a0..a3b2dcb1 100644 --- a/application/ApplicationUtils.php +++ b/application/ApplicationUtils.php | |||
@@ -24,7 +24,7 @@ class ApplicationUtils | |||
24 | * | 24 | * |
25 | * @return mixed the version code from the repository if available, else 'false' | 25 | * @return mixed the version code from the repository if available, else 'false' |
26 | */ | 26 | */ |
27 | public static function getLatestGitVersionCode($url, $timeout=2) | 27 | public static function getLatestGitVersionCode($url, $timeout = 2) |
28 | { | 28 | { |
29 | list($headers, $data) = get_http_response($url, $timeout); | 29 | list($headers, $data) = get_http_response($url, $timeout); |
30 | 30 | ||
@@ -86,13 +86,14 @@ class ApplicationUtils | |||
86 | * | 86 | * |
87 | * @return mixed the new version code if available and greater, else 'false' | 87 | * @return mixed the new version code if available and greater, else 'false' |
88 | */ | 88 | */ |
89 | public static function checkUpdate($currentVersion, | 89 | public static function checkUpdate( |
90 | $updateFile, | 90 | $currentVersion, |
91 | $checkInterval, | 91 | $updateFile, |
92 | $enableCheck, | 92 | $checkInterval, |
93 | $isLoggedIn, | 93 | $enableCheck, |
94 | $branch='stable') | 94 | $isLoggedIn, |
95 | { | 95 | $branch = 'stable' |
96 | ) { | ||
96 | // Do not check versions for visitors | 97 | // Do not check versions for visitors |
97 | // Do not check if the user doesn't want to | 98 | // Do not check if the user doesn't want to |
98 | // Do not check with dev version | 99 | // Do not check with dev version |
diff --git a/application/Base64Url.php b/application/Base64Url.php index 61590e43..54d0fcd5 100644 --- a/application/Base64Url.php +++ b/application/Base64Url.php | |||
@@ -2,7 +2,6 @@ | |||
2 | 2 | ||
3 | namespace Shaarli; | 3 | namespace Shaarli; |
4 | 4 | ||
5 | |||
6 | /** | 5 | /** |
7 | * URL-safe Base64 operations | 6 | * URL-safe Base64 operations |
8 | * | 7 | * |
@@ -17,7 +16,8 @@ class Base64Url | |||
17 | * | 16 | * |
18 | * @return string Base64Url-encoded data | 17 | * @return string Base64Url-encoded data |
19 | */ | 18 | */ |
20 | public static function encode($data) { | 19 | public static function encode($data) |
20 | { | ||
21 | return rtrim(strtr(base64_encode($data), '+/', '-_'), '='); | 21 | return rtrim(strtr(base64_encode($data), '+/', '-_'), '='); |
22 | } | 22 | } |
23 | 23 | ||
@@ -28,7 +28,8 @@ class Base64Url | |||
28 | * | 28 | * |
29 | * @return string Decoded data | 29 | * @return string Decoded data |
30 | */ | 30 | */ |
31 | public static function decode($data) { | 31 | public static function decode($data) |
32 | { | ||
32 | return base64_decode(str_pad(strtr($data, '-_', '+/'), strlen($data) % 4, '=', STR_PAD_RIGHT)); | 33 | return base64_decode(str_pad(strtr($data, '-_', '+/'), strlen($data) % 4, '=', STR_PAD_RIGHT)); |
33 | } | 34 | } |
34 | } | 35 | } |
diff --git a/application/FeedBuilder.php b/application/FeedBuilder.php index ebae18b4..73fafcbe 100644 --- a/application/FeedBuilder.php +++ b/application/FeedBuilder.php | |||
@@ -163,7 +163,8 @@ class FeedBuilder | |||
163 | $upDate = $link['updated']; | 163 | $upDate = $link['updated']; |
164 | $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM); | 164 | $link['up_iso_date'] = $this->getIsoDate($upDate, DateTime::ATOM); |
165 | } else { | 165 | } else { |
166 | $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM);; | 166 | $link['up_iso_date'] = $this->getIsoDate($pubDate, DateTime::ATOM); |
167 | ; | ||
167 | } | 168 | } |
168 | 169 | ||
169 | // Save the more recent item. | 170 | // Save the more recent item. |
@@ -261,7 +262,6 @@ class FeedBuilder | |||
261 | } | 262 | } |
262 | if ($this->feedType == self::$FEED_RSS) { | 263 | if ($this->feedType == self::$FEED_RSS) { |
263 | return $date->format(DateTime::RSS); | 264 | return $date->format(DateTime::RSS); |
264 | |||
265 | } | 265 | } |
266 | return $date->format(DateTime::ATOM); | 266 | return $date->format(DateTime::ATOM); |
267 | } | 267 | } |
diff --git a/application/HttpUtils.php b/application/HttpUtils.php index e9282506..ef6f3264 100644 --- a/application/HttpUtils.php +++ b/application/HttpUtils.php | |||
@@ -64,29 +64,30 @@ function get_http_response($url, $timeout = 30, $maxBytes = 4194304, $curlWriteF | |||
64 | } | 64 | } |
65 | 65 | ||
66 | // General cURL settings | 66 | // General cURL settings |
67 | curl_setopt($ch, CURLOPT_AUTOREFERER, true); | 67 | curl_setopt($ch, CURLOPT_AUTOREFERER, true); |
68 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); | 68 | curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); |
69 | curl_setopt($ch, CURLOPT_HEADER, true); | 69 | curl_setopt($ch, CURLOPT_HEADER, true); |
70 | curl_setopt( | 70 | curl_setopt( |
71 | $ch, | 71 | $ch, |
72 | CURLOPT_HTTPHEADER, | 72 | CURLOPT_HTTPHEADER, |
73 | array('Accept-Language: ' . $acceptLanguage) | 73 | array('Accept-Language: ' . $acceptLanguage) |
74 | ); | 74 | ); |
75 | curl_setopt($ch, CURLOPT_MAXREDIRS, $maxRedirs); | 75 | curl_setopt($ch, CURLOPT_MAXREDIRS, $maxRedirs); |
76 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); | 76 | curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); |
77 | curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); | 77 | curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); |
78 | curl_setopt($ch, CURLOPT_USERAGENT, $userAgent); | 78 | curl_setopt($ch, CURLOPT_USERAGENT, $userAgent); |
79 | 79 | ||
80 | if (is_callable($curlWriteFunction)) { | 80 | if (is_callable($curlWriteFunction)) { |
81 | curl_setopt($ch, CURLOPT_WRITEFUNCTION, $curlWriteFunction); | 81 | curl_setopt($ch, CURLOPT_WRITEFUNCTION, $curlWriteFunction); |
82 | } | 82 | } |
83 | 83 | ||
84 | // Max download size management | 84 | // Max download size management |
85 | curl_setopt($ch, CURLOPT_BUFFERSIZE, 1024*16); | 85 | curl_setopt($ch, CURLOPT_BUFFERSIZE, 1024*16); |
86 | curl_setopt($ch, CURLOPT_NOPROGRESS, false); | 86 | curl_setopt($ch, CURLOPT_NOPROGRESS, false); |
87 | curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, | 87 | curl_setopt( |
88 | function($arg0, $arg1, $arg2, $arg3, $arg4 = 0) use ($maxBytes) | 88 | $ch, |
89 | { | 89 | CURLOPT_PROGRESSFUNCTION, |
90 | function ($arg0, $arg1, $arg2, $arg3, $arg4 = 0) use ($maxBytes) { | ||
90 | if (version_compare(phpversion(), '5.5', '<')) { | 91 | if (version_compare(phpversion(), '5.5', '<')) { |
91 | // PHP version lower than 5.5 | 92 | // PHP version lower than 5.5 |
92 | // Callback has 4 arguments | 93 | // Callback has 4 arguments |
@@ -232,7 +233,6 @@ function get_redirected_headers($url, $redirectionLimit = 3) | |||
232 | && !empty($headers) | 233 | && !empty($headers) |
233 | && (strpos($headers[0], '301') !== false || strpos($headers[0], '302') !== false) | 234 | && (strpos($headers[0], '301') !== false || strpos($headers[0], '302') !== false) |
234 | && !empty($headers['Location'])) { | 235 | && !empty($headers['Location'])) { |
235 | |||
236 | $redirection = is_array($headers['Location']) ? end($headers['Location']) : $headers['Location']; | 236 | $redirection = is_array($headers['Location']) ? end($headers['Location']) : $headers['Location']; |
237 | if ($redirection != $url) { | 237 | if ($redirection != $url) { |
238 | $redirection = getAbsoluteUrl($url, $redirection); | 238 | $redirection = getAbsoluteUrl($url, $redirection); |
diff --git a/application/Languages.php b/application/Languages.php index 4fa32426..6a6247c7 100644 --- a/application/Languages.php +++ b/application/Languages.php | |||
@@ -92,7 +92,7 @@ class Languages | |||
92 | /** | 92 | /** |
93 | * Initialize the translator using php gettext extension (gettext dependency act as a wrapper). | 93 | * Initialize the translator using php gettext extension (gettext dependency act as a wrapper). |
94 | */ | 94 | */ |
95 | protected function initGettextTranslator () | 95 | protected function initGettextTranslator() |
96 | { | 96 | { |
97 | $this->translator = new GettextTranslator(); | 97 | $this->translator = new GettextTranslator(); |
98 | $this->translator->setLanguage($this->language); | 98 | $this->translator->setLanguage($this->language); |
@@ -125,7 +125,8 @@ class Languages | |||
125 | $translations = $translations->addFromPoFile('inc/languages/'. $this->language .'/LC_MESSAGES/shaarli.po'); | 125 | $translations = $translations->addFromPoFile('inc/languages/'. $this->language .'/LC_MESSAGES/shaarli.po'); |
126 | $translations->setDomain('shaarli'); | 126 | $translations->setDomain('shaarli'); |
127 | $this->translator->loadTranslations($translations); | 127 | $this->translator->loadTranslations($translations); |
128 | } catch (\InvalidArgumentException $e) {} | 128 | } catch (\InvalidArgumentException $e) { |
129 | } | ||
129 | 130 | ||
130 | // Default extension translation from the current theme | 131 | // Default extension translation from the current theme |
131 | $theme = $this->conf->get('theme'); | 132 | $theme = $this->conf->get('theme'); |
@@ -137,7 +138,8 @@ class Languages | |||
137 | ); | 138 | ); |
138 | $translations->setDomain($theme); | 139 | $translations->setDomain($theme); |
139 | $this->translator->loadTranslations($translations); | 140 | $this->translator->loadTranslations($translations); |
140 | } catch (\InvalidArgumentException $e) {} | 141 | } catch (\InvalidArgumentException $e) { |
142 | } | ||
141 | } | 143 | } |
142 | 144 | ||
143 | // Extension translations (plugins, themes, etc.). | 145 | // Extension translations (plugins, themes, etc.). |
@@ -150,7 +152,8 @@ class Languages | |||
150 | $extension = Translations::fromPoFile($translationPath . $this->language .'/LC_MESSAGES/'. $domain .'.po'); | 152 | $extension = Translations::fromPoFile($translationPath . $this->language .'/LC_MESSAGES/'. $domain .'.po'); |
151 | $extension->setDomain($domain); | 153 | $extension->setDomain($domain); |
152 | $this->translator->loadTranslations($extension); | 154 | $this->translator->loadTranslations($extension); |
153 | } catch (\InvalidArgumentException $e) {} | 155 | } catch (\InvalidArgumentException $e) { |
156 | } | ||
154 | } | 157 | } |
155 | } | 158 | } |
156 | 159 | ||
diff --git a/application/LinkDB.php b/application/LinkDB.php index cdd68cfb..1f7c28cd 100644 --- a/application/LinkDB.php +++ b/application/LinkDB.php | |||
@@ -107,8 +107,7 @@ class LinkDB implements Iterator, Countable, ArrayAccess | |||
107 | $hidePublicLinks, | 107 | $hidePublicLinks, |
108 | $redirector = '', | 108 | $redirector = '', |
109 | $redirectorEncode = true | 109 | $redirectorEncode = true |
110 | ) | 110 | ) { |
111 | { | ||
112 | $this->datastore = $datastore; | 111 | $this->datastore = $datastore; |
113 | $this->loggedIn = $isLoggedIn; | 112 | $this->loggedIn = $isLoggedIn; |
114 | $this->hidePublicLinks = $hidePublicLinks; | 113 | $this->hidePublicLinks = $hidePublicLinks; |
@@ -317,8 +316,7 @@ You use the community supported version of the original Shaarli project, by Seba | |||
317 | } else { | 316 | } else { |
318 | $link['real_url'] .= $link['url']; | 317 | $link['real_url'] .= $link['url']; |
319 | } | 318 | } |
320 | } | 319 | } else { |
321 | else { | ||
322 | $link['real_url'] = $link['url']; | 320 | $link['real_url'] = $link['url']; |
323 | } | 321 | } |
324 | 322 | ||
@@ -403,7 +401,8 @@ You use the community supported version of the original Shaarli project, by Seba | |||
403 | * | 401 | * |
404 | * @return array list of shaare found. | 402 | * @return array list of shaare found. |
405 | */ | 403 | */ |
406 | public function filterDay($request) { | 404 | public function filterDay($request) |
405 | { | ||
407 | $linkFilter = new LinkFilter($this->links); | 406 | $linkFilter = new LinkFilter($this->links); |
408 | return $linkFilter->filter(LinkFilter::$FILTER_DAY, $request); | 407 | return $linkFilter->filter(LinkFilter::$FILTER_DAY, $request); |
409 | } | 408 | } |
@@ -492,8 +491,7 @@ You use the community supported version of the original Shaarli project, by Seba | |||
492 | $delete = empty($to); | 491 | $delete = empty($to); |
493 | // True for case-sensitive tag search. | 492 | // True for case-sensitive tag search. |
494 | $linksToAlter = $this->filterSearch(['searchtags' => $from], true); | 493 | $linksToAlter = $this->filterSearch(['searchtags' => $from], true); |
495 | foreach($linksToAlter as $key => &$value) | 494 | foreach ($linksToAlter as $key => &$value) { |
496 | { | ||
497 | $tags = preg_split('/\s+/', trim($value['tags'])); | 495 | $tags = preg_split('/\s+/', trim($value['tags'])); |
498 | if (($pos = array_search($from, $tags)) !== false) { | 496 | if (($pos = array_search($from, $tags)) !== false) { |
499 | if ($delete) { | 497 | if ($delete) { |
@@ -536,7 +534,7 @@ You use the community supported version of the original Shaarli project, by Seba | |||
536 | { | 534 | { |
537 | $order = $order === 'ASC' ? -1 : 1; | 535 | $order = $order === 'ASC' ? -1 : 1; |
538 | // Reorder array by dates. | 536 | // Reorder array by dates. |
539 | usort($this->links, function($a, $b) use ($order) { | 537 | usort($this->links, function ($a, $b) use ($order) { |
540 | if (isset($a['sticky']) && isset($b['sticky']) && $a['sticky'] !== $b['sticky']) { | 538 | if (isset($a['sticky']) && isset($b['sticky']) && $a['sticky'] !== $b['sticky']) { |
541 | return $a['sticky'] ? -1 : 1; | 539 | return $a['sticky'] ? -1 : 1; |
542 | } | 540 | } |
diff --git a/application/LinkFilter.php b/application/LinkFilter.php index e52239b8..8f147974 100644 --- a/application/LinkFilter.php +++ b/application/LinkFilter.php | |||
@@ -62,7 +62,7 @@ class LinkFilter | |||
62 | $visibility = 'all'; | 62 | $visibility = 'all'; |
63 | } | 63 | } |
64 | 64 | ||
65 | switch($type) { | 65 | switch ($type) { |
66 | case self::$FILTER_HASH: | 66 | case self::$FILTER_HASH: |
67 | return $this->filterSmallHash($request); | 67 | return $this->filterSmallHash($request); |
68 | case self::$FILTER_TAG | self::$FILTER_TEXT: // == "vuotext" | 68 | case self::$FILTER_TAG | self::$FILTER_TEXT: // == "vuotext" |
@@ -205,7 +205,6 @@ class LinkFilter | |||
205 | 205 | ||
206 | // Iterate over every stored link. | 206 | // Iterate over every stored link. |
207 | foreach ($this->links as $id => $link) { | 207 | foreach ($this->links as $id => $link) { |
208 | |||
209 | // ignore non private links when 'privatonly' is on. | 208 | // ignore non private links when 'privatonly' is on. |
210 | if ($visibility !== 'all') { | 209 | if ($visibility !== 'all') { |
211 | if (! $link['private'] && $visibility === 'private') { | 210 | if (! $link['private'] && $visibility === 'private') { |
@@ -257,11 +256,11 @@ class LinkFilter | |||
257 | private static function tag2regex($tag) | 256 | private static function tag2regex($tag) |
258 | { | 257 | { |
259 | $len = strlen($tag); | 258 | $len = strlen($tag); |
260 | if(!$len || $tag === "-" || $tag === "*"){ | 259 | if (!$len || $tag === "-" || $tag === "*") { |
261 | // nothing to search, return empty regex | 260 | // nothing to search, return empty regex |
262 | return ''; | 261 | return ''; |
263 | } | 262 | } |
264 | if($tag[0] === "-") { | 263 | if ($tag[0] === "-") { |
265 | // query is negated | 264 | // query is negated |
266 | $i = 1; // use offset to start after '-' character | 265 | $i = 1; // use offset to start after '-' character |
267 | $regex = '(?!'; // create negative lookahead | 266 | $regex = '(?!'; // create negative lookahead |
@@ -271,14 +270,14 @@ class LinkFilter | |||
271 | } | 270 | } |
272 | $regex .= '.*(?:^| )'; // before tag may only be a space or the beginning | 271 | $regex .= '.*(?:^| )'; // before tag may only be a space or the beginning |
273 | // iterate over string, separating it into placeholder and content | 272 | // iterate over string, separating it into placeholder and content |
274 | for(; $i < $len; $i++){ | 273 | for (; $i < $len; $i++) { |
275 | if($tag[$i] === '*'){ | 274 | if ($tag[$i] === '*') { |
276 | // placeholder found | 275 | // placeholder found |
277 | $regex .= '[^ ]*?'; | 276 | $regex .= '[^ ]*?'; |
278 | } else { | 277 | } else { |
279 | // regular characters | 278 | // regular characters |
280 | $offset = strpos($tag, '*', $i); | 279 | $offset = strpos($tag, '*', $i); |
281 | if($offset === false){ | 280 | if ($offset === false) { |
282 | // no placeholder found, set offset to end of string | 281 | // no placeholder found, set offset to end of string |
283 | $offset = $len; | 282 | $offset = $len; |
284 | } | 283 | } |
@@ -310,19 +309,19 @@ class LinkFilter | |||
310 | { | 309 | { |
311 | // get single tags (we may get passed an array, even though the docs say different) | 310 | // get single tags (we may get passed an array, even though the docs say different) |
312 | $inputTags = $tags; | 311 | $inputTags = $tags; |
313 | if(!is_array($tags)) { | 312 | if (!is_array($tags)) { |
314 | // we got an input string, split tags | 313 | // we got an input string, split tags |
315 | $inputTags = preg_split('/(?:\s+)|,/', $inputTags, -1, PREG_SPLIT_NO_EMPTY); | 314 | $inputTags = preg_split('/(?:\s+)|,/', $inputTags, -1, PREG_SPLIT_NO_EMPTY); |
316 | } | 315 | } |
317 | 316 | ||
318 | if(!count($inputTags)){ | 317 | if (!count($inputTags)) { |
319 | // no input tags | 318 | // no input tags |
320 | return $this->noFilter($visibility); | 319 | return $this->noFilter($visibility); |
321 | } | 320 | } |
322 | 321 | ||
323 | // build regex from all tags | 322 | // build regex from all tags |
324 | $re = '/^' . implode(array_map("self::tag2regex", $inputTags)) . '.*$/'; | 323 | $re = '/^' . implode(array_map("self::tag2regex", $inputTags)) . '.*$/'; |
325 | if(!$casesensitive) { | 324 | if (!$casesensitive) { |
326 | // make regex case insensitive | 325 | // make regex case insensitive |
327 | $re .= 'i'; | 326 | $re .= 'i'; |
328 | } | 327 | } |
@@ -342,7 +341,7 @@ class LinkFilter | |||
342 | } | 341 | } |
343 | } | 342 | } |
344 | $search = $link['tags']; // build search string, start with tags of current link | 343 | $search = $link['tags']; // build search string, start with tags of current link |
345 | if(strlen(trim($link['description'])) && strpos($link['description'], '#') !== false){ | 344 | if (strlen(trim($link['description'])) && strpos($link['description'], '#') !== false) { |
346 | // description given and at least one possible tag found | 345 | // description given and at least one possible tag found |
347 | $descTags = array(); | 346 | $descTags = array(); |
348 | // find all tags in the form of #tag in the description | 347 | // find all tags in the form of #tag in the description |
@@ -351,13 +350,13 @@ class LinkFilter | |||
351 | $link['description'], | 350 | $link['description'], |
352 | $descTags | 351 | $descTags |
353 | ); | 352 | ); |
354 | if(count($descTags[1])){ | 353 | if (count($descTags[1])) { |
355 | // there were some tags in the description, add them to the search string | 354 | // there were some tags in the description, add them to the search string |
356 | $search .= ' ' . implode(' ', $descTags[1]); | 355 | $search .= ' ' . implode(' ', $descTags[1]); |
357 | } | 356 | } |
358 | }; | 357 | }; |
359 | // match regular expression with search string | 358 | // match regular expression with search string |
360 | if(!preg_match($re, $search)){ | 359 | if (!preg_match($re, $search)) { |
361 | // this entry does _not_ match our regex | 360 | // this entry does _not_ match our regex |
362 | continue; | 361 | continue; |
363 | } | 362 | } |
diff --git a/application/LinkUtils.php b/application/LinkUtils.php index 4df5c0ca..d56e019f 100644 --- a/application/LinkUtils.php +++ b/application/LinkUtils.php | |||
@@ -23,7 +23,7 @@ function get_curl_download_callback(&$charset, &$title, $curlGetInfo = 'curl_get | |||
23 | * | 23 | * |
24 | * @return int|bool length of $data or false if we need to stop the download | 24 | * @return int|bool length of $data or false if we need to stop the download |
25 | */ | 25 | */ |
26 | return function(&$ch, $data) use ($curlGetInfo, &$charset, &$title, &$isRedirected) { | 26 | return function (&$ch, $data) use ($curlGetInfo, &$charset, &$title, &$isRedirected) { |
27 | $responseCode = $curlGetInfo($ch, CURLINFO_RESPONSE_CODE); | 27 | $responseCode = $curlGetInfo($ch, CURLINFO_RESPONSE_CODE); |
28 | if (!empty($responseCode) && in_array($responseCode, [301, 302])) { | 28 | if (!empty($responseCode) && in_array($responseCode, [301, 302])) { |
29 | $isRedirected = true; | 29 | $isRedirected = true; |
@@ -201,7 +201,8 @@ function space2nbsp($text) | |||
201 | 201 | ||
202 | * @return string formatted description. | 202 | * @return string formatted description. |
203 | */ | 203 | */ |
204 | function format_description($description, $redirector = '', $urlEncode = true, $indexUrl = '') { | 204 | function format_description($description, $redirector = '', $urlEncode = true, $indexUrl = '') |
205 | { | ||
205 | return nl2br(space2nbsp(hashtag_autolink(text2clickable($description, $redirector, $urlEncode), $indexUrl))); | 206 | return nl2br(space2nbsp(hashtag_autolink(text2clickable($description, $redirector, $urlEncode), $indexUrl))); |
206 | } | 207 | } |
207 | 208 | ||
diff --git a/application/NetscapeBookmarkUtils.php b/application/NetscapeBookmarkUtils.php index b4d16d00..e147d326 100644 --- a/application/NetscapeBookmarkUtils.php +++ b/application/NetscapeBookmarkUtils.php | |||
@@ -72,12 +72,11 @@ class NetscapeBookmarkUtils | |||
72 | private static function importStatus( | 72 | private static function importStatus( |
73 | $filename, | 73 | $filename, |
74 | $filesize, | 74 | $filesize, |
75 | $importCount=0, | 75 | $importCount = 0, |
76 | $overwriteCount=0, | 76 | $overwriteCount = 0, |
77 | $skipCount=0, | 77 | $skipCount = 0, |
78 | $duration=0 | 78 | $duration = 0 |
79 | ) | 79 | ) { |
80 | { | ||
81 | $status = sprintf(t('File %s (%d bytes) '), $filename, $filesize); | 80 | $status = sprintf(t('File %s (%d bytes) '), $filename, $filesize); |
82 | if ($importCount == 0 && $overwriteCount == 0 && $skipCount == 0) { | 81 | if ($importCount == 0 && $overwriteCount == 0 && $skipCount == 0) { |
83 | $status .= t('has an unknown file format. Nothing was imported.'); | 82 | $status .= t('has an unknown file format. Nothing was imported.'); |
diff --git a/application/PageBuilder.php b/application/PageBuilder.php index 0efd24c3..2ca95832 100644 --- a/application/PageBuilder.php +++ b/application/PageBuilder.php | |||
@@ -78,7 +78,6 @@ class PageBuilder | |||
78 | ); | 78 | ); |
79 | $this->tpl->assign('newVersion', escape($version)); | 79 | $this->tpl->assign('newVersion', escape($version)); |
80 | $this->tpl->assign('versionError', ''); | 80 | $this->tpl->assign('versionError', ''); |
81 | |||
82 | } catch (Exception $exc) { | 81 | } catch (Exception $exc) { |
83 | logm($this->conf->get('resource.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage()); | 82 | logm($this->conf->get('resource.log'), $_SERVER['REMOTE_ADDR'], $exc->getMessage()); |
84 | $this->tpl->assign('newVersion', ''); | 83 | $this->tpl->assign('newVersion', ''); |
@@ -163,7 +162,7 @@ class PageBuilder | |||
163 | $this->initialize(); | 162 | $this->initialize(); |
164 | } | 163 | } |
165 | 164 | ||
166 | if (empty($data) || !is_array($data)){ | 165 | if (empty($data) || !is_array($data)) { |
167 | return false; | 166 | return false; |
168 | } | 167 | } |
169 | 168 | ||
diff --git a/application/PluginManager.php b/application/PluginManager.php index cf603845..1ed4db4b 100644 --- a/application/PluginManager.php +++ b/application/PluginManager.php | |||
@@ -75,8 +75,7 @@ class PluginManager | |||
75 | 75 | ||
76 | try { | 76 | try { |
77 | $this->loadPlugin($dirs[$index], $plugin); | 77 | $this->loadPlugin($dirs[$index], $plugin); |
78 | } | 78 | } catch (PluginFileNotFoundException $e) { |
79 | catch (PluginFileNotFoundException $e) { | ||
80 | error_log($e->getMessage()); | 79 | error_log($e->getMessage()); |
81 | } | 80 | } |
82 | } | 81 | } |
diff --git a/application/Updater.php b/application/Updater.php index 5dde47cb..6b94c5e3 100644 --- a/application/Updater.php +++ b/application/Updater.php | |||
@@ -183,7 +183,7 @@ class Updater | |||
183 | } | 183 | } |
184 | } | 184 | } |
185 | 185 | ||
186 | try{ | 186 | try { |
187 | $this->conf->write($this->isLoggedIn); | 187 | $this->conf->write($this->isLoggedIn); |
188 | return true; | 188 | return true; |
189 | } catch (IOException $e) { | 189 | } catch (IOException $e) { |
diff --git a/application/Url.php b/application/Url.php index 6b9870f0..3b7f19c2 100644 --- a/application/Url.php +++ b/application/Url.php | |||
@@ -34,8 +34,8 @@ function unparse_url($parsedUrl) | |||
34 | */ | 34 | */ |
35 | function cleanup_url($url) | 35 | function cleanup_url($url) |
36 | { | 36 | { |
37 | $obj_url = new Url($url); | 37 | $obj_url = new Url($url); |
38 | return $obj_url->cleanup(); | 38 | return $obj_url->cleanup(); |
39 | } | 39 | } |
40 | 40 | ||
41 | /** | 41 | /** |
@@ -47,8 +47,8 @@ function cleanup_url($url) | |||
47 | */ | 47 | */ |
48 | function get_url_scheme($url) | 48 | function get_url_scheme($url) |
49 | { | 49 | { |
50 | $obj_url = new Url($url); | 50 | $obj_url = new Url($url); |
51 | return $obj_url->getScheme(); | 51 | return $obj_url->getScheme(); |
52 | } | 52 | } |
53 | 53 | ||
54 | /** | 54 | /** |
@@ -217,7 +217,7 @@ class Url | |||
217 | } | 217 | } |
218 | 218 | ||
219 | $this->parts['query'] = implode('&', $queryParams); | 219 | $this->parts['query'] = implode('&', $queryParams); |
220 | } | 220 | } |
221 | 221 | ||
222 | /** | 222 | /** |
223 | * Removes undesired fragments | 223 | * Removes undesired fragments |
@@ -269,7 +269,8 @@ class Url | |||
269 | * | 269 | * |
270 | * @return string the URL scheme or false if none is provided. | 270 | * @return string the URL scheme or false if none is provided. |
271 | */ | 271 | */ |
272 | public function getScheme() { | 272 | public function getScheme() |
273 | { | ||
273 | if (!isset($this->parts['scheme'])) { | 274 | if (!isset($this->parts['scheme'])) { |
274 | return false; | 275 | return false; |
275 | } | 276 | } |
@@ -281,7 +282,8 @@ class Url | |||
281 | * | 282 | * |
282 | * @return string the URL host or false if none is provided. | 283 | * @return string the URL host or false if none is provided. |
283 | */ | 284 | */ |
284 | public function getHost() { | 285 | public function getHost() |
286 | { | ||
285 | if (empty($this->parts['host'])) { | 287 | if (empty($this->parts['host'])) { |
286 | return false; | 288 | return false; |
287 | } | 289 | } |
@@ -293,7 +295,8 @@ class Url | |||
293 | * | 295 | * |
294 | * @return true is HTTP, false otherwise. | 296 | * @return true is HTTP, false otherwise. |
295 | */ | 297 | */ |
296 | public function isHttp() { | 298 | public function isHttp() |
299 | { | ||
297 | return strpos(strtolower($this->parts['scheme']), 'http') !== false; | 300 | return strpos(strtolower($this->parts['scheme']), 'http') !== false; |
298 | } | 301 | } |
299 | } | 302 | } |
diff --git a/application/Utils.php b/application/Utils.php index 97b12fcf..925e1a22 100644 --- a/application/Utils.php +++ b/application/Utils.php | |||
@@ -97,7 +97,7 @@ function escape($input) | |||
97 | 97 | ||
98 | if (is_array($input)) { | 98 | if (is_array($input)) { |
99 | $out = array(); | 99 | $out = array(); |
100 | foreach($input as $key => $value) { | 100 | foreach ($input as $key => $value) { |
101 | $out[$key] = escape($value); | 101 | $out[$key] = escape($value); |
102 | } | 102 | } |
103 | return $out; | 103 | return $out; |
@@ -355,10 +355,13 @@ function return_bytes($val) | |||
355 | $val = trim($val); | 355 | $val = trim($val); |
356 | $last = strtolower($val[strlen($val)-1]); | 356 | $last = strtolower($val[strlen($val)-1]); |
357 | $val = intval(substr($val, 0, -1)); | 357 | $val = intval(substr($val, 0, -1)); |
358 | switch($last) { | 358 | switch ($last) { |
359 | case 'g': $val *= 1024; | 359 | case 'g': |
360 | case 'm': $val *= 1024; | 360 | $val *= 1024; |
361 | case 'k': $val *= 1024; | 361 | case 'm': |
362 | $val *= 1024; | ||
363 | case 'k': | ||
364 | $val *= 1024; | ||
362 | } | 365 | } |
363 | return $val; | 366 | return $val; |
364 | } | 367 | } |
@@ -452,6 +455,7 @@ function alphabetical_sort(&$data, $reverse = false, $byKeys = false) | |||
452 | * | 455 | * |
453 | * @return string Text translated. | 456 | * @return string Text translated. |
454 | */ | 457 | */ |
455 | function t($text, $nText = '', $nb = 1, $domain = 'shaarli') { | 458 | function t($text, $nText = '', $nb = 1, $domain = 'shaarli') |
459 | { | ||
456 | return dn__($domain, $text, $nText, $nb); | 460 | return dn__($domain, $text, $nText, $nb); |
457 | } | 461 | } |
diff --git a/application/api/ApiMiddleware.php b/application/api/ApiMiddleware.php index ff209393..66eac133 100644 --- a/application/api/ApiMiddleware.php +++ b/application/api/ApiMiddleware.php | |||
@@ -65,7 +65,7 @@ class ApiMiddleware | |||
65 | try { | 65 | try { |
66 | $this->checkRequest($request); | 66 | $this->checkRequest($request); |
67 | $response = $next($request, $response); | 67 | $response = $next($request, $response); |
68 | } catch(ApiException $e) { | 68 | } catch (ApiException $e) { |
69 | $e->setResponse($response); | 69 | $e->setResponse($response); |
70 | $e->setDebug($this->conf->get('dev.debug', false)); | 70 | $e->setDebug($this->conf->get('dev.debug', false)); |
71 | $response = $e->getApiResponse(); | 71 | $response = $e->getApiResponse(); |
@@ -98,7 +98,8 @@ class ApiMiddleware | |||
98 | * | 98 | * |
99 | * @throws ApiAuthorizationException The token couldn't be validated. | 99 | * @throws ApiAuthorizationException The token couldn't be validated. |
100 | */ | 100 | */ |
101 | protected function checkToken($request) { | 101 | protected function checkToken($request) |
102 | { | ||
102 | if (! $request->hasHeader('Authorization')) { | 103 | if (! $request->hasHeader('Authorization')) { |
103 | throw new ApiAuthorizationException('JWT token not provided'); | 104 | throw new ApiAuthorizationException('JWT token not provided'); |
104 | } | 105 | } |
diff --git a/application/api/controllers/ApiController.php b/application/api/controllers/ApiController.php index 3be85b98..9edefcf6 100644 --- a/application/api/controllers/ApiController.php +++ b/application/api/controllers/ApiController.php | |||
@@ -41,7 +41,7 @@ abstract class ApiController | |||
41 | 41 | ||
42 | /** | 42 | /** |
43 | * ApiController constructor. | 43 | * ApiController constructor. |
44 | * | 44 | * |
45 | * Note: enabling debug mode displays JSON with readable formatting. | 45 | * Note: enabling debug mode displays JSON with readable formatting. |
46 | * | 46 | * |
47 | * @param Container $ci Slim container. | 47 | * @param Container $ci Slim container. |
diff --git a/application/api/controllers/History.php b/application/api/controllers/History.php index 5cc453bf..4582e8b2 100644 --- a/application/api/controllers/History.php +++ b/application/api/controllers/History.php | |||
@@ -35,8 +35,7 @@ class History extends ApiController | |||
35 | $offset = $request->getParam('offset'); | 35 | $offset = $request->getParam('offset'); |
36 | if (empty($offset)) { | 36 | if (empty($offset)) { |
37 | $offset = 0; | 37 | $offset = 0; |
38 | } | 38 | } elseif (ctype_digit($offset)) { |
39 | elseif (ctype_digit($offset)) { | ||
40 | $offset = (int) $offset; | 39 | $offset = (int) $offset; |
41 | } else { | 40 | } else { |
42 | throw new ApiBadParametersException('Invalid offset'); | 41 | throw new ApiBadParametersException('Invalid offset'); |
diff --git a/application/api/controllers/Info.php b/application/api/controllers/Info.php index 25433f72..f37dcae5 100644 --- a/application/api/controllers/Info.php +++ b/application/api/controllers/Info.php | |||
@@ -7,7 +7,7 @@ use Slim\Http\Response; | |||
7 | 7 | ||
8 | /** | 8 | /** |
9 | * Class Info | 9 | * Class Info |
10 | * | 10 | * |
11 | * REST API Controller: /info | 11 | * REST API Controller: /info |
12 | * | 12 | * |
13 | * @package Api\Controllers | 13 | * @package Api\Controllers |
@@ -17,7 +17,7 @@ class Info extends ApiController | |||
17 | { | 17 | { |
18 | /** | 18 | /** |
19 | * Service providing various information about Shaarli instance. | 19 | * Service providing various information about Shaarli instance. |
20 | * | 20 | * |
21 | * @param Request $request Slim request. | 21 | * @param Request $request Slim request. |
22 | * @param Response $response Slim response. | 22 | * @param Response $response Slim response. |
23 | * | 23 | * |
diff --git a/application/api/exceptions/ApiException.php b/application/api/exceptions/ApiException.php index c8490e0c..d6b66323 100644 --- a/application/api/exceptions/ApiException.php +++ b/application/api/exceptions/ApiException.php | |||
@@ -10,7 +10,8 @@ use Slim\Http\Response; | |||
10 | * Parent Exception related to the API, able to generate a valid Response (ResponseInterface). | 10 | * Parent Exception related to the API, able to generate a valid Response (ResponseInterface). |
11 | * Also can include various information in debug mode. | 11 | * Also can include various information in debug mode. |
12 | */ | 12 | */ |
13 | abstract class ApiException extends \Exception { | 13 | abstract class ApiException extends \Exception |
14 | { | ||
14 | 15 | ||
15 | /** | 16 | /** |
16 | * @var Response instance from Slim. | 17 | * @var Response instance from Slim. |
@@ -27,7 +28,7 @@ abstract class ApiException extends \Exception { | |||
27 | * | 28 | * |
28 | * @return Response Final response to give. | 29 | * @return Response Final response to give. |
29 | */ | 30 | */ |
30 | public abstract function getApiResponse(); | 31 | abstract public function getApiResponse(); |
31 | 32 | ||
32 | /** | 33 | /** |
33 | * Creates ApiResponse body. | 34 | * Creates ApiResponse body. |
@@ -36,7 +37,8 @@ abstract class ApiException extends \Exception { | |||
36 | * | 37 | * |
37 | * @return array|string response body | 38 | * @return array|string response body |
38 | */ | 39 | */ |
39 | protected function getApiResponseBody() { | 40 | protected function getApiResponseBody() |
41 | { | ||
40 | if ($this->debug !== true) { | 42 | if ($this->debug !== true) { |
41 | return $this->getMessage(); | 43 | return $this->getMessage(); |
42 | } | 44 | } |
diff --git a/application/api/exceptions/ApiLinkNotFoundException.php b/application/api/exceptions/ApiLinkNotFoundException.php index de7e14f5..c727f4f0 100644 --- a/application/api/exceptions/ApiLinkNotFoundException.php +++ b/application/api/exceptions/ApiLinkNotFoundException.php | |||
@@ -2,7 +2,6 @@ | |||
2 | 2 | ||
3 | namespace Shaarli\Api\Exceptions; | 3 | namespace Shaarli\Api\Exceptions; |
4 | 4 | ||
5 | |||
6 | use Slim\Http\Response; | 5 | use Slim\Http\Response; |
7 | 6 | ||
8 | /** | 7 | /** |
diff --git a/application/api/exceptions/ApiTagNotFoundException.php b/application/api/exceptions/ApiTagNotFoundException.php index eed5afa5..eee152fe 100644 --- a/application/api/exceptions/ApiTagNotFoundException.php +++ b/application/api/exceptions/ApiTagNotFoundException.php | |||
@@ -2,7 +2,6 @@ | |||
2 | 2 | ||
3 | namespace Shaarli\Api\Exceptions; | 3 | namespace Shaarli\Api\Exceptions; |
4 | 4 | ||
5 | |||
6 | use Slim\Http\Response; | 5 | use Slim\Http\Response; |
7 | 6 | ||
8 | /** | 7 | /** |
diff --git a/application/config/ConfigPlugin.php b/application/config/ConfigPlugin.php index b3d9752b..dbb24937 100644 --- a/application/config/ConfigPlugin.php +++ b/application/config/ConfigPlugin.php | |||
@@ -34,8 +34,7 @@ function save_plugin_config($formData) | |||
34 | // If there is no order, it means a disabled plugin has been enabled. | 34 | // If there is no order, it means a disabled plugin has been enabled. |
35 | if (isset($formData['order_' . $key])) { | 35 | if (isset($formData['order_' . $key])) { |
36 | $plugins[(int) $formData['order_' . $key]] = $key; | 36 | $plugins[(int) $formData['order_' . $key]] = $key; |
37 | } | 37 | } else { |
38 | else { | ||
39 | $newEnabledPlugins[] = $key; | 38 | $newEnabledPlugins[] = $key; |
40 | } | 39 | } |
41 | } | 40 | } |
diff --git a/application/security/LoginManager.php b/application/security/LoginManager.php index d6784d6d..0f315483 100644 --- a/application/security/LoginManager.php +++ b/application/security/LoginManager.php | |||
@@ -95,7 +95,6 @@ class LoginManager | |||
95 | // The user client has a valid stay-signed-in cookie | 95 | // The user client has a valid stay-signed-in cookie |
96 | // Session information is updated with the current client information | 96 | // Session information is updated with the current client information |
97 | $this->sessionManager->storeLoginInfo($clientIpId); | 97 | $this->sessionManager->storeLoginInfo($clientIpId); |
98 | |||
99 | } elseif ($this->sessionManager->hasSessionExpired() | 98 | } elseif ($this->sessionManager->hasSessionExpired() |
100 | || $this->sessionManager->hasClientIpChanged($clientIpId) | 99 | || $this->sessionManager->hasClientIpChanged($clientIpId) |
101 | ) { | 100 | ) { |