Checkstyle: Fix last six NewlineBeforeOpenBrace

diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index bccb8cbbf0116c93140e058b1c3bca325d5db9d8..fa4c91c126993d152b1f7b0d057dd21b12a3decc 100644 (file)
--- 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 6c26468699118581ee8663fbcb8eec161288caf0..0fa633c60388af750bfa5489f8d7d6d108614553 100644 (file)
--- 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 f494716bd878ea314d3e38d0f05bb8c351dea844..084cca92e8da1f469db1f90efca939e8d664bb41 100644 (file)
--- 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 a0fe5947b6de51aac41e846b20a2434702acfce1..b2db2611518182df78ef760b1350561ff5e9530b 100644 (file)
--- 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 b2a78ff851203c254e6eafda799fdd9c45053ff9..56d43853444072f77f028ac5177a6953d6eee4a5 100644 (file)
--- 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();
                }
        ?>