nextcloud / server

settings/personal.php

Braces +2 added lines, -2 removed lines

@@ -85,9 +85,9 @@
 	$potentialName = (string) $l->t('__language_name__');
 	if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
 		$ln=array('code'=>$lang, 'name'=> $potentialName);
-	}elseif(isset($languageNames[$lang])) {
+	} elseif(isset($languageNames[$lang])) {
 		$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
-	}else{//fallback to language code
+	} else{//fallback to language code
 		$ln=array('code'=>$lang, 'name'=>$lang);
 	}
 

Indentation +66 added lines, -66 removed lines

@@ -51,8 +51,8 @@ 
 \OC_Util::addScript('files', 'jquery.iframe-transport');
 \OC_Util::addScript('files', 'jquery.fileupload');
 if ($config->getSystemValue('enable_avatars', true) === true) {
-	\OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
-	\OC_Util::addVendorStyle('jcrop/css/jquery.Jcrop');
+    \OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
+    \OC_Util::addVendorStyle('jcrop/css/jquery.Jcrop');
 }
 
 // Highlight navigation entry
@@ -68,73 +68,73 @@ 
 
 // array of common languages
 $commonLangCodes = array(
-	'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
+    'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
 );
 
 $languageNames=include 'languageCodes.php';
 $languages=array();
 $commonLanguages = array();
 foreach($languageCodes as $lang) {
-	$l = \OC::$server->getL10N('settings', $lang);
-	// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
-	$potentialName = (string) $l->t('__language_name__');
-	if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
-		$ln=array('code'=>$lang, 'name'=> $potentialName);
-	}elseif(isset($languageNames[$lang])) {
-		$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
-	}else{//fallback to language code
-		$ln=array('code'=>$lang, 'name'=>$lang);
-	}
-
-	// put appropriate languages into appropriate arrays, to print them sorted
-	// used language -> common languages -> divider -> other languages
-	if ($lang === $userLang) {
-		$userLang = $ln;
-	} elseif (in_array($lang, $commonLangCodes)) {
-		$commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
-	} else {
-		$languages[]=$ln;
-	}
+    $l = \OC::$server->getL10N('settings', $lang);
+    // TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
+    $potentialName = (string) $l->t('__language_name__');
+    if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+        $ln=array('code'=>$lang, 'name'=> $potentialName);
+    }elseif(isset($languageNames[$lang])) {
+        $ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
+    }else{//fallback to language code
+        $ln=array('code'=>$lang, 'name'=>$lang);
+    }
+
+    // put appropriate languages into appropriate arrays, to print them sorted
+    // used language -> common languages -> divider -> other languages
+    if ($lang === $userLang) {
+        $userLang = $ln;
+    } elseif (in_array($lang, $commonLangCodes)) {
+        $commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
+    } else {
+        $languages[]=$ln;
+    }
 }
 
 // if user language is not available but set somehow: show the actual code as name
 if (!is_array($userLang)) {
-	$userLang = [
-		'code' => $userLang,
-		'name' => $userLang,
-	];
+    $userLang = [
+        'code' => $userLang,
+        'name' => $userLang,
+    ];
 }
 
 ksort($commonLanguages);
 
 // sort now by displayed language not the iso-code
 usort( $languages, function ($a, $b) {
-	if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
-		// If a doesn't have a name, but b does, list b before a
-		return 1;
-	}
-	if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
-		// If a does have a name, but b doesn't, list a before b
-		return -1;
-	}
-	// Otherwise compare the names
-	return strcmp($a['name'], $b['name']);
+    if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
+        // If a doesn't have a name, but b does, list b before a
+        return 1;
+    }
+    if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
+        // If a does have a name, but b doesn't, list a before b
+        return -1;
+    }
+    // Otherwise compare the names
+    return strcmp($a['name'], $b['name']);
 });
 
 //links to clients
 $clients = array(
-	'desktop' => $config->getSystemValue('customclient_desktop', $defaults->getSyncClientUrl()),
-	'android' => $config->getSystemValue('customclient_android', $defaults->getAndroidClientUrl()),
-	'ios'     => $config->getSystemValue('customclient_ios', $defaults->getiOSClientUrl())
+    'desktop' => $config->getSystemValue('customclient_desktop', $defaults->getSyncClientUrl()),
+    'android' => $config->getSystemValue('customclient_android', $defaults->getAndroidClientUrl()),
+    'ios'     => $config->getSystemValue('customclient_ios', $defaults->getiOSClientUrl())
 );
 
 // only show root certificate import if external storages are enabled
 $enableCertImport = false;
 $externalStorageEnabled = \OC::$server->getAppManager()->isEnabledForUser('files_external');
 if ($externalStorageEnabled) {
-	/** @var \OCA\Files_External\Service\BackendService $backendService */
-	$backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
-	$enableCertImport = $backendService->isUserMountingAllowed();
+    /** @var \OCA\Files_External\Service\BackendService $backendService */
+    $backendService = \OC_Mount_Config::$app->getContainer()->query('\OCA\Files_External\Service\BackendService');
+    $enableCertImport = $backendService->isUserMountingAllowed();
 }
 
 
