nextcloud / server

ocs-provider/index.php

Indentation +3 added lines, -3 removed lines

@@ -26,8 +26,8 @@
 $server = \OC::$server;
 
 $controller = new \OC\OCS\Provider(
-	'ocs_provider',
-	$server->getRequest(),
-	$server->getAppManager()
+    'ocs_provider',
+    $server->getRequest(),
+    $server->getAppManager()
 );
 echo $controller->buildProviderList()->render();

core/templates/update.admin.php

Indentation +1 added lines, -1 removed lines

@@ -4,7 +4,7 @@
 		<h2 class="title"><?php p($l->t('App update required')); ?></h2>
 		<?php } else { ?>
 		<h2 class="title"><?php p($l->t('%s will be updated to version %s',
-			array($_['productName'], $_['version']))); ?></h2>
+            array($_['productName'], $_['version']))); ?></h2>
 		<?php } ?>
 		<?php if (!empty($_['appsToUpgrade'])) { ?>
 		<div class="infogroup">

core/templates/exception.php

Indentation +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@
 <?php
-	/** @var array $_ */
-	/** @var \OCP\IL10N $l */
+    /** @var array $_ */
+    /** @var \OCP\IL10N $l */
 
 style('core', ['styles', 'header']);
 ?>

core/search/ajax/search.php

Indentation +14 added lines, -14 removed lines

@@ -31,32 +31,32 @@
 \OC::$server->getSession()->close();
 
 if (isset($_GET['query'])) {
-	$query = $_GET['query'];
+    $query = $_GET['query'];
 } else {
-	$query = '';
+    $query = '';
 }
 if (isset($_GET['inApps'])) {
-	$inApps = $_GET['inApps'];
-	if (is_string($inApps)) {
-		$inApps = array($inApps);
-	}
+    $inApps = $_GET['inApps'];
+    if (is_string($inApps)) {
+        $inApps = array($inApps);
+    }
 } else {
-	$inApps = array();
+    $inApps = array();
 }
 if (isset($_GET['page'])) {
-	$page = (int)$_GET['page'];
+    $page = (int)$_GET['page'];
 } else {
-	$page = 1;
+    $page = 1;
 }
 if (isset($_GET['size'])) {
-	$size = (int)$_GET['size'];
+    $size = (int)$_GET['size'];
 } else {
-	$size = 30;
+    $size = 30;
 }
 if($query) {
-	$result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
-	OC_JSON::encodedPrint($result);
+    $result = \OC::$server->getSearch()->searchPaged($query, $inApps, $page, $size);
+    OC_JSON::encodedPrint($result);
 }
 else {
-	echo 'false';
+    echo 'false';
 }

core/Controller/SetupController.php

Indentation +81 added lines, -81 removed lines

@@ -31,97 +31,97 @@
 use OC\Setup;
 
 class SetupController {
-	/** @var Setup */
-	protected $setupHelper;
-	/** @var string */
-	private $autoConfigFile;
+    /** @var Setup */
+    protected $setupHelper;
+    /** @var string */
+    private $autoConfigFile;
 
-	/**
-	 * @param Setup $setupHelper
-	 */
-	function __construct(Setup $setupHelper) {
-		$this->autoConfigFile = \OC::$configDir.'autoconfig.php';
-		$this->setupHelper = $setupHelper;
-	}
+    /**
+     * @param Setup $setupHelper
+     */
+    function __construct(Setup $setupHelper) {
+        $this->autoConfigFile = \OC::$configDir.'autoconfig.php';
+        $this->setupHelper = $setupHelper;
+    }
 
-	/**
-	 * @param $post
-	 */
-	public function run($post) {
-		// Check for autosetup:
-		$post = $this->loadAutoConfig($post);
-		$opts = $this->setupHelper->getSystemInfo();
+    /**
+     * @param $post
+     */
+    public function run($post) {
+        // Check for autosetup:
+        $post = $this->loadAutoConfig($post);
+        $opts = $this->setupHelper->getSystemInfo();
 
-		// convert 'abcpassword' to 'abcpass'
-		if (isset($post['adminpassword'])) {
-			$post['adminpass'] = $post['adminpassword'];
-		}
-		if (isset($post['dbpassword'])) {
-			$post['dbpass'] = $post['dbpassword'];
-		}
+        // convert 'abcpassword' to 'abcpass'
+        if (isset($post['adminpassword'])) {
+            $post['adminpass'] = $post['adminpassword'];
+        }
+        if (isset($post['dbpassword'])) {
+            $post['dbpass'] = $post['dbpassword'];
+        }
 
-		if(isset($post['install']) AND $post['install']=='true') {
-			// We have to launch the installation process :
-			$e = $this->setupHelper->install($post);
-			$errors = array('errors' => $e);
+        if(isset($post['install']) AND $post['install']=='true') {
+            // We have to launch the installation process :
+            $e = $this->setupHelper->install($post);
+            $errors = array('errors' => $e);
 
-			if(count($e) > 0) {
-				$options = array_merge($opts, $post, $errors);
-				$this->display($options);
-			} else {
-				$this->finishSetup();
-			}
-		} else {
-			$options = array_merge($opts, $post);
-			$this->display($options);
-		}
-	}
+            if(count($e) > 0) {
+                $options = array_merge($opts, $post, $errors);
+                $this->display($options);
+            } else {
+                $this->finishSetup();
+            }
+        } else {
+            $options = array_merge($opts, $post);
+            $this->display($options);
+        }
+    }
 
-	public function display($post) {
-		$defaults = array(
-			'adminlogin' => '',
-			'adminpass' => '',
-			'dbuser' => '',
-			'dbpass' => '',
-			'dbname' => '',
-			'dbtablespace' => '',
-			'dbhost' => 'localhost',
-			'dbtype' => '',
-		);
-		$parameters = array_merge($defaults, $post);
+    public function display($post) {
+        $defaults = array(
+            'adminlogin' => '',
+            'adminpass' => '',
+            'dbuser' => '',
+            'dbpass' => '',
+            'dbname' => '',
+            'dbtablespace' => '',
+            'dbhost' => 'localhost',
+            'dbtype' => '',
+        );
+        $parameters = array_merge($defaults, $post);
 
-		\OC_Util::addVendorScript('strengthify/jquery.strengthify');
-		\OC_Util::addVendorStyle('strengthify/strengthify');
-		\OC_Util::addScript('setup');
-		\OC_Template::printGuestPage('', 'installation', $parameters);
-	}
+        \OC_Util::addVendorScript('strengthify/jquery.strengthify');
+        \OC_Util::addVendorStyle('strengthify/strengthify');
+        \OC_Util::addScript('setup');
+        \OC_Template::printGuestPage('', 'installation', $parameters);
+    }
 
-	public function finishSetup() {
-		if( file_exists( $this->autoConfigFile )) {
-			unlink($this->autoConfigFile);
-		}
-		\OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
-		\OC_Util::redirectToDefaultPage();
-	}
+    public function finishSetup() {
+        if( file_exists( $this->autoConfigFile )) {
+            unlink($this->autoConfigFile);
+        }
+        \OC::$server->getIntegrityCodeChecker()->runInstanceVerification();
+        \OC_Util::redirectToDefaultPage();
+    }
 
-	public function loadAutoConfig($post) {
-		if( file_exists($this->autoConfigFile)) {
-			\OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', \OCP\Util::INFO);
-			$AUTOCONFIG = array();
-			include $this->autoConfigFile;
-			$post = array_merge ($post, $AUTOCONFIG);
-		}
+    public function loadAutoConfig($post) {
+        if( file_exists($this->autoConfigFile)) {
+            \OCP\Util::writeLog('core', 'Autoconfig file found, setting up ownCloud…', \OCP\Util::INFO);
+            $AUTOCONFIG = array();
+            include $this->autoConfigFile;
+            $post = array_merge ($post, $AUTOCONFIG);
+        }
 
-		$dbIsSet = isset($post['dbtype']);
-		$directoryIsSet = isset($post['directory']);
-		$adminAccountIsSet = isset($post['adminlogin']);
+        $dbIsSet = isset($post['dbtype']);
+        $directoryIsSet = isset($post['directory']);
+        $adminAccountIsSet = isset($post['adminlogin']);
 
-		if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
-			$post['install'] = 'true';
-		}
-		$post['dbIsSet'] = $dbIsSet;
-		$post['directoryIsSet'] = $directoryIsSet;
+        if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
+            $post['install'] = 'true';
+        }
+        $post['dbIsSet'] = $dbIsSet;
+        $post['directoryIsSet'] = $directoryIsSet;
 
-		return $post;
-	}
+        return $post;
+    }
 }

