nextcloud / server

apps/dav/appinfo/app.php

Indentation +14 added lines, -14 removed lines

@@ -30,27 +30,27 @@
 $app->registerHooks();
 
 \OC::$server->registerService('CardDAVSyncService', function() use ($app) {
-	return $app->getSyncService();
+    return $app->getSyncService();
 });
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 
 $eventDispatcher->addListener('OCP\Federation\TrustedServerEvent::remove',
-	function(GenericEvent $event) use ($app) {
-		/** @var CardDavBackend $cardDavBackend */
-		$cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
-		$addressBookUri = $event->getSubject();
-		$addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
-		if (!is_null($addressBook)) {
-			$cardDavBackend->deleteAddressBook($addressBook['id']);
-		}
-	}
+    function(GenericEvent $event) use ($app) {
+        /** @var CardDavBackend $cardDavBackend */
+        $cardDavBackend = $app->getContainer()->query(CardDavBackend::class);
+        $addressBookUri = $event->getSubject();
+        $addressBook = $cardDavBackend->getAddressBooksByUri('principals/system/system', $addressBookUri);
+        if (!is_null($addressBook)) {
+            $cardDavBackend->deleteAddressBook($addressBook['id']);
+        }
+    }
 );
 
 $cm = \OC::$server->getContactsManager();
 $cm->register(function() use ($cm, $app) {
-	$user = \OC::$server->getUserSession()->getUser();
-	if (!is_null($user)) {
-		$app->setupContactsProvider($cm, $user->getUID());
-	}
+    $user = \OC::$server->getUserSession()->getUser();
+    if (!is_null($user)) {
+        $app->setupContactsProvider($cm, $user->getUID());
+    }
 });

apps/dav/bin/chunkperf.php

Indentation +17 added lines, -17 removed lines

@@ -23,8 +23,8 @@ 
 require '../../../../3rdparty/autoload.php';
 
 if ($argc !== 6) {
-	echo "Invalid number of arguments" . PHP_EOL;
-	exit;
+    echo "Invalid number of arguments" . PHP_EOL;
+    exit;
 }
 
 /**
@@ -33,15 +33,15 @@ 
  * @return mixed
  */
 function request($client, $method, $uploadUrl, $data = null, $headers = []) {
-	echo "$method $uploadUrl ... ";
-	$t0 = microtime(true);
-	$result = $client->request($method, $uploadUrl, $data, $headers);
-	$t1 = microtime(true);
-	echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
-	if (!in_array($result['statusCode'],  [200, 201])) {
-		echo $result['body'] . PHP_EOL;
-	}
-	return $result;
+    echo "$method $uploadUrl ... ";
+    $t0 = microtime(true);
+    $result = $client->request($method, $uploadUrl, $data, $headers);
+    $t1 = microtime(true);
+    echo $result['statusCode'] . " - " . ($t1 - $t0) . ' seconds' . PHP_EOL;
+    if (!in_array($result['statusCode'],  [200, 201])) {
+        echo $result['body'] . PHP_EOL;
+    }
+    return $result;
 }
 
 $baseUri = $argv[1];
@@ -51,9 +51,9 @@ 
 $chunkSize = $argv[5] * 1024 * 1024;
 
 $client = new \Sabre\DAV\Client([
-	'baseUri' => $baseUri,
-	'userName' => $userName,
-	'password' => $password
+    'baseUri' => $baseUri,
+    'userName' => $userName,
+    'password' => $password
 ]);
 
 $transfer = uniqid('transfer', true);
@@ -66,12 +66,12 @@ 
 
 $index = 0;
 while(!feof($stream)) {
-	request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
-	$index++;
+    request($client, 'PUT', "$uploadUrl/$index", fread($stream, $chunkSize));
+    $index++;
 }
 
 $destination = pathinfo($file, PATHINFO_BASENAME);
 //echo "Moving $uploadUrl/.file to it's final destination $baseUri/files/$userName/$destination" . PHP_EOL;
 request($client, 'MOVE', "$uploadUrl/.file", null, [
-	'Destination' => "$baseUri/files/$userName/$destination"
+    'Destination' => "$baseUri/files/$userName/$destination"
 ]);

apps/files_versions/ajax/getVersions.php

Indentation +11 added lines, -11 removed lines

