Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1097 from ArthurHoaro/fix/psr-elseif

Browse source 
PSR: use elseif instead of else if
This commit is contained in:
ArthurHoaro 2018-03-07 21:53:53 +01:00 committed by GitHub
commit 39ee93925b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/FileUtils.php
View file

@ -37,7 +37,7 @@ public static function writeFlatDB($file, $content)
if (is_file($file) && !is_writeable($file)) {
// The datastore exists but is not writeable
throw new IOException($file);
} else if (!is_file($file) && !is_writeable(dirname($file))) {
} elseif (!is_file($file) && !is_writeable(dirname($file))) {
// The datastore does not exist and its parent directory is not writeable
throw new IOException(dirname($file));
}

8
application/LinkFilter.php
View file

@ -117,7 +117,7 @@ private function noFilter($visibility = 'all')
foreach ($this->links as $key => $value) {
if ($value['private'] && $visibility === 'private') {
$out[$key] = $value;
} else if (! $value['private'] && $visibility === 'public') {
} elseif (! $value['private'] && $visibility === 'public') {
$out[$key] = $value;
}
}
@ -210,7 +210,7 @@ private function filterFulltext($searchterms, $visibility = 'all')
if ($visibility !== 'all') {
if (! $link['private'] && $visibility === 'private') {
continue;
} else if ($link['private'] && $visibility === 'public') {
} elseif ($link['private'] && $visibility === 'public') {
continue;
}
}
@ -337,7 +337,7 @@ public function filterTags($tags, $casesensitive = false, $visibility = 'all')
if ($visibility !== 'all') {
if (! $link['private'] && $visibility === 'private') {
continue;
} else if ($link['private'] && $visibility === 'public') {
} elseif ($link['private'] && $visibility === 'public') {
continue;
}
}
@ -380,7 +380,7 @@ public function filterUntagged($visibility)
if ($visibility !== 'all') {
if (! $link['private'] && $visibility === 'private') {
continue;
} else if ($link['private'] && $visibility === 'public') {
} elseif ($link['private'] && $visibility === 'public') {
continue;
}
}

4
application/NetscapeBookmarkUtils.php
View file

@ -154,10 +154,10 @@ public static function import($post, $files, $linkDb, $conf, $history)
if (empty($post['privacy']) || $post['privacy'] == 'default') {
// use value from the imported file
$private = $bkm['pub'] == '1' ? 0 : 1;
} else if ($post['privacy'] == 'private') {
} elseif ($post['privacy'] == 'private') {
// all imported links are private
$private = 1;
} else if ($post['privacy'] == 'public') {
} elseif ($post['privacy'] == 'public') {
// all imported links are public
$private = 0;
}

2
application/Url.php
View file

@ -81,7 +81,7 @@ function whitelist_protocols($url, $protocols)
// Protocol not allowed: we remove it and replace it with http
if ($protocol === 1 && ! in_array($match[1], $protocols)) {
$url = str_replace($match[0], 'http://', $url);
} else if ($protocol !== 1) {
} elseif ($protocol !== 1) {
$url = 'http://' . $url;
}
return $url;

4
application/api/controllers/History.php
View file

@ -36,7 +36,7 @@ public function getHistory($request, $response)
if (empty($offset)) {
$offset = 0;
}
else if (ctype_digit($offset)) {
elseif (ctype_digit($offset)) {
$offset = (int) $offset;
} else {
throw new ApiBadParametersException('Invalid offset');
@ -46,7 +46,7 @@ public function getHistory($request, $response)
$limit = $request->getParam('limit');
if (empty($limit)) {
$limit = count($history);
} else if (ctype_digit($limit)) {
} elseif (ctype_digit($limit)) {
$limit = (int) $limit;
} else {
throw new ApiBadParametersException('Invalid limit');

4
application/api/controllers/Links.php
View file

@ -59,9 +59,9 @@ public function getLinks($request, $response)
$limit = $request->getParam('limit');
if (empty($limit)) {
$limit = self::$DEFAULT_LIMIT;
} else if (ctype_digit($limit)) {
} elseif (ctype_digit($limit)) {
$limit = intval($limit);
} else if ($limit === 'all') {
} elseif ($limit === 'all') {
$limit = count($links);
} else {
throw new ApiBadParametersException('Invalid limit');

4
index.php
View file

@ -887,7 +887,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
if (empty($params['searchtags'])) {
$params['searchtags'] = trim($_GET['addtag']);
}
else if ($addtag) {
elseif ($addtag) {
$params['searchtags'] = trim($params['searchtags']).' '.trim($_GET['addtag']);
}
@ -953,7 +953,7 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history, $sessionManager,
} else {
unset($_SESSION['visibility']);
}
} else if ($_GET['visibility'] === 'public') {
} elseif ($_GET['visibility'] === 'public') {
if (empty($_SESSION['visibility']) || $_SESSION['visibility'] !== 'public') {
// See only public links
$_SESSION['visibility'] = 'public';

2
tests/plugins/test/test.php
View file

@ -11,7 +11,7 @@ function hook_test_random($data)
{
if (isset($data['_PAGE_']) && $data['_PAGE_'] == 'test') {
$data[1] = 'page test';
} else if (isset($data['_LOGGEDIN_']) && $data['_LOGGEDIN_'] === true) {
} elseif (isset($data['_LOGGEDIN_']) && $data['_LOGGEDIN_'] === true) {
$data[1] = 'loggedin';
} else {
$data[1] = $data[0];