core/Controller/UserController.php

Indentation +36 added lines, -36 removed lines

@@ -29,46 +29,46 @@
 use \OCP\IUserManager;
 
 class UserController extends Controller {
-	/**
-	 * @var IUserManager
-	 */
-	protected $userManager;
+    /**
+     * @var IUserManager
+     */
+    protected $userManager;
 
-	public function __construct($appName,
-								IRequest $request,
-								IUserManager $userManager
-	) {
-		parent::__construct($appName, $request);
-		$this->userManager = $userManager;
-	}
+    public function __construct($appName,
+                                IRequest $request,
+                                IUserManager $userManager
+    ) {
+        parent::__construct($appName, $request);
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * Lookup user display names
-	 *
-	 * @NoAdminRequired
-	 *
-	 * @param array $users
-	 *
-	 * @return JSONResponse
-	 */
-	public function getDisplayNames($users) {
-		$result = array();
+    /**
+     * Lookup user display names
+     *
+     * @NoAdminRequired
+     *
+     * @param array $users
+     *
+     * @return JSONResponse
+     */
+    public function getDisplayNames($users) {
+        $result = array();
 
-		foreach ($users as $user) {
-			$userObject = $this->userManager->get($user);
-			if (is_object($userObject)) {
-				$result[$user] = $userObject->getDisplayName();
-			} else {
-				$result[$user] = $user;
-			}
-		}
+        foreach ($users as $user) {
+            $userObject = $this->userManager->get($user);
+            if (is_object($userObject)) {
+                $result[$user] = $userObject->getDisplayName();
+            } else {
+                $result[$user] = $user;
+            }
+        }
 
-		$json = array(
-			'users' => $result,
-			'status' => 'success'
-		);
+        $json = array(
+            'users' => $result,
+            'status' => 'success'
+        );
 
-		return new JSONResponse($json);
+        return new JSONResponse($json);
 
-	}
+    }
 }

core/Command/Security/RemoveCertificate.php

Indentation +24 added lines, -24 removed lines

@@ -34,28 +34,28 @@
 
 class RemoveCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('security:certificates:remove')
-			->setDescription('remove trusted certificate')
-			->addArgument(
-				'name',
-				InputArgument::REQUIRED,
-				'the file name of the certificate to remove'
-			);
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$name = $input->getArgument('name');
-
-		$this->certificateManager->removeCertificate($name);
-	}
+    /** @var ICertificateManager */
+    protected $certificateManager;
+
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('security:certificates:remove')
+            ->setDescription('remove trusted certificate')
+            ->addArgument(
+                'name',
+                InputArgument::REQUIRED,
+                'the file name of the certificate to remove'
+            );
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $name = $input->getArgument('name');
+
+        $this->certificateManager->removeCertificate($name);
+    }
 }