@@ -35,22 +35,22 @@
 $versions = OCA\Files_Versions\Storage::getVersions($uid, $filename, $source);
 if( $versions ) {
 
-	$endReached = false;
-	if (count($versions) <= $start+$count) {
-		$endReached = true;
-	}
+    $endReached = false;
+    if (count($versions) <= $start+$count) {
+        $endReached = true;
+    }
 
-	$versions = array_slice($versions, $start, $count);
+    $versions = array_slice($versions, $start, $count);
 
-	// remove owner path from request to not disclose it to the recipient
-	foreach ($versions as $version) {
-		unset($version['path']);
-	}
+    // remove owner path from request to not disclose it to the recipient
+    foreach ($versions as $version) {
+        unset($version['path']);
+    }
 
-	\OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
+    \OCP\JSON::success(array('data' => array('versions' => $versions, 'endReached' => $endReached)));
 
 } else {
 
-	\OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
+    \OCP\JSON::success(array('data' => array('versions' => [], 'endReached' => true)));
 
 }

apps/files_versions/ajax/rollbackVersion.php

Indentation +3 added lines, -3 removed lines

@@ -34,8 +34,8 @@
 $revision=(int)$_GET['revision'];
 
 if(OCA\Files_Versions\Storage::rollback( $file, $revision )) {
-	OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
+    OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
 }else{
-	$l = \OC::$server->getL10N('files_versions');
-	OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
+    $l = \OC::$server->getL10N('files_versions');
+    OCP\JSON::error(array("data" => array( "message" => $l->t("Could not revert: %s", array($file) ))));
 }

apps/files_versions/lib/AppInfo/Application.php

Indentation +13 added lines, -13 removed lines

@@ -27,24 +27,24 @@
 use OCA\Files_Versions\Expiration;
 
 class Application extends App {
-	public function __construct(array $urlParams = array()) {
-		parent::__construct('files_versions', $urlParams);
+    public function __construct(array $urlParams = array()) {
+        parent::__construct('files_versions', $urlParams);
 
-		$container = $this->getContainer();
+        $container = $this->getContainer();
 
-		/*
+        /*
 		 * Register capabilities
 		 */
-		$container->registerCapability('OCA\Files_Versions\Capabilities');
+        $container->registerCapability('OCA\Files_Versions\Capabilities');
 
-		/*
+        /*
 		 * Register expiration
 		 */
-		$container->registerService('Expiration', function($c) {
-			return  new Expiration(
-				$c->query('ServerContainer')->getConfig(),
-				$c->query('OCP\AppFramework\Utility\ITimeFactory')
-			);
-		});
-	}
+        $container->registerService('Expiration', function($c) {
+            return  new Expiration(
+                $c->query('ServerContainer')->getConfig(),
+                $c->query('OCP\AppFramework\Utility\ITimeFactory')
+            );
+        });
+    }
 }

apps/files_versions/lib/Command/ExpireVersions.php

Indentation +78 added lines, -78 removed lines

@@ -33,93 +33,93 @@
 
 class ExpireVersions extends Command {
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	/**
-	 * @param IUserManager|null $userManager
-	 * @param Expiration|null $expiration
-	 */
-	public function __construct(IUserManager $userManager = null,
-								Expiration $expiration = null) {
-		parent::__construct();
+    /**
+     * @param IUserManager|null $userManager
+     * @param Expiration|null $expiration
+     */
+    public function __construct(IUserManager $userManager = null,
+                                Expiration $expiration = null) {
+        parent::__construct();
 
-		$this->userManager = $userManager;
-		$this->expiration = $expiration;
-	}
+        $this->userManager = $userManager;
+        $this->expiration = $expiration;
+    }
 
-	protected function configure() {
-		$this
-			->setName('versions:expire')
-			->setDescription('Expires the users file versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
-			);
-	}
+    protected function configure() {
+        $this
+            ->setName('versions:expire')
+            ->setDescription('Expires the users file versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'expire file versions of the given user(s), if no user is given file versions for all users will be expired.'
+            );
+    }
 
-	protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output) {
 
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			$output->writeln("No expiry configured.");
-			return;
-		}
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            $output->writeln("No expiry configured.");
+            return;
+        }
 
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Remove deleted files of   <info>$user</info>");
-					$userObject = $this->userManager->get($user);
-					$this->expireVersionsForUser($userObject);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$p = new ProgressBar($output);
-			$p->start();
-			$this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
-				$p->advance();
-				$this->expireVersionsForUser($user);
-			});
-			$p->finish();
-			$output->writeln('');
-		}
-	}
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Remove deleted files of   <info>$user</info>");
+                    $userObject = $this->userManager->get($user);
+                    $this->expireVersionsForUser($userObject);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $p = new ProgressBar($output);
+            $p->start();
+            $this->userManager->callForSeenUsers(function(IUser $user) use ($p) {
+                $p->advance();
+                $this->expireVersionsForUser($user);
+            });
+            $p->finish();
+            $output->writeln('');
+        }
+    }
 
