Whitespace indent fixes

This commit is contained in:
Bart Visscher 2013-02-09 22:44:11 +01:00
parent 2679123846
commit 2d6d0a4ad4
7 changed files with 26 additions and 24 deletions

View File

@ -228,11 +228,12 @@ class OC_DB {
// Prepare options array // Prepare options array
$options = array( $options = array(
'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE, 'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE,
'log_line_break' => '<br>', 'log_line_break' => '<br>',
'idxname_format' => '%s', 'idxname_format' => '%s',
'debug' => true, 'debug' => true,
'quote_identifier' => true ); 'quote_identifier' => true
);
// Add the dsn according to the database type // Add the dsn according to the database type
switch($type) { switch($type) {

View File

@ -33,8 +33,9 @@ class OC_Hook{
// Connect the hook handler to the requested emitter // Connect the hook handler to the requested emitter
self::$registered[$signalclass][$signalname][] = array( self::$registered[$signalclass][$signalname][] = array(
"class" => $slotclass, "class" => $slotclass,
"name" => $slotname ); "name" => $slotname
);
// No chance for failure ;-) // No chance for failure ;-)
return true; return true;

View File

@ -185,13 +185,13 @@ class OC_Migration_Content{
* @return bool * @return bool
*/ */
public function addDir( $dir, $recursive=true, $internaldir='' ) { public function addDir( $dir, $recursive=true, $internaldir='' ) {
$dirname = basename($dir); $dirname = basename($dir);
$this->zip->addEmptyDir($internaldir . $dirname); $this->zip->addEmptyDir($internaldir . $dirname);
$internaldir.=$dirname.='/'; $internaldir.=$dirname.='/';
if( !file_exists( $dir ) ) { if( !file_exists( $dir ) ) {
return false; return false;
} }
if ($dirhandle = opendir($dir)) { if ($dirhandle = opendir($dir)) {
while (false !== ( $file = readdir($dirhandle))) { while (false !== ( $file = readdir($dirhandle))) {
if (( $file != '.' ) && ( $file != '..' )) { if (( $file != '.' ) && ( $file != '..' )) {
@ -204,11 +204,11 @@ class OC_Migration_Content{
} }
} }
closedir($dirhandle); closedir($dirhandle);
} else { } else {
OC_Log::write('admin_export', "Was not able to open directory: " . $dir, OC_Log::ERROR); OC_Log::write('admin_export', "Was not able to open directory: " . $dir, OC_Log::ERROR);
return false; return false;
} }
return true; return true;
} }
/** /**

View File

@ -702,9 +702,9 @@ class Share {
|| $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT
) { ) {
$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, ' $select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `uid_owner`, '
.'`share_type`, `share_with`, `file_source`, `path`, `file_target`, ' .'`share_type`, `share_with`, `file_source`, `path`, `file_target`, '
.'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, ' .'`permissions`, `expiration`, `storage`, `*PREFIX*filecache`.`parent` as `file_parent`, '
.'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`'; .'`name`, `mtime`, `mimetype`, `mimepart`, `size`, `encrypted`, `etag`';
} else { } 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`'; $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`';
} }

View File

@ -114,8 +114,8 @@ class OC_Request {
switch($encoding) { switch($encoding) {
case 'ISO-8859-1' : case 'ISO-8859-1' :
$path_info = utf8_encode($path_info); $path_info = utf8_encode($path_info);
} }
// end copy // end copy

View File

@ -542,8 +542,8 @@ class OC_User {
public static function userExists($uid, $excludingBackend=null) { public static function userExists($uid, $excludingBackend=null) {
foreach(self::$_usedBackends as $backend) { foreach(self::$_usedBackends as $backend) {
if (!is_null($excludingBackend) && !strcmp(get_class($backend), $excludingBackend)) { if (!is_null($excludingBackend) && !strcmp(get_class($backend), $excludingBackend)) {
OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG); OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG);
continue; continue;
} }
$result=$backend->userExists($uid); $result=$backend->userExists($uid);
if($result===true) { if($result===true) {

View File

@ -528,9 +528,9 @@ class OC_Util {
* *
*/ */
public static function isWebDAVWorking() { public static function isWebDAVWorking() {
if (!function_exists('curl_init')) { if (!function_exists('curl_init')) {
return; return;
} }
$settings = array( $settings = array(
'baseUri' => OC_Helper::linkToRemote('webdav'), 'baseUri' => OC_Helper::linkToRemote('webdav'),