core/Command/Security/ListCertificates.php

Indentation +56 added lines, -56 removed lines

@@ -34,64 +34,64 @@
 
 class ListCertificates extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
-	/** @var IL10N */
-	protected $l;
+    /** @var ICertificateManager */
+    protected $certificateManager;
+    /** @var IL10N */
+    protected $l;
 
-	public function __construct(ICertificateManager $certificateManager, IL10N $l) {
-		$this->certificateManager = $certificateManager;
-		$this->l = $l;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager, IL10N $l) {
+        $this->certificateManager = $certificateManager;
+        $this->l = $l;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates')
-			->setDescription('list trusted certificates');
-		parent::configure();
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates')
+            ->setDescription('list trusted certificates');
+        parent::configure();
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$outputType = $input->getOption('output');
-		if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
-			$certificates = array_map(function (ICertificate $certificate) {
-				return [
-					'name' => $certificate->getName(),
-					'common_name' => $certificate->getCommonName(),
-					'organization' => $certificate->getOrganization(),
-					'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
-					'issuer' => $certificate->getIssuerName(),
-					'issuer_organization' => $certificate->getIssuerOrganization(),
-					'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
-				];
-			}, $this->certificateManager->listCertificates());
-			if ($outputType === self::OUTPUT_FORMAT_JSON) {
-				$output->writeln(json_encode(array_values($certificates)));
-			} else {
-				$output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
-			}
-		} else {
-			$table = new Table($output);
-			$table->setHeaders([
-				'File Name',
-				'Common Name',
-				'Organization',
-				'Valid Until',
-				'Issued By'
-			]);
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $outputType = $input->getOption('output');
+        if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) {
+            $certificates = array_map(function (ICertificate $certificate) {
+                return [
+                    'name' => $certificate->getName(),
+                    'common_name' => $certificate->getCommonName(),
+                    'organization' => $certificate->getOrganization(),
+                    'expire' => $certificate->getExpireDate()->format(\DateTime::ATOM),
+                    'issuer' => $certificate->getIssuerName(),
+                    'issuer_organization' => $certificate->getIssuerOrganization(),
+                    'issue_date' => $certificate->getIssueDate()->format(\DateTime::ATOM)
+                ];
+            }, $this->certificateManager->listCertificates());
+            if ($outputType === self::OUTPUT_FORMAT_JSON) {
+                $output->writeln(json_encode(array_values($certificates)));
+            } else {
+                $output->writeln(json_encode(array_values($certificates), JSON_PRETTY_PRINT));
+            }
+        } else {
+            $table = new Table($output);
+            $table->setHeaders([
+                'File Name',
+                'Common Name',
+                'Organization',
+                'Valid Until',
+                'Issued By'
+            ]);
 
-			$rows = array_map(function (ICertificate $certificate) {
-				return [
-					$certificate->getName(),
-					$certificate->getCommonName(),
-					$certificate->getOrganization(),
-					$this->l->l('date', $certificate->getExpireDate()),
-					$certificate->getIssuerName()
-				];
-			}, $this->certificateManager->listCertificates());
-			$table->setRows($rows);
-			$table->render();
-		}
-	}
+            $rows = array_map(function (ICertificate $certificate) {
+                return [
+                    $certificate->getName(),
+                    $certificate->getCommonName(),
+                    $certificate->getOrganization(),
+                    $this->l->l('date', $certificate->getExpireDate()),
+                    $certificate->getIssuerName()
+                ];
+            }, $this->certificateManager->listCertificates());
+            $table->setRows($rows);
+            $table->render();
+        }
+    }
 }

