From 27ab0357ae00541bbcff52453c2d86e723a992e0 Mon Sep 17 00:00:00 2001
From: Felix Moeller <mail@felixmoeller.de>
Date: Sun, 4 Nov 2012 18:36:16 +0100
Subject: [PATCH] Checkstyle: Fix last six NewlineBeforeOpenBrace
---
lib/MDB2/Driver/sqlite3.php | 3 +--
lib/archive/tar.php | 3 +--
lib/base.php | 6 ++----
settings/ajax/changepassword.php | 3 +--
settings/templates/help.php | 3 +--
5 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index bccb8cbbf0..fa4c91c126 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -397,8 +397,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
}
if ($this->fix_assoc_fields_names ||
- $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES)
- {
+ $this->options['portability'] & MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES) {
$this->connection->exec("PRAGMA short_column_names = 1");
$this->fix_assoc_fields_names = true;
}
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 6c26468699..0fa633c603 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -130,8 +130,7 @@ class OC_Archive_TAR extends OC_Archive{
if( $file == $header['filename']
or $file.'/' == $header['filename']
or '/'.$file.'/' == $header['filename']
- or '/'.$file == $header['filename'])
- {
+ or '/'.$file == $header['filename']) {
return $header;
}
}
diff --git a/lib/base.php b/lib/base.php
index f494716bd8..084cca92e8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -524,8 +524,7 @@ class OC{
}
$file_ext = substr($param['file'], -3);
if ($file_ext != 'php'
- || !self::loadAppScriptFile($param))
- {
+ || !self::loadAppScriptFile($param)) {
header('HTTP/1.0 404 Not Found');
}
}
@@ -595,8 +594,7 @@ class OC{
if(!isset($_COOKIE["oc_remember_login"])
|| !isset($_COOKIE["oc_token"])
|| !isset($_COOKIE["oc_username"])
- || !$_COOKIE["oc_remember_login"])
- {
+ || !$_COOKIE["oc_remember_login"]) {
return false;
}
OC_App::loadApps(array('authentication'));
diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index a0fe5947b6..b2db261151 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -16,8 +16,7 @@ if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
$userstatus = 'subadmin';
}
if(OC_User::getUser() === $username) {
- if (OC_User::checkPassword($username, $oldPassword))
- {
+ if (OC_User::checkPassword($username, $oldPassword)) {
$userstatus = 'user';
} else {
if (!OC_Util::isUserVerified()) {
diff --git a/settings/templates/help.php b/settings/templates/help.php
index b2a78ff851..56d4385344 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -12,8 +12,7 @@
<?php
$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
$pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url);
- if($pageNavi)
- {
+ if($pageNavi) {
$pageNavi->printPage();
}
?>
--
GitLab