@@ -143,9 +143,9 @@ 
 $tmpl = new OC_Template( 'settings', 'personal', 'user');
 $tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
 if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-	$totalSpace = $l->t('Unlimited');
+    $totalSpace = $l->t('Unlimited');
 } else {
-	$totalSpace = OC_Helper::humanFileSize($storageInfo['total']);
+    $totalSpace = OC_Helper::humanFileSize($storageInfo['total']);
 }
 $tmpl->assign('total_space', $totalSpace);
 $tmpl->assign('usage_relative', $storageInfo['relative']);
@@ -179,30 +179,30 @@ 
 
 // add bottom hardcoded forms from the template
 if ($enableCertImport) {
-	$certificatesTemplate = new OC_Template('settings', 'certificates');
-	$certificatesTemplate->assign('type', 'personal');
-	$certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addPersonalRootCertificate');
-	$certificatesTemplate->assign('certs', $certificateManager->listCertificates());
-	$certificatesTemplate->assign('urlGenerator', $urlGenerator);
-	$forms[] = $certificatesTemplate->fetchPage();
+    $certificatesTemplate = new OC_Template('settings', 'certificates');
+    $certificatesTemplate->assign('type', 'personal');
+    $certificatesTemplate->assign('uploadRoute', 'settings.Certificate.addPersonalRootCertificate');
+    $certificatesTemplate->assign('certs', $certificateManager->listCertificates());
+    $certificatesTemplate->assign('urlGenerator', $urlGenerator);
+    $forms[] = $certificatesTemplate->fetchPage();
 }
 
 $formsMap = array_map(function($form){
-	if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
-		$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
-		$sectionName = str_replace('</h2>', '', $sectionName);
-		$anchor = strtolower($sectionName);
-		$anchor = str_replace(' ', '-', $anchor);
-
-		return array(
-			'anchor' => $anchor,
-			'section-name' => $sectionName,
-			'form' => $form
-		);
-	}
-	return array(
-		'form' => $form
-	);
+    if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
+        $sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
+        $sectionName = str_replace('</h2>', '', $sectionName);
+        $anchor = strtolower($sectionName);
+        $anchor = str_replace(' ', '-', $anchor);
+
+        return array(
+            'anchor' => $anchor,
+            'section-name' => $sectionName,
+            'form' => $form
+        );
+    }
+    return array(
+        'form' => $form
+    );
 }, $forms);
 
 $formsAndMore = array_merge($formsAndMore, $formsMap);

Spacing +21 added lines, -21 removed lines

@@ -43,9 +43,9 @@ 
 $urlGenerator = \OC::$server->getURLGenerator();
 
 // Highlight navigation entry
-OC_Util::addScript( 'settings', 'personal' );
+OC_Util::addScript('settings', 'personal');
 OC_Util::addScript('settings', 'certificates');
-OC_Util::addStyle( 'settings', 'settings' );
+OC_Util::addStyle('settings', 'settings');
 \OC_Util::addVendorScript('strengthify/jquery.strengthify');
 \OC_Util::addVendorStyle('strengthify/strengthify');
 \OC_Util::addScript('files', 'jquery.iframe-transport');
@@ -58,12 +58,12 @@ 
 // Highlight navigation entry
 OC::$server->getNavigationManager()->setActiveEntry('personal');
 
-$storageInfo=OC_Helper::getStorageInfo('/');
+$storageInfo = OC_Helper::getStorageInfo('/');
 
 $user = OC::$server->getUserManager()->get(OC_User::getUser());
 $email = $user->getEMailAddress();
 
-$userLang=$config->getUserValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
+$userLang = $config->getUserValue(OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage());
 $languageCodes = \OC::$server->getL10NFactory()->findAvailableLanguages();
 
 // array of common languages
@@ -71,19 +71,19 @@ 
 	'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it', 'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
 );
 
-$languageNames=include 'languageCodes.php';
-$languages=array();
+$languageNames = include 'languageCodes.php';
+$languages = array();
 $commonLanguages = array();
