Merge pull request #346 from diederikdehaas/patch-checkstyle-build1341

Patch checkstyle issues from jenkins build1341

7 files changed, 12 insertions, 12 deletions

diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 650ca88fd93..5b90e3049b7 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -19,8 +19,8 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->password=$params['password'];
-		if(isset($params['secure'])){
-			if(is_string($params['secure'])){
+		if(isset($params['secure'])) {
+			if(is_string($params['secure'])) {
 				$this->secure = ($params['secure'] === 'true');
 			}else{
 				$this->secure = (bool)$params['secure'];
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 9c9754ac346..45542aacbd3 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -271,8 +271,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(isset($params['secure'])){
-			if(is_string($params['secure'])){
+		if(isset($params['secure'])) {
+			if(is_string($params['secure'])) {
 				$this->secure = ($params['secure'] === 'true');
 			}else{
 				$this->secure = (bool)$params['secure'];
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index ec942b11f6a..25b328ea2d0 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -27,8 +27,8 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$this->host=$host;
 		$this->user=$params['user'];
 		$this->password=$params['password'];
-		if(isset($params['secure'])){
-			if(is_string($params['secure'])){
+		if(isset($params['secure'])) {
+			if(is_string($params['secure'])) {
 				$this->secure = ($params['secure'] === 'true');
 			}else{
 				$this->secure = (bool)$params['secure'];
diff --git a/lib/migrate.php b/lib/migrate.php
index ca74edcdc57..2cc0a3067b8 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -238,13 +238,13 @@ class OC_Migrate{
 				$userfolder = $extractpath . $json->exporteduser;
 				$newuserfolder = $datadir . '/' . self::$uid;
 				foreach(scandir($userfolder) as $file){
-					if($file !== '.' && $file !== '..' && is_dir($file)){
+					if($file !== '.' && $file !== '..' && is_dir($file)) {
 						// Then copy the folder over
 						OC_Helper::copyr($userfolder.'/'.$file, $newuserfolder.'/'.$file);
 					}
 				}
 				// Import user app data
-				if(file_exists($extractpath . $json->exporteduser . '/migration.db')){
+				if(file_exists($extractpath . $json->exporteduser . '/migration.db')) {
 					if( !$appsimported = self::importAppData( $extractpath . $json->exporteduser . '/migration.db', $json, self::$uid ) ) {
 						return json_encode( array( 'success' => false ) );
 					}
diff --git a/lib/util.php b/lib/util.php
index 8574ec31d83..73b72bad1a5 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -592,14 +592,14 @@ class OC_Util {
 
 		// try to connect to owncloud.org to see if http connections to the internet are possible.
 		$connected = @fsockopen("www.owncloud.org", 80); 
-		if ($connected){
+		if ($connected) {
 			fclose($connected);
 			return true; 
 		}else{
 
 			// second try in case one server is down
 			$connected = @fsockopen("apps.owncloud.com", 80); 
-			if ($connected){
+			if ($connected) {
 				fclose($connected);
 				return true; 
 			}else{
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index ec2a3955281..1ffba26ad1d 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -40,7 +40,7 @@ if(is_array($catagoryNames)) {
 
 		if(!$local) {
 			if($app['preview']=='') {
-				$pre=OC_Helper::imagePath('settings','trans.png');
+				$pre=OC_Helper::imagePath('settings', 'trans.png');
 			} else {
 				$pre=$app['preview'];
 			}
diff --git a/settings/apps.php b/settings/apps.php
index cdd62c56bc6..99a3094399d 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -77,7 +77,7 @@ foreach ( $installedApps as $app ) {
 		
 		}
 		
-		$info['preview'] = OC_Helper::imagePath('settings','trans.png');
+		$info['preview'] = OC_Helper::imagePath('settings', 'trans.png');
 		
 		$info['version'] = OC_App::getAppVersion($app);