core/Command/Security/ImportCertificate.php

Indentation +26 added lines, -26 removed lines

@@ -33,36 +33,36 @@
 
 class ImportCertificate extends Base {
 
-	/** @var ICertificateManager */
-	protected $certificateManager;
+    /** @var ICertificateManager */
+    protected $certificateManager;
 
-	public function __construct(ICertificateManager $certificateManager) {
-		$this->certificateManager = $certificateManager;
-		parent::__construct();
-	}
+    public function __construct(ICertificateManager $certificateManager) {
+        $this->certificateManager = $certificateManager;
+        parent::__construct();
+    }
 
-	protected function configure() {
-		$this
-			->setName('security:certificates:import')
-			->setDescription('import trusted certificate')
-			->addArgument(
-				'path',
-				InputArgument::REQUIRED,
-				'path to the certificate to import'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('security:certificates:import')
+            ->setDescription('import trusted certificate')
+            ->addArgument(
+                'path',
+                InputArgument::REQUIRED,
+                'path to the certificate to import'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$path = $input->getArgument('path');
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $path = $input->getArgument('path');
 
-		if (!file_exists($path)) {
-			$output->writeln('<error>certificate not found</error>');
-			return;
-		}
+        if (!file_exists($path)) {
+            $output->writeln('<error>certificate not found</error>');
+            return;
+        }
 
-		$certData = file_get_contents($path);
-		$name = basename($path);
+        $certData = file_get_contents($path);
+        $name = basename($path);
 
-		$this->certificateManager->addCertificate($certData, $name);
-	}
+        $this->certificateManager->addCertificate($certData, $name);
+    }
 }