-foreach($languageCodes as $lang) {
+foreach ($languageCodes as $lang) {
 	$l = \OC::$server->getL10N('settings', $lang);
 	// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
 	$potentialName = (string) $l->t('__language_name__');
-	if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
-		$ln=array('code'=>$lang, 'name'=> $potentialName);
-	}elseif(isset($languageNames[$lang])) {
-		$ln=array('code'=>$lang, 'name'=>$languageNames[$lang]);
-	}else{//fallback to language code
-		$ln=array('code'=>$lang, 'name'=>$lang);
+	if ($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+		$ln = array('code'=>$lang, 'name'=> $potentialName);
+	}elseif (isset($languageNames[$lang])) {
+		$ln = array('code'=>$lang, 'name'=>$languageNames[$lang]);
+	} else {//fallback to language code
+		$ln = array('code'=>$lang, 'name'=>$lang);
 	}
 
 	// put appropriate languages into appropriate arrays, to print them sorted
@@ -91,9 +91,9 @@ 
 	if ($lang === $userLang) {
 		$userLang = $ln;
 	} elseif (in_array($lang, $commonLangCodes)) {
-		$commonLanguages[array_search($lang, $commonLangCodes)]=$ln;
+		$commonLanguages[array_search($lang, $commonLangCodes)] = $ln;
 	} else {
-		$languages[]=$ln;
+		$languages[] = $ln;
 	}
 }
 
@@ -108,7 +108,7 @@ 
 ksort($commonLanguages);
 
 // sort now by displayed language not the iso-code
-usort( $languages, function ($a, $b) {
+usort($languages, function($a, $b) {
 	if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
 		// If a doesn't have a name, but b does, list b before a
 		return 1;
@@ -140,7 +140,7 @@ 
 
 // Return template
 $l = \OC::$server->getL10N('settings');
-$tmpl = new OC_Template( 'settings', 'personal', 'user');
+$tmpl = new OC_Template('settings', 'personal', 'user');
 $tmpl->assign('usage', OC_Helper::humanFileSize($storageInfo['used']));
 if ($storageInfo['quota'] === \OCP\Files\FileInfo::SPACE_UNLIMITED) {
 	$totalSpace = $l->t('Unlimited');
@@ -171,10 +171,10 @@ 
 
 // add hardcoded forms from the template
 $formsAndMore = [];
-$formsAndMore[]= ['anchor' => 'avatar', 'section-name' => $l->t('Personal info')];
-$formsAndMore[]= ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];
+$formsAndMore[] = ['anchor' => 'avatar', 'section-name' => $l->t('Personal info')];
+$formsAndMore[] = ['anchor' => 'clientsbox', 'section-name' => $l->t('Sync clients')];
 
-$forms=OC_App::getForms('personal');
+$forms = OC_App::getForms('personal');
 
 
 // add bottom hardcoded forms from the template
@@ -187,7 +187,7 @@ 
 	$forms[] = $certificatesTemplate->fetchPage();
 }
 
-$formsMap = array_map(function($form){
+$formsMap = array_map(function($form) {
 	if (preg_match('%(<h2(?P<class>[^>]*)>.*?</h2>)%i', $form, $regs)) {
 		$sectionName = str_replace('<h2'.$regs['class'].'>', '', $regs[0]);
 		$sectionName = str_replace('</h2>', '', $sectionName);

status.php

Indentation +19 added lines, -19 removed lines

@@ -29,27 +29,27 @@
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+    require_once __DIR__ . '/lib/base.php';
 
-	$systemConfig = \OC::$server->getSystemConfig();
+    $systemConfig = \OC::$server->getSystemConfig();
 
-	$installed = (bool) $systemConfig->getValue('installed', false);
-	$maintenance = (bool) $systemConfig->getValue('maintenance', false);
-	$values=array(
-		'installed'=>$installed,
-		'maintenance' => $maintenance,
-		'version'=>implode('.', \OCP\Util::getVersion()),
-		'versionstring'=>OC_Util::getVersionString(),
-		'edition'=> $installed ? OC_Util::getEditionString() : '');
-	if (OC::$CLI) {
-		print_r($values);
-	} else {
-		header('Access-Control-Allow-Origin: *');
-		header('Content-Type: application/json');
-		echo json_encode($values);
-	}
+    $installed = (bool) $systemConfig->getValue('installed', false);
+    $maintenance = (bool) $systemConfig->getValue('maintenance', false);
+    $values=array(
+        'installed'=>$installed,
+        'maintenance' => $maintenance,
+        'version'=>implode('.', \OCP\Util::getVersion()),
+        'versionstring'=>OC_Util::getVersionString(),
+        'edition'=> $installed ? OC_Util::getEditionString() : '');
+    if (OC::$CLI) {
+        print_r($values);
+    } else {
+        header('Access-Control-Allow-Origin: *');
+        header('Content-Type: application/json');
+        echo json_encode($values);
+    }
 
 } catch (Exception $ex) {
-	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
+    OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+    \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
 }

Spacing +2 added lines, -2 removed lines

@@ -29,13 +29,13 @@
 
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	$systemConfig = \OC::$server->getSystemConfig();
 
 	$installed = (bool) $systemConfig->getValue('installed', false);
 	$maintenance = (bool) $systemConfig->getValue('maintenance', false);
-	$values=array(
+	$values = array(
 		'installed'=>$installed,
 		'maintenance' => $maintenance,
 		'version'=>implode('.', \OCP\Util::getVersion()),

public.php

Indentation +47 added lines, -47 removed lines

@@ -27,61 +27,61 @@
  */
 try {
 
-	require_once __DIR__ . '/lib/base.php';
-	if (\OCP\Util::needUpgrade()) {
-		// since the behavior of apps or remotes are unpredictable during
-		// an upgrade, return a 503 directly
-		OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-		OC_Template::printErrorPage('Service unavailable');
-		exit;
-	}
+    require_once __DIR__ . '/lib/base.php';
+    if (\OCP\Util::needUpgrade()) {
+        // since the behavior of apps or remotes are unpredictable during
+        // an upgrade, return a 503 directly
+        OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+        OC_Template::printErrorPage('Service unavailable');
+        exit;
+    }
 
-	OC::checkMaintenanceMode();
-	OC::checkSingleUserMode(true);
-	$request = \OC::$server->getRequest();
-	$pathInfo = $request->getPathInfo();
+    OC::checkMaintenanceMode();
+    OC::checkSingleUserMode(true);
+    $request = \OC::$server->getRequest();
+    $pathInfo = $request->getPathInfo();
 
-	if (!$pathInfo && $request->getParam('service', '') === '') {
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	} elseif ($request->getParam('service', '')) {
-		$service = $request->getParam('service', '');
-	} else {
-		$pathInfo = trim($pathInfo, '/');
-		list($service) = explode('/', $pathInfo);
-	}
-	$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($service));
-	if (is_null($file)) {
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
+    if (!$pathInfo && $request->getParam('service', '') === '') {
+        header('HTTP/1.0 404 Not Found');
+        exit;
+    } elseif ($request->getParam('service', '')) {
+        $service = $request->getParam('service', '');
+    } else {
+        $pathInfo = trim($pathInfo, '/');
+        list($service) = explode('/', $pathInfo);
+    }
+    $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($service));
+    if (is_null($file)) {
+        header('HTTP/1.0 404 Not Found');
+        exit;
+    }
 
-	$parts = explode('/', $file, 2);
-	$app = $parts[0];
+    $parts = explode('/', $file, 2);
+    $app = $parts[0];
 
-	// Load all required applications
-	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(array('authentication'));
-	OC_App::loadApps(array('filesystem', 'logging'));
+    // Load all required applications
+    \OC::$REQUESTEDAPP = $app;
+    OC_App::loadApps(array('authentication'));
+    OC_App::loadApps(array('filesystem', 'logging'));
 
-	if (!\OC::$server->getAppManager()->isInstalled($app)) {
-		throw new Exception('App not installed: ' . $app);
-	}
-	OC_App::loadApp($app);
-	OC_User::setIncognitoMode(true);
+    if (!\OC::$server->getAppManager()->isInstalled($app)) {
+        throw new Exception('App not installed: ' . $app);
+    }
+    OC_App::loadApp($app);
+    OC_User::setIncognitoMode(true);
 
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+    $baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
 
-	require_once OC_App::getAppPath($app) . '/' . $parts[1];
+    require_once OC_App::getAppPath($app) . '/' . $parts[1];
 
 } catch (\OC\ServiceUnavailableException $ex) {
-	//show the user a detailed error page
-	OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
-	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
-	OC_Template::printExceptionErrorPage($ex);
+    //show the user a detailed error page
+    OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+    \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
+    OC_Template::printExceptionErrorPage($ex);
 } catch (Exception $ex) {
-	//show the user a detailed error page
-	OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
-	\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
-	OC_Template::printExceptionErrorPage($ex);
+    //show the user a detailed error page
+    OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
+    \OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
+    OC_Template::printExceptionErrorPage($ex);
 }

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
  */
 try {
 
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 	if (\OCP\Util::needUpgrade()) {
 		// since the behavior of apps or remotes are unpredictable during
 		// an upgrade, return a 503 directly
@@ -50,7 +50,7 @@ 
 		$pathInfo = trim($pathInfo, '/');
 		list($service) = explode('/', $pathInfo);
 	}
-	$file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($service));
+	$file = OCP\CONFIG::getAppValue('core', 'public_'.strip_tags($service));
 	if (is_null($file)) {
 		header('HTTP/1.0 404 Not Found');
 		exit;
@@ -65,14 +65,14 @@ 
 	OC_App::loadApps(array('filesystem', 'logging'));
 
 	if (!\OC::$server->getAppManager()->isInstalled($app)) {
-		throw new Exception('App not installed: ' . $app);
+		throw new Exception('App not installed: '.$app);
 	}
 	OC_App::loadApp($app);
 	OC_User::setIncognitoMode(true);
 
-	$baseuri = OC::$WEBROOT . '/public.php/' . $service . '/';
+	$baseuri = OC::$WEBROOT.'/public.php/'.$service.'/';
 
-	require_once OC_App::getAppPath($app) . '/' . $parts[1];
+	require_once OC_App::getAppPath($app).'/'.$parts[1];
 
 } catch (\OC\ServiceUnavailableException $ex) {
 	//show the user a detailed error page

remote.php

Indentation +82 added lines, -82 removed lines

@@ -44,100 +44,100 @@
  * @param Exception $e
  */
 function handleException(Exception $e) {
-	$request = \OC::$server->getRequest();
-	// in case the request content type is text/xml - we assume it's a WebDAV request
-	$isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
-	if ($isXmlContentType === 0) {
-		// fire up a simple server to properly process the exception
-		$server = new Server();
-		if (!($e instanceof RemoteException)) {
-			// we shall not log on RemoteException
-			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
-		}
-		$server->on('beforeMethod', function () use ($e) {
-			if ($e instanceof RemoteException) {
-				switch ($e->getCode()) {
-					case OC_Response::STATUS_SERVICE_UNAVAILABLE:
-						throw new ServiceUnavailable($e->getMessage());
-					case OC_Response::STATUS_NOT_FOUND:
-						throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
-				}
-			}
-			$class = get_class($e);
-			$msg = $e->getMessage();
-			throw new ServiceUnavailable("$class: $msg");
-		});
-		$server->exec();
-	} else {
-		$statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
-			$statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
-		}
-		if ($e instanceof RemoteException) {
-			// we shall not log on RemoteException
-			OC_Response::setStatus($e->getCode());
-			OC_Template::printErrorPage($e->getMessage());
-		} else {
-			\OCP\Util::writeLog('remote', $e->getMessage(), \OCP\Util::FATAL);
-			OC_Response::setStatus($statusCode);
-			OC_Template::printExceptionErrorPage($e);
-		}
-	}
+    $request = \OC::$server->getRequest();
+    // in case the request content type is text/xml - we assume it's a WebDAV request
+    $isXmlContentType = strpos($request->getHeader('Content-Type'), 'text/xml');
+    if ($isXmlContentType === 0) {
+        // fire up a simple server to properly process the exception
+        $server = new Server();
+        if (!($e instanceof RemoteException)) {
+            // we shall not log on RemoteException
+            $server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
+        }
+        $server->on('beforeMethod', function () use ($e) {
+            if ($e instanceof RemoteException) {
+                switch ($e->getCode()) {
+                    case OC_Response::STATUS_SERVICE_UNAVAILABLE:
+                        throw new ServiceUnavailable($e->getMessage());
+                    case OC_Response::STATUS_NOT_FOUND:
+                        throw new \Sabre\DAV\Exception\NotFound($e->getMessage());
+                }
+            }
+            $class = get_class($e);
+            $msg = $e->getMessage();
+            throw new ServiceUnavailable("$class: $msg");
+        });
+        $server->exec();
+    } else {
+        $statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
+        if ($e instanceof \OC\ServiceUnavailableException ) {
+            $statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
+        }
+        if ($e instanceof RemoteException) {
+            // we shall not log on RemoteException
+            OC_Response::setStatus($e->getCode());
+            OC_Template::printErrorPage($e->getMessage());
+        } else {
+            \OCP\Util::writeLog('remote', $e->getMessage(), \OCP\Util::FATAL);
+            OC_Response::setStatus($statusCode);
+            OC_Template::printExceptionErrorPage($e);
+        }
+    }
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+    require_once __DIR__ . '/lib/base.php';
 
-	if (\OCP\Util::needUpgrade()) {
-		// since the behavior of apps or remotes are unpredictable during
-		// an upgrade, return a 503 directly
-		throw new RemoteException('Service unavailable', OC_Response::STATUS_SERVICE_UNAVAILABLE);
-	}
+    if (\OCP\Util::needUpgrade()) {
+        // since the behavior of apps or remotes are unpredictable during
+        // an upgrade, return a 503 directly
+        throw new RemoteException('Service unavailable', OC_Response::STATUS_SERVICE_UNAVAILABLE);
+    }
 
-	$request = \OC::$server->getRequest();
-	$pathInfo = $request->getPathInfo();
-	if ($pathInfo === false || $pathInfo === '') {
-		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
-	}
-	if (!$pos = strpos($pathInfo, '/', 1)) {
-		$pos = strlen($pathInfo);
-	}
-	$service=substr($pathInfo, 1, $pos-1);
+    $request = \OC::$server->getRequest();
+    $pathInfo = $request->getPathInfo();
+    if ($pathInfo === false || $pathInfo === '') {
+        throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+    }
+    if (!$pos = strpos($pathInfo, '/', 1)) {
+        $pos = strlen($pathInfo);
+    }
+    $service=substr($pathInfo, 1, $pos-1);
 
-	$file = \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+    $file = \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
 
-	if(is_null($file)) {
-		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
-	}
+    if(is_null($file)) {
+        throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
+    }
 
-	// force language as given in the http request
-	\OC::$server->getL10NFactory()->setLanguageFromRequest();
+    // force language as given in the http request
+    \OC::$server->getL10NFactory()->setLanguageFromRequest();
 
-	$file=ltrim($file, '/');
+    $file=ltrim($file, '/');
 
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+    $parts=explode('/', $file, 2);
+    $app=$parts[0];
 
-	// Load all required applications
-	\OC::$REQUESTEDAPP = $app;
-	OC_App::loadApps(array('authentication'));
-	OC_App::loadApps(array('filesystem', 'logging'));
+    // Load all required applications
+    \OC::$REQUESTEDAPP = $app;
+    OC_App::loadApps(array('authentication'));
+    OC_App::loadApps(array('filesystem', 'logging'));
 
-	switch ($app) {
-		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
-			break;
-		default:
-			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
-			}
-			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
-			break;
-	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-	require_once $file;
+    switch ($app) {
+        case 'core':
+            $file =  OC::$SERVERROOT .'/'. $file;
+            break;
+        default:
+            if (!\OC::$server->getAppManager()->isInstalled($app)) {
+                throw new RemoteException('App not installed: ' . $app);
+            }
+            OC_App::loadApp($app);
+            $file = OC_App::getAppPath($app) .'/'. $parts[1];
+            break;
+    }
+    $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+    require_once $file;
 
 } catch (Exception $ex) {
-	handleException($ex);
+    handleException($ex);
 }

Spacing +13 added lines, -13 removed lines

@@ -54,7 +54,7 @@ 
 			// we shall not log on RemoteException
 			$server->addPlugin(new ExceptionLoggerPlugin('webdav', \OC::$server->getLogger()));
 		}
-		$server->on('beforeMethod', function () use ($e) {
+		$server->on('beforeMethod', function() use ($e) {
 			if ($e instanceof RemoteException) {
 				switch ($e->getCode()) {
 					case OC_Response::STATUS_SERVICE_UNAVAILABLE:
@@ -70,7 +70,7 @@ 
 		$server->exec();
 	} else {
 		$statusCode = OC_Response::STATUS_INTERNAL_SERVER_ERROR;
-		if ($e instanceof \OC\ServiceUnavailableException ) {
+		if ($e instanceof \OC\ServiceUnavailableException) {
 			$statusCode = OC_Response::STATUS_SERVICE_UNAVAILABLE;
 		}
 		if ($e instanceof RemoteException) {
@@ -86,7 +86,7 @@ 
 }
 
 try {
-	require_once __DIR__ . '/lib/base.php';
+	require_once __DIR__.'/lib/base.php';
 
 	if (\OCP\Util::needUpgrade()) {
 		// since the behavior of apps or remotes are unpredictable during
@@ -102,21 +102,21 @@ 
 	if (!$pos = strpos($pathInfo, '/', 1)) {
 		$pos = strlen($pathInfo);
 	}
-	$service=substr($pathInfo, 1, $pos-1);
+	$service = substr($pathInfo, 1, $pos - 1);
 
-	$file = \OC::$server->getConfig()->getAppValue('core', 'remote_' . $service);
+	$file = \OC::$server->getConfig()->getAppValue('core', 'remote_'.$service);
 
-	if(is_null($file)) {
+	if (is_null($file)) {
 		throw new RemoteException('Path not found', OC_Response::STATUS_NOT_FOUND);
 	}
 
 	// force language as given in the http request
 	\OC::$server->getL10NFactory()->setLanguageFromRequest();
 
-	$file=ltrim($file, '/');
+	$file = ltrim($file, '/');
 
-	$parts=explode('/', $file, 2);
-	$app=$parts[0];
+	$parts = explode('/', $file, 2);
+	$app = $parts[0];
 
 	// Load all required applications
 	\OC::$REQUESTEDAPP = $app;
@@ -125,17 +125,17 @@ 
 
 	switch ($app) {
 		case 'core':
-			$file =  OC::$SERVERROOT .'/'. $file;
+			$file = OC::$SERVERROOT.'/'.$file;
 			break;
 		default:
 			if (!\OC::$server->getAppManager()->isInstalled($app)) {
-				throw new RemoteException('App not installed: ' . $app);
+				throw new RemoteException('App not installed: '.$app);
 			}
 			OC_App::loadApp($app);
-			$file = OC_App::getAppPath($app) .'/'. $parts[1];
+			$file = OC_App::getAppPath($app).'/'.$parts[1];
 			break;
 	}
-	$baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
+	$baseuri = OC::$WEBROOT.'/remote.php/'.$service.'/';
 	require_once $file;
 
 } catch (Exception $ex) {

lib/public/userinterface.php

Indentation +57 added lines, -57 removed lines

@@ -40,68 +40,68 @@
  */
 interface UserInterface {
 
-	/**
-	 * Check if backend implements actions
-	 * @param int $actions bitwise-or'ed actions
-	 * @return boolean
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC_User_Backend::CREATE_USER etc.
-	 * @since 4.5.0
-	 */
-	public function implementsActions($actions);
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC_User_Backend::CREATE_USER etc.
+     * @since 4.5.0
+     */
+    public function implementsActions($actions);
 
-	/**
-	 * delete a user
-	 * @param string $uid The username of the user to delete
-	 * @return bool
-	 * @since 4.5.0
-	 */
-	public function deleteUser($uid);
+    /**
+     * delete a user
+     * @param string $uid The username of the user to delete
+     * @return bool
+     * @since 4.5.0
+     */
+    public function deleteUser($uid);
 
-	/**
-	 * Get a list of all users
-	 *
-	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
-	 * @return string[] an array of all uids
-	 * @since 4.5.0
-	 */
-	public function getUsers($search = '', $limit = null, $offset = null);
+    /**
+     * Get a list of all users
+     *
+     * @param string $search
+     * @param null|int $limit
+     * @param null|int $offset
+     * @return string[] an array of all uids
+     * @since 4.5.0
+     */
+    public function getUsers($search = '', $limit = null, $offset = null);
 
-	/**
-	 * check if a user exists
-	 * @param string $uid the username
-	 * @return boolean
-	 * @since 4.5.0
-	 */
-	public function userExists($uid);
+    /**
+     * check if a user exists
+     * @param string $uid the username
+     * @return boolean
+     * @since 4.5.0
+     */
+    public function userExists($uid);
 
-	/**
-	 * get display name of the user
-	 * @param string $uid user ID of the user
-	 * @return string display name
-	 * @since 4.5.0
-	 */
-	public function getDisplayName($uid);
+    /**
+     * get display name of the user
+     * @param string $uid user ID of the user
+     * @return string display name
+     * @since 4.5.0
+     */
+    public function getDisplayName($uid);
 
-	/**
-	 * Get a list of all display names and user ids.
-	 *
-	 * @param string $search
-	 * @param string|null $limit
-	 * @param string|null $offset
-	 * @return array an array of all displayNames (value) and the corresponding uids (key)
-	 * @since 4.5.0
-	 */
-	public function getDisplayNames($search = '', $limit = null, $offset = null);
+    /**
+     * Get a list of all display names and user ids.
+     *
+     * @param string $search
+     * @param string|null $limit
+     * @param string|null $offset
+     * @return array an array of all displayNames (value) and the corresponding uids (key)
+     * @since 4.5.0
+     */
+    public function getDisplayNames($search = '', $limit = null, $offset = null);
 
-	/**
-	 * Check if a user list is available or not
-	 * @return boolean if users can be listed or not
-	 * @since 4.5.0
-	 */
-	public function hasUserListings();
+    /**
+     * Check if a user list is available or not
+     * @return boolean if users can be listed or not
+     * @since 4.5.0
+     */
+    public function hasUserListings();
 
 }

lib/public/l10n/ifactory.php

Indentation +46 added lines, -46 removed lines

@@ -25,56 +25,56 @@
  * @since 8.2.0
  */
 interface IFactory {
-	/**
-	 * Get a language instance
-	 *
-	 * @param string $app
-	 * @param string|null $lang
-	 * @return \OCP\IL10N
-	 * @since 8.2.0
-	 */
-	public function get($app, $lang = null);
+    /**
+     * Get a language instance
+     *
+     * @param string $app
+     * @param string|null $lang
+     * @return \OCP\IL10N
+     * @since 8.2.0
+     */
+    public function get($app, $lang = null);
 
-	/**
-	 * Find the best language
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return string language If nothing works it returns 'en'
-	 * @since 9.0.0
-	 */
-	public function findLanguage($app = null);
+    /**
+     * Find the best language
+     *
+     * @param string|null $app App id or null for core
+     * @return string language If nothing works it returns 'en'
+     * @since 9.0.0
+     */
+    public function findLanguage($app = null);
 
-	/**
-	 * Find all available languages for an app
-	 *
-	 * @param string|null $app App id or null for core
-	 * @return string[] an array of available languages
-	 * @since 9.0.0
-	 */
-	public function findAvailableLanguages($app = null);
+    /**
+     * Find all available languages for an app
+     *
+     * @param string|null $app App id or null for core
+     * @return string[] an array of available languages
+     * @since 9.0.0
+     */
+    public function findAvailableLanguages($app = null);
 
-	/**
-	 * @param string|null $app App id or null for core
-	 * @param string $lang
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function languageExists($app, $lang);
+    /**
+     * @param string|null $app App id or null for core
+     * @param string $lang
+     * @return bool
+     * @since 9.0.0
+     */
+    public function languageExists($app, $lang);
 
-	/**
-	 * @param string|null $app App id or null for core
-	 * @return string
-	 * @since 9.0.0
-	 */
-	public function setLanguageFromRequest($app = null);
+    /**
+     * @param string|null $app App id or null for core
+     * @return string
+     * @since 9.0.0
+     */
+    public function setLanguageFromRequest($app = null);
 
 
-	/**
-	 * Creates a function from the plural string
-	 *
-	 * @param string $string
-	 * @return string Unique function name
-	 * @since 9.0.0
-	 */
-	public function createPluralFunction($string);
+    /**
+     * Creates a function from the plural string
+     *
+     * @param string $string
+     * @return string Unique function name
+     * @since 9.0.0
+     */
+    public function createPluralFunction($string);
 }

lib/public/lock/lockedexception.php

Indentation +25 added lines, -25 removed lines

@@ -32,31 +32,31 @@
  */
 class LockedException extends \Exception {
 
-	/**
-	 * Locked path
-	 *
-	 * @var string
-	 */
-	private $path;
+    /**
+     * Locked path
+     *
+     * @var string
+     */
+    private $path;
 
-	/**
-	 * LockedException constructor.
-	 *
-	 * @param string $path locked path
-	 * @param \Exception $previous previous exception for cascading
-	 *
-	 * @since 8.1.0
-	 */
-	public function __construct($path, \Exception $previous = null) {
-		parent::__construct('"' . $path . '" is locked', 0, $previous);
-		$this->path = $path;
-	}
+    /**
+     * LockedException constructor.
+     *
+     * @param string $path locked path
+     * @param \Exception $previous previous exception for cascading
+     *
+     * @since 8.1.0
+     */
+    public function __construct($path, \Exception $previous = null) {
+        parent::__construct('"' . $path . '" is locked', 0, $previous);
+        $this->path = $path;
+    }
 
-	/**
-	 * @return string
-	 * @since 8.1.0
-	 */
-	public function getPath() {
-		return $this->path;
-	}
+    /**
+     * @return string
+     * @since 8.1.0
+     */
+    public function getPath() {
+        return $this->path;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
 	 * @since 8.1.0
 	 */
 	public function __construct($path, \Exception $previous = null) {
-		parent::__construct('"' . $path . '" is locked', 0, $previous);
+		parent::__construct('"'.$path.'" is locked', 0, $previous);
 		$this->path = $path;
 	}
 

lib/public/lock/ilockingprovider.php

Indentation +42 added lines, -42 removed lines

@@ -30,51 +30,51 @@
  * @since 8.1.0
  */
 interface ILockingProvider {
-	/**
-	 * @since 8.1.0
-	 */
-	const LOCK_SHARED = 1;
-	/**
-	 * @since 8.1.0
-	 */
-	const LOCK_EXCLUSIVE = 2;
+    /**
+     * @since 8.1.0
+     */
+    const LOCK_SHARED = 1;
+    /**
+     * @since 8.1.0
+     */
+    const LOCK_EXCLUSIVE = 2;
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function isLocked($path, $type);
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @return bool
+     * @since 8.1.0
+     */
+    public function isLocked($path, $type);
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 * @since 8.1.0
-	 */
-	public function acquireLock($path, $type);
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     * @since 8.1.0
+     */
+    public function acquireLock($path, $type);
 
-	/**
-	 * @param string $path
-	 * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @since 8.1.0
-	 */
-	public function releaseLock($path, $type);
+    /**
+     * @param string $path
+     * @param int $type self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @since 8.1.0
+     */
+    public function releaseLock($path, $type);
 
-	/**
-	 * Change the type of an existing lock
-	 *
-	 * @param string $path
-	 * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
-	 * @throws \OCP\Lock\LockedException
-	 * @since 8.1.0
-	 */
-	public function changeLock($path, $targetType);
+    /**
+     * Change the type of an existing lock
+     *
+     * @param string $path
+     * @param int $targetType self::LOCK_SHARED or self::LOCK_EXCLUSIVE
+     * @throws \OCP\Lock\LockedException
+     * @since 8.1.0
+     */
+    public function changeLock($path, $targetType);
 
-	/**
-	 * release all lock acquired by this instance
-	 * @since 8.1.0
-	 */
-	public function releaseAll();
+    /**
+     * release all lock acquired by this instance
+     * @since 8.1.0
+     */
+    public function releaseAll();
 }

lib/public/groupinterface.php

Indentation +58 added lines, -58 removed lines

@@ -40,68 +40,68 @@
  */
 interface GroupInterface {
 
-	/**
-	 * Check if backend implements actions
-	 * @param int $actions bitwise-or'ed actions
-	 * @return boolean
-	 * @since 4.5.0
-	 *
-	 * Returns the supported actions as int to be
-	 * compared with \OC_Group_Backend::CREATE_GROUP etc.
-	 */
-	public function implementsActions($actions);
+    /**
+     * Check if backend implements actions
+     * @param int $actions bitwise-or'ed actions
+     * @return boolean
+     * @since 4.5.0
+     *
+     * Returns the supported actions as int to be
+     * compared with \OC_Group_Backend::CREATE_GROUP etc.
+     */
+    public function implementsActions($actions);
 
-	/**
-	 * is user in group?
-	 * @param string $uid uid of the user
-	 * @param string $gid gid of the group
-	 * @return bool
-	 * @since 4.5.0
-	 *
-	 * Checks whether the user is member of a group or not.
-	 */
-	public function inGroup($uid, $gid);
+    /**
+     * is user in group?
+     * @param string $uid uid of the user
+     * @param string $gid gid of the group
+     * @return bool
+     * @since 4.5.0
+     *
+     * Checks whether the user is member of a group or not.
+     */
+    public function inGroup($uid, $gid);
 
-	/**
-	 * Get all groups a user belongs to
-	 * @param string $uid Name of the user
-	 * @return array an array of group names
-	 * @since 4.5.0
-	 *
-	 * This function fetches all groups a user belongs to. It does not check
-	 * if the user exists at all.
-	 */
-	public function getUserGroups($uid);
+    /**
+     * Get all groups a user belongs to
+     * @param string $uid Name of the user
+     * @return array an array of group names
+     * @since 4.5.0
+     *
+     * This function fetches all groups a user belongs to. It does not check
+     * if the user exists at all.
+     */
+    public function getUserGroups($uid);
 
-	/**
-	 * get a list of all groups
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of group names
-	 * @since 4.5.0
-	 *
-	 * Returns a list with all groups
-	 */
-	public function getGroups($search = '', $limit = -1, $offset = 0);
+    /**
+     * get a list of all groups
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of group names
+     * @since 4.5.0
+     *
+     * Returns a list with all groups
+     */
+    public function getGroups($search = '', $limit = -1, $offset = 0);
 
-	/**
-	 * check if a group exists
-	 * @param string $gid
-	 * @return bool
-	 * @since 4.5.0
-	 */
-	public function groupExists($gid);
+    /**
+     * check if a group exists
+     * @param string $gid
+     * @return bool
+     * @since 4.5.0
+     */
+    public function groupExists($gid);
 
-	/**
-	 * get a list of all users in a group
-	 * @param string $gid
-	 * @param string $search
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array an array of user ids
-	 * @since 4.5.0
-	 */
-	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
+    /**
+     * get a list of all users in a group
+     * @param string $gid
+     * @param string $search
+     * @param int $limit
+     * @param int $offset
+     * @return array an array of user ids
+     * @since 4.5.0
+     */
+    public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0);
 
 }