зеркало из https://github.com/nextcloud/server.git
Whitespace indent fixes
This commit is contained in:
Родитель
2679123846
Коммит
2d6d0a4ad4
11
lib/db.php
11
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) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -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`';
|
||||
}
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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'),
|
||||
|
|
Загрузка…
Ссылка в новой задаче