From ddfcc96ab5e72e90bcb0858ac92e617e6d70a993 Mon Sep 17 00:00:00 2001 From: Felix Moeller Date: Tue, 23 Oct 2012 08:20:17 +0200 Subject: [PATCH 1/3] Checkstyle: LowerCaseConstant --- index.php | 2 +- lib/ocsclient.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/index.php b/index.php index 12b2d8f406d..bf0b287a64b 100755 --- a/index.php +++ b/index.php @@ -21,7 +21,7 @@ * */ -$RUNTIME_NOAPPS = TRUE; //no apps, yet +$RUNTIME_NOAPPS = true; //no apps, yet require_once 'lib/base.php'; diff --git a/lib/ocsclient.php b/lib/ocsclient.php index 4d4937377b3..32c2cfe6e48 100644 --- a/lib/ocsclient.php +++ b/lib/ocsclient.php @@ -80,7 +80,7 @@ class OC_OCSClient{ } $url=OC_OCSClient::getAppStoreURL().'/content/categories'; $xml=OC_OCSClient::getOCSresponse($url); - if($xml==FALSE) { + if($xml==false) { return null; } $data=simplexml_load_string($xml); @@ -122,8 +122,8 @@ class OC_OCSClient{ $apps=array(); $xml=OC_OCSClient::getOCSresponse($url); - if($xml==FALSE) { - return NULL; + if($xml==false) { + return null; } $data=simplexml_load_string($xml); From ff5f9370c4a004f48cc036eb437a58cefb29962d Mon Sep 17 00:00:00 2001 From: Felix Moeller Date: Tue, 23 Oct 2012 08:25:30 +0200 Subject: [PATCH 2/3] Checkstyle: MultiLineCondition --- lib/app.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/app.php b/lib/app.php index cb68ea3ddde..2319c50950e 100755 --- a/lib/app.php +++ b/lib/app.php @@ -556,10 +556,7 @@ class OC_App{ while( $file = readdir( $dh ) ) { - if ( - $file[0] != '.' - and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php' ) - ) { + if ($file[0] != '.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) { $apps[] = $file; From 36d0d7590134f5587ab09c67927c3187e8b5c790 Mon Sep 17 00:00:00 2001 From: Felix Moeller Date: Tue, 23 Oct 2012 08:35:54 +0200 Subject: [PATCH 3/3] Codestyle: FunctionCallArgumentSpacing --- apps/files/index.php | 2 +- apps/files_sharing/templates/public.php | 2 +- apps/user_webdavauth/user_webdavauth.php | 2 +- lib/app.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/files/index.php b/apps/files/index.php index 493087d26f1..4d169757cc7 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -87,7 +87,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size); $freeSpace=OC_Filesystem::free_space('/'); $freeSpace=max($freeSpace,0); -$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace); +$maxUploadFilesize = min($maxUploadFilesize, $freeSpace); $permissions = OCP\Share::PERMISSION_READ; if (OC_Filesystem::isUpdatable($dir.'/')) { diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index ef81e296d82..35cca7c42dc 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -19,7 +19,7 @@ - +
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php index c36d37c1fa2..bd9f45d357b 100755 --- a/apps/user_webdavauth/user_webdavauth.php +++ b/apps/user_webdavauth/user_webdavauth.php @@ -51,7 +51,7 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend { $url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url; $headers = get_headers($url); if($headers==false) { - OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ' ,3); + OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ', 3); return false; } diff --git a/lib/app.php b/lib/app.php index 2319c50950e..28757735e04 100755 --- a/lib/app.php +++ b/lib/app.php @@ -549,7 +549,7 @@ class OC_App{ foreach ( OC::$APPSROOTS as $apps_dir ) { if(! is_readable($apps_dir['path'])) { - OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'] , OC_Log::WARN); + OC_Log::write('core', 'unable to read app folder : ' .$apps_dir['path'], OC_Log::WARN); continue; } $dh = opendir( $apps_dir['path'] );