From 051635412d68af786026a386a0ebf494127247c7 Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sat, 10 Nov 2012 00:40:32 +0100 Subject: [PATCH 1/7] Fixed new checkstyle issues from build #1341. --- apps/files_external/lib/webdav.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php index ec942b11f6..25b328ea2d 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']; From 3cc6df489f8e58d59b906270d03a82e0ceb353cf Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sat, 10 Nov 2012 00:45:49 +0100 Subject: [PATCH 2/7] Fixed new checkstyle issues in swift.php from build #1341. --- apps/files_external/lib/swift.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php index 9c9754ac34..45542aacbd 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']; From 6e6df6e410316b4df61237c862000492139eee3e Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sat, 10 Nov 2012 00:46:50 +0100 Subject: [PATCH 3/7] Fixed new checkstyle issues in ftp.php from build #1341. --- apps/files_external/lib/ftp.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php index 650ca88fd9..5b90e3049b 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']; From 20541c610e2e73cb5535902146e8379aa3165144 Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sat, 10 Nov 2012 00:53:28 +0100 Subject: [PATCH 4/7] Fixed new checkstyle issues in migrate.php from build #1341. --- lib/migrate.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/migrate.php b/lib/migrate.php index ca74edcdc5..2cc0a3067b 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 ) ); } From f6daddadf5477a2676c00209e90b609b3d923425 Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sat, 10 Nov 2012 00:58:03 +0100 Subject: [PATCH 5/7] Fixed new checkstyle issues in util.php from build #1341. --- lib/util.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/util.php b/lib/util.php index 8574ec31d8..73b72bad1a 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{ From 1b7c0c2b6252b52663f8018a6e422afe29e3b2c5 Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sat, 10 Nov 2012 01:02:47 +0100 Subject: [PATCH 6/7] Fixed new checkstyle issues in ocs.php from build #1341. --- settings/ajax/apps/ocs.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php index ec2a395528..1ffba26ad1 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']; } From eff13a28c1d14afa652a4177baa2bd947fb3ffaf Mon Sep 17 00:00:00 2001 From: Diederik de Haas Date: Sat, 10 Nov 2012 01:03:54 +0100 Subject: [PATCH 7/7] Fixed new checkstyle issues in apps.php from build #1341. --- settings/apps.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/apps.php b/settings/apps.php index cdd62c56bc..99a3094399 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);