-	function expireVersionsForUser(IUser $user) {
-		$uid = $user->getUID();
-		if (!$this->setupFS($uid)) {
-			return;
-		}
-		Storage::expireOlderThanMaxForUser($uid);
-	}
+    function expireVersionsForUser(IUser $user) {
+        $uid = $user->getUID();
+        if (!$this->setupFS($uid)) {
+            return;
+        }
+        Storage::expireOlderThanMaxForUser($uid);
+    }
 
-	/**
-	 * Act on behalf on versions item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on versions item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a version directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a version directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }

apps/files_versions/lib/Command/CleanUp.php

Indentation +78 added lines, -78 removed lines

@@ -33,83 +33,83 @@
 
 class CleanUp extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IRootFolder */
-	protected $rootFolder;
-
-	/**
-	 * @param IRootFolder $rootFolder
-	 * @param IUserManager $userManager
-	 */
-	function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
-		parent::__construct();
-		$this->userManager = $userManager;
-		$this->rootFolder = $rootFolder;
-	}
-
-	protected function configure() {
-		$this
-			->setName('versions:cleanup')
-			->setDescription('Delete versions')
-			->addArgument(
-				'user_id',
-				InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
-				'delete versions of the given user(s), if no user is given all versions will be deleted'
-			);
-	}
-
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-
-		$users = $input->getArgument('user_id');
-		if (!empty($users)) {
-			foreach ($users as $user) {
-				if ($this->userManager->userExists($user)) {
-					$output->writeln("Delete versions of   <info>$user</info>");
-					$this->deleteVersions($user);
-				} else {
-					$output->writeln("<error>Unknown user $user</error>");
-				}
-			}
-		} else {
-			$output->writeln('Delete all versions');
-			foreach ($this->userManager->getBackends() as $backend) {
-				$name = get_class($backend);
-
-				if ($backend instanceof IUserBackend) {
-					$name = $backend->getBackendName();
-				}
-
-				$output->writeln("Delete versions for users on backend <info>$name</info>");
-
-				$limit = 500;
-				$offset = 0;
-				do {
-					$users = $backend->getUsers('', $limit, $offset);
-					foreach ($users as $user) {
-						$output->writeln("   <info>$user</info>");
-						$this->deleteVersions($user);
-					}
-					$offset += $limit;
-				} while (count($users) >= $limit);
-			}
-		}
-	}
-
-
-	/**
-	 * delete versions for the given user
-	 *
-	 * @param string $user
-	 */
-	protected function deleteVersions($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
-		if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
-			$this->rootFolder->get('/' . $user . '/files_versions')->delete();
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var IRootFolder */
+    protected $rootFolder;
+
+    /**
+     * @param IRootFolder $rootFolder
+     * @param IUserManager $userManager
+     */
+    function __construct(IRootFolder $rootFolder, IUserManager $userManager) {
+        parent::__construct();
+        $this->userManager = $userManager;
+        $this->rootFolder = $rootFolder;
+    }
+
+    protected function configure() {
+        $this
+            ->setName('versions:cleanup')
+            ->setDescription('Delete versions')
+            ->addArgument(
+                'user_id',
+                InputArgument::OPTIONAL | InputArgument::IS_ARRAY,
+                'delete versions of the given user(s), if no user is given all versions will be deleted'
+            );
+    }
+
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+
+        $users = $input->getArgument('user_id');
+        if (!empty($users)) {
+            foreach ($users as $user) {
+                if ($this->userManager->userExists($user)) {
+                    $output->writeln("Delete versions of   <info>$user</info>");
+                    $this->deleteVersions($user);
+                } else {
+                    $output->writeln("<error>Unknown user $user</error>");
+                }
+            }
+        } else {
+            $output->writeln('Delete all versions');
+            foreach ($this->userManager->getBackends() as $backend) {
+                $name = get_class($backend);
+
+                if ($backend instanceof IUserBackend) {
+                    $name = $backend->getBackendName();
+                }
+
+                $output->writeln("Delete versions for users on backend <info>$name</info>");
+
+                $limit = 500;
+                $offset = 0;
+                do {
+                    $users = $backend->getUsers('', $limit, $offset);
+                    foreach ($users as $user) {
+                        $output->writeln("   <info>$user</info>");
+                        $this->deleteVersions($user);
+                    }
+                    $offset += $limit;
+                } while (count($users) >= $limit);
+            }
+        }
+    }
+
+
+    /**
+     * delete versions for the given user
+     *
+     * @param string $user
+     */
+    protected function deleteVersions($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
+        if ($this->rootFolder->nodeExists('/' . $user . '/files_versions')) {
+            $this->rootFolder->get('/' . $user . '/files_versions')->delete();
+        }
+    }
 
 }

apps/files_versions/lib/Capabilities.php

Indentation +12 added lines, -12 removed lines

@@ -29,16 +29,16 @@
 
 class Capabilities implements ICapability {
 	
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'files' => [
-				'versioning' => true
-			]
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'files' => [
+                'versioning' => true
+            ]
+        ];
+    }
 }

apps/files_versions/lib/BackgroundJob/ExpireVersions.php

Indentation +52 added lines, -52 removed lines

@@ -31,66 +31,66 @@
 
 class ExpireVersions extends \OC\BackgroundJob\TimedJob {
 
-	const ITEMS_PER_SESSION = 1000;
+    const ITEMS_PER_SESSION = 1000;
 
-	/**
-	 * @var Expiration
-	 */
-	private $expiration;
+    /**
+     * @var Expiration
+     */
+    private $expiration;
 	
-	/**
-	 * @var IUserManager
-	 */
-	private $userManager;
+    /**
+     * @var IUserManager
+     */
+    private $userManager;
 
-	public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
-		// Run once per 30 minutes
-		$this->setInterval(60 * 30);
+    public function __construct(IUserManager $userManager = null, Expiration $expiration = null) {
+        // Run once per 30 minutes
+        $this->setInterval(60 * 30);
 
-		if (is_null($expiration) || is_null($userManager)) {
-			$this->fixDIForJobs();
-		} else {
-			$this->expiration = $expiration;
-			$this->userManager = $userManager;
-		}
-	}
+        if (is_null($expiration) || is_null($userManager)) {
+            $this->fixDIForJobs();
+        } else {
+            $this->expiration = $expiration;
+            $this->userManager = $userManager;
+        }
+    }
 
-	protected function fixDIForJobs() {
-		$application = new Application();
-		$this->expiration = $application->getContainer()->query('Expiration');
-		$this->userManager = \OC::$server->getUserManager();
-	}
+    protected function fixDIForJobs() {
+        $application = new Application();
+        $this->expiration = $application->getContainer()->query('Expiration');
+        $this->userManager = \OC::$server->getUserManager();
+    }
 
-	protected function run($argument) {
-		$maxAge = $this->expiration->getMaxAgeAsTimestamp();
-		if (!$maxAge) {
-			return;
-		}
+    protected function run($argument) {
+        $maxAge = $this->expiration->getMaxAgeAsTimestamp();
+        if (!$maxAge) {
+            return;
+        }
 
-		$this->userManager->callForSeenUsers(function(IUser $user) {
-			$uid = $user->getUID();
-			if (!$this->setupFS($uid)) {
-				return;
-			}
-			Storage::expireOlderThanMaxForUser($uid);
-		});
-	}
+        $this->userManager->callForSeenUsers(function(IUser $user) {
+            $uid = $user->getUID();
+            if (!$this->setupFS($uid)) {
+                return;
+            }
+            Storage::expireOlderThanMaxForUser($uid);
+        });
+    }
 
-	/**
-	 * Act on behalf on trash item owner
-	 * @param string $user
-	 * @return boolean
-	 */
-	protected function setupFS($user) {
-		\OC_Util::tearDownFS();
-		\OC_Util::setupFS($user);
+    /**
+     * Act on behalf on trash item owner
+     * @param string $user
+     * @return boolean
+     */
+    protected function setupFS($user) {
+        \OC_Util::tearDownFS();
+        \OC_Util::setupFS($user);
 
-		// Check if this user has a versions directory
-		$view = new \OC\Files\View('/' . $user);
-		if (!$view->is_dir('/files_versions')) {
-			return false;
-		}
+        // Check if this user has a versions directory
+        $view = new \OC\Files\View('/' . $user);
+        if (!$view->is_dir('/files_versions')) {
+            return false;
+        }
 
-		return true;
-	}
+        return true;
+    }
 }