summaryrefslogtreecommitdiffstats
path: root/lib/private/legacy
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-01-26 23:46:40 +0100
committerMorris Jobke <hey@morrisjobke.de>2018-01-26 23:46:40 +0100
commita661f043e1a8764cb7c795f50df77b830d3e352b (patch)
tree77a06311ffb5e59c86def06bbb618335da1f2b6a /lib/private/legacy
parent9be6050cc42c2760bd2276942a24ba3db288b551 (diff)
downloadnextcloud-server-a661f043e1a8764cb7c795f50df77b830d3e352b.tar.gz
nextcloud-server-a661f043e1a8764cb7c795f50df77b830d3e352b.zip
Remove unneeded semicolon and parentheses
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Diffstat (limited to 'lib/private/legacy')
-rw-r--r--lib/private/legacy/eventsource.php2
-rw-r--r--lib/private/legacy/helper.php2
-rw-r--r--lib/private/legacy/image.php6
-rw-r--r--lib/private/legacy/json.php2
-rw-r--r--lib/private/legacy/util.php2
5 files changed, 7 insertions, 7 deletions
diff --git a/lib/private/legacy/eventsource.php b/lib/private/legacy/eventsource.php
index 74beb157e18..1a8061c0ed2 100644
--- a/lib/private/legacy/eventsource.php
+++ b/lib/private/legacy/eventsource.php
@@ -81,7 +81,7 @@ class OC_EventSource implements \OCP\IEventSource {
header('Location: '.\OC::$WEBROOT);
exit();
}
- if (!(\OC::$server->getRequest()->passesCSRFCheck())) {
+ if (!\OC::$server->getRequest()->passesCSRFCheck()) {
$this->send('error', 'Possible CSRF attack. Connection will be closed.');
$this->close();
exit();
diff --git a/lib/private/legacy/helper.php b/lib/private/legacy/helper.php
index cd69b40b76b..8373c191dce 100644
--- a/lib/private/legacy/helper.php
+++ b/lib/private/legacy/helper.php
@@ -408,7 +408,7 @@ class OC_Helper {
$it = new RecursiveIteratorIterator($aIt);
while ($it->valid()) {
- if (((isset($index) AND ($it->key() == $index)) OR (!isset($index))) AND ($it->current() == $needle)) {
+ if (((isset($index) AND ($it->key() == $index)) OR !isset($index)) AND ($it->current() == $needle)) {
return $aIt->key();
}
diff --git a/lib/private/legacy/image.php b/lib/private/legacy/image.php
index eeee3b24073..d9af45f2226 100644
--- a/lib/private/legacy/image.php
+++ b/lib/private/legacy/image.php
@@ -785,12 +785,12 @@ class OC_Image implements \OCP\IImage {
break;
case 8:
$color = @unpack('n', $vide . ($data[$p] ?? ''));
- $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
+ $color[1] = isset($palette[$color[1] + 1]) ? $palette[$color[1] + 1] : $palette[1];
break;
case 4:
$color = @unpack('n', $vide . ($data[floor($p)] ?? ''));
$color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
- $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
+ $color[1] = isset($palette[$color[1] + 1]) ? $palette[$color[1] + 1] : $palette[1];
break;
case 1:
$color = @unpack('n', $vide . ($data[floor($p)] ?? ''));
@@ -820,7 +820,7 @@ class OC_Image implements \OCP\IImage {
$color[1] = ($color[1] & 0x1);
break;
}
- $color[1] = (isset($palette[$color[1] + 1])) ? $palette[$color[1] + 1] : $palette[1];
+ $color[1] = isset($palette[$color[1] + 1]) ? $palette[$color[1] + 1] : $palette[1];
break;
default:
fclose($fh);
diff --git a/lib/private/legacy/json.php b/lib/private/legacy/json.php
index 7bfc815ab24..0afa179b3d8 100644
--- a/lib/private/legacy/json.php
+++ b/lib/private/legacy/json.php
@@ -91,7 +91,7 @@ class OC_JSON{
exit();
}
- if( !(\OC::$server->getRequest()->passesCSRFCheck())) {
+ if( !\OC::$server->getRequest()->passesCSRFCheck()) {
$l = \OC::$server->getL10N('lib');
self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.'), 'error' => 'token_expired' )));
exit();
diff --git a/lib/private/legacy/util.php b/lib/private/legacy/util.php
index efa488b434d..7e083b2ba0e 100644
--- a/lib/private/legacy/util.php
+++ b/lib/private/legacy/util.php
@@ -894,7 +894,7 @@ class OC_Util {
}
foreach($invalidIniSettings as $setting) {
if(is_bool($setting[1])) {
- $setting[1] = ($setting[1]) ? 'on' : 'off';
+ $setting[1] = $setting[1] ? 'on' : 'off';
}
$errors[] = [
'error' => $l->t('PHP setting "%s" is not set to "%s".', [$setting[0], var_export($setting[1], true)]),