From 2d6d0a4ad438590504c13f04a6b2916a59a99c30 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 9 Feb 2013 22:44:11 +0100
Subject: [PATCH] Whitespace indent fixes
---
lib/db.php | 11 ++++++-----
lib/hook.php | 5 +++--
lib/migration/content.php | 14 +++++++-------
lib/public/share.php | 6 +++---
lib/request.php | 4 ++--
lib/user.php | 4 ++--
lib/util.php | 6 +++---
7 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/lib/db.php b/lib/db.php
index 51f7c7679d..8bb2930e03 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -228,11 +228,12 @@ class OC_DB {
// Prepare options array
$options = array(
- 'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE,
- 'log_line_break' => '<br>',
- 'idxname_format' => '%s',
- 'debug' => true,
- 'quote_identifier' => true );
+ 'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE,
+ 'log_line_break' => '<br>',
+ 'idxname_format' => '%s',
+ 'debug' => true,
+ 'quote_identifier' => true
+ );
// Add the dsn according to the database type
switch($type) {
diff --git a/lib/hook.php b/lib/hook.php
index e30aefb5e1..1f450e7dca 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -33,8 +33,9 @@ class OC_Hook{
// Connect the hook handler to the requested emitter
self::$registered[$signalclass][$signalname][] = array(
- "class" => $slotclass,
- "name" => $slotname );
+ "class" => $slotclass,
+ "name" => $slotname
+ );
// No chance for failure ;-)
return true;
diff --git a/lib/migration/content.php b/lib/migration/content.php
index e81c8f217f..d640bea4b9 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -185,13 +185,13 @@ class OC_Migration_Content{
* @return bool
*/
public function addDir( $dir, $recursive=true, $internaldir='' ) {
- $dirname = basename($dir);
- $this->zip->addEmptyDir($internaldir . $dirname);
- $internaldir.=$dirname.='/';
+ $dirname = basename($dir);
+ $this->zip->addEmptyDir($internaldir . $dirname);
+ $internaldir.=$dirname.='/';
if( !file_exists( $dir ) ) {
return false;
}
- if ($dirhandle = opendir($dir)) {
+ if ($dirhandle = opendir($dir)) {
while (false !== ( $file = readdir($dirhandle))) {
if (( $file != '.' ) && ( $file != '..' )) {
@@ -204,11 +204,11 @@ class OC_Migration_Content{
}
}
closedir($dirhandle);
- } else {
+ } else {
OC_Log::write('admin_export', "Was not able to open directory: " . $dir, OC_Log::ERROR);
return false;
- }
- return true;
+ }
+ return true;
}
/**
diff --git a/lib/public/share.php b/lib/public/share.php
index 6dc30f6ae4..cc2c45e3f3 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -702,9 +702,9 @@ class Share {
|| $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT
) {
$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, '
- .'`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
- .'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
- .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`';
+ .'`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
+ .'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
+ .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`';
} else {
$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`, `token`';
}
diff --git a/lib/request.php b/lib/request.php
index 3c668b02c5..3af9328967 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -114,8 +114,8 @@ class OC_Request {
switch($encoding) {
- case 'ISO-8859-1' :
- $path_info = utf8_encode($path_info);
+ case 'ISO-8859-1' :
+ $path_info = utf8_encode($path_info);
}
// end copy
diff --git a/lib/user.php b/lib/user.php
index 48f4e5c700..6c74bb73c8 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -542,8 +542,8 @@ class OC_User {
public static function userExists($uid, $excludingBackend=null) {
foreach(self::$_usedBackends as $backend) {
if (!is_null($excludingBackend) && !strcmp(get_class($backend), $excludingBackend)) {
- OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG);
- continue;
+ OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG);
+ continue;
}
$result=$backend->userExists($uid);
if($result===true) {
diff --git a/lib/util.php b/lib/util.php
index b9ac8ed75d..5c12e0b90f 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -528,9 +528,9 @@ class OC_Util {
*
*/
public static function isWebDAVWorking() {
- if (!function_exists('curl_init')) {
- return;
- }
+ if (!function_exists('curl_init')) {
+ return;
+ }
$settings = array(
'baseUri' => OC_Helper::linkToRemote('webdav'),
--
GitLab