nextcloud / server

lib/private/BackgroundJob/Legacy/QueuedJob.php

Indentation +8 added lines, -8 removed lines

@@ -24,12 +24,12 @@
 namespace OC\BackgroundJob\Legacy;
 
 class QueuedJob extends \OC\BackgroundJob\QueuedJob {
-	public function run($argument) {
-		$class = $argument['klass'];
-		$method = $argument['method'];
-		$parameters = $argument['parameters'];
-		if (is_callable(array($class, $method))) {
-			call_user_func(array($class, $method), $parameters);
-		}
-	}
+    public function run($argument) {
+        $class = $argument['klass'];
+        $method = $argument['method'];
+        $parameters = $argument['parameters'];
+        if (is_callable(array($class, $method))) {
+            call_user_func(array($class, $method), $parameters);
+        }
+    }
 }

lib/private/Settings/Section.php

Indentation +58 added lines, -58 removed lines

@@ -26,67 +26,67 @@
 use OCP\Settings\IIconSection;
 
 class Section implements IIconSection {
-	/** @var string */
-	private $id;
-	/** @var string */
-	private $name;
-	/** @var int */
-	private $priority;
-	/** @var string */
-	private $icon;
+    /** @var string */
+    private $id;
+    /** @var string */
+    private $name;
+    /** @var int */
+    private $priority;
+    /** @var string */
+    private $icon;
 
-	/**
-	 * @param string $id
-	 * @param string $name
-	 * @param int $priority
-	 * @param string $icon
-	 */
-	public function __construct($id, $name, $priority, $icon = '') {
-		$this->id = $id;
-		$this->name = $name;
-		$this->priority = $priority;
-		$this->icon = $icon;
-	}
+    /**
+     * @param string $id
+     * @param string $name
+     * @param int $priority
+     * @param string $icon
+     */
+    public function __construct($id, $name, $priority, $icon = '') {
+        $this->id = $id;
+        $this->name = $name;
+        $this->priority = $priority;
+        $this->icon = $icon;
+    }
 
-	/**
-	 * returns the ID of the section. It is supposed to be a lower case string,
-	 * e.g. 'ldap'
-	 *
-	 * @returns string
-	 */
-	public function getID() {
-		return $this->id;
-	}
+    /**
+     * returns the ID of the section. It is supposed to be a lower case string,
+     * e.g. 'ldap'
+     *
+     * @returns string
+     */
+    public function getID() {
+        return $this->id;
+    }
 
-	/**
-	 * returns the translated name as it should be displayed, e.g. 'LDAP / AD
-	 * integration'. Use the L10N service to translate it.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return $this->name;
-	}
+    /**
+     * returns the translated name as it should be displayed, e.g. 'LDAP / AD
+     * integration'. Use the L10N service to translate it.
+     *
+     * @return string
+     */
+    public function getName() {
+        return $this->name;
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the settings navigation. The sections are arranged in ascending order of
-	 * the priority values. It is required to return a value between 0 and 99.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return $this->priority;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the settings navigation. The sections are arranged in ascending order of
+     * the priority values. It is required to return a value between 0 and 99.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return $this->priority;
+    }
 
-	/**
-	 * returns the relative path to an 16*16 icon describing the section.
-	 * e.g. '/core/img/places/files.svg'
-	 *
-	 * @returns string
-	 * @since 12
-	 */
-	public function getIcon() {
-		return $this->icon;
-	}
+    /**
+     * returns the relative path to an 16*16 icon describing the section.
+     * e.g. '/core/img/places/files.svg'
+     *
+     * @returns string
+     * @since 12
+     */
+    public function getIcon() {
+        return $this->icon;
+    }
 }

lib/private/Settings/Mapper.php

Indentation +133 added lines, -133 removed lines

@@ -26,138 +26,138 @@
 use OCP\IDBConnection;
 
 class Mapper {
-	const TABLE_ADMIN_SETTINGS = 'admin_settings';
-	const TABLE_ADMIN_SECTIONS = 'admin_sections';
-
-	/** @var IDBConnection */
-	private $dbc;
-
-	/**
-	 * @param IDBConnection $dbc
-	 */
-	public function __construct(IDBConnection $dbc) {
-		$this->dbc = $dbc;
-	}
-
-	/**
-	 * Get the configured admin settings from the database for the provided section
-	 *
-	 * @param string $section
-	 * @return array[] [['class' => string, 'priority' => int], ...]
-	 */
-	public function getAdminSettingsFromDB($section) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->select(['class', 'priority'])
-			->from(self::TABLE_ADMIN_SETTINGS)
-			->where($query->expr()->eq('section', $this->dbc->getQueryBuilder()->createParameter('section')))
-			->setParameter('section', $section);
-
-		$result = $query->execute();
-		return $result->fetchAll();
-	}
-
-	/**
-	 * Get the configured admin sections from the database
-	 *
-	 * @return array[] [['class' => string, 'priority' => int], ...]
-	 */
-	public function getAdminSectionsFromDB() {
-		$query = $this->dbc->getQueryBuilder();
-		$query->selectDistinct('s.class')
-			->addSelect('s.priority')
-			->from(self::TABLE_ADMIN_SECTIONS, 's')
-			->from(self::TABLE_ADMIN_SETTINGS, 'f')
-			->where($query->expr()->eq('s.id', 'f.section'));
-		$result = $query->execute();
-		return array_map(function ($row) {
-			$row['priority'] = (int)$row['priority'];
-			return $row;
-		}, $result->fetchAll());
-	}
-
-	/**
-	 * @param string $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
-	 * @param array $values
-	 */
-	public function add($table, array $values) {
-		$query = $this->dbc->getQueryBuilder();
-		$values = array_map(function ($value) use ($query) {
-			return $query->createNamedParameter($value);
-		}, $values);
-		$query->insert($table)->values($values);
-		$query->execute();
-	}
-
-	/**
-	 * returns the registered classes in the given table
-	 *
-	 * @param $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
-	 * @return string[]
-	 */
-	public function getClasses($table) {
-		$q = $this->dbc->getQueryBuilder();
-		$resultStatement = $q->select('class')
-			->from($table)
-			->execute();
-		$data = $resultStatement->fetchAll();
-		$resultStatement->closeCursor();
-
-		return array_map(function ($row) {
-			return $row['class'];
-		}, $data);
-	}
-
-	/**
-	 * Check if a class is configured in the database
-	 *
-	 * @param string $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
-	 * @param string $className
-	 * @return bool
-	 */
-	public function has($table, $className) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->select('class')
-			->from($table)
-			->where($query->expr()->eq('class', $query->createNamedParameter($className)))
-			->setMaxResults(1);
-
-		$result = $query->execute();
-		$row = $result->fetch();
-		$result->closeCursor();
-
-		return (bool)$row;
-	}
-
-	/**
-	 * deletes an settings or admin entry from the given table
-	 *
-	 * @param $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
-	 * @param $className
-	 */
-	public function remove($table, $className) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->delete($table)
-			->where($query->expr()->eq('class', $query->createNamedParameter($className)));
-
-		$query->execute();
-	}
-
-	/**
-	 * @param $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
-	 * @param $idCol
-	 * @param $id
-	 * @param $values
-	 */
-	public function update($table, $idCol, $id, $values) {
-		$query = $this->dbc->getQueryBuilder();
-		$query->update($table);
-		foreach ($values as $key => $value) {
-			$query->set($key, $query->createNamedParameter($value));
-		}
-		$query
-			->where($query->expr()->eq($idCol, $query->createParameter($idCol)))
-			->setParameter($idCol, $id)
-			->execute();
-	}
+    const TABLE_ADMIN_SETTINGS = 'admin_settings';
+    const TABLE_ADMIN_SECTIONS = 'admin_sections';
+
+    /** @var IDBConnection */
+    private $dbc;
+
+    /**
+     * @param IDBConnection $dbc
+     */
+    public function __construct(IDBConnection $dbc) {
+        $this->dbc = $dbc;
+    }
+
+    /**
+     * Get the configured admin settings from the database for the provided section
+     *
+     * @param string $section
+     * @return array[] [['class' => string, 'priority' => int], ...]
+     */
+    public function getAdminSettingsFromDB($section) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->select(['class', 'priority'])
+            ->from(self::TABLE_ADMIN_SETTINGS)
+            ->where($query->expr()->eq('section', $this->dbc->getQueryBuilder()->createParameter('section')))
+            ->setParameter('section', $section);
+
+        $result = $query->execute();
+        return $result->fetchAll();
+    }
+
+    /**
+     * Get the configured admin sections from the database
+     *
+     * @return array[] [['class' => string, 'priority' => int], ...]
+     */
+    public function getAdminSectionsFromDB() {
+        $query = $this->dbc->getQueryBuilder();
+        $query->selectDistinct('s.class')
+            ->addSelect('s.priority')
+            ->from(self::TABLE_ADMIN_SECTIONS, 's')
+            ->from(self::TABLE_ADMIN_SETTINGS, 'f')
+            ->where($query->expr()->eq('s.id', 'f.section'));
+        $result = $query->execute();
+        return array_map(function ($row) {
+            $row['priority'] = (int)$row['priority'];
+            return $row;
+        }, $result->fetchAll());
+    }
+
+    /**
+     * @param string $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
+     * @param array $values
+     */
+    public function add($table, array $values) {
+        $query = $this->dbc->getQueryBuilder();
+        $values = array_map(function ($value) use ($query) {
+            return $query->createNamedParameter($value);
+        }, $values);
+        $query->insert($table)->values($values);
+        $query->execute();
+    }
+
+    /**
+     * returns the registered classes in the given table
+     *
+     * @param $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
+     * @return string[]
+     */
+    public function getClasses($table) {
+        $q = $this->dbc->getQueryBuilder();
+        $resultStatement = $q->select('class')
+            ->from($table)
+            ->execute();
+        $data = $resultStatement->fetchAll();
+        $resultStatement->closeCursor();
+
+        return array_map(function ($row) {
+            return $row['class'];
+        }, $data);
+    }
+
+    /**
+     * Check if a class is configured in the database
+     *
+     * @param string $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
+     * @param string $className
+     * @return bool
+     */
+    public function has($table, $className) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->select('class')
+            ->from($table)
+            ->where($query->expr()->eq('class', $query->createNamedParameter($className)))
+            ->setMaxResults(1);
+
+        $result = $query->execute();
+        $row = $result->fetch();
+        $result->closeCursor();
+
+        return (bool)$row;
+    }
+
+    /**
+     * deletes an settings or admin entry from the given table
+     *
+     * @param $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
+     * @param $className
+     */
+    public function remove($table, $className) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->delete($table)
+            ->where($query->expr()->eq('class', $query->createNamedParameter($className)));
+
+        $query->execute();
+    }
+
+    /**
+     * @param $table Mapper::TABLE_ADMIN_SECTIONS or Mapper::TABLE_ADMIN_SETTINGS
+     * @param $idCol
+     * @param $id
+     * @param $values
+     */
+    public function update($table, $idCol, $id, $values) {
+        $query = $this->dbc->getQueryBuilder();
+        $query->update($table);
+        foreach ($values as $key => $value) {
+            $query->set($key, $query->createNamedParameter($value));
+        }
+        $query
+            ->where($query->expr()->eq($idCol, $query->createParameter($idCol)))
+            ->setParameter($idCol, $id)
+            ->execute();
+    }
 
 }

lib/private/Settings/Admin/Encryption.php

Indentation +52 added lines, -52 removed lines

@@ -29,63 +29,63 @@
 use OCP\Settings\ISettings;
 
 class Encryption implements ISettings {
-	/** @var IManager */
-	private $manager;
+    /** @var IManager */
+    private $manager;
 
-	/** @var IUserManager */
-	private $userManager;
+    /** @var IUserManager */
+    private $userManager;
 
-	/**
-	 * @param IManager $manager
-	 * @param IUserManager $userManager
-	 */
-	public function __construct(IManager $manager, IUserManager $userManager) {
-		$this->manager = $manager;
-		$this->userManager = $userManager;
-	}
+    /**
+     * @param IManager $manager
+     * @param IUserManager $userManager
+     */
+    public function __construct(IManager $manager, IUserManager $userManager) {
+        $this->manager = $manager;
+        $this->userManager = $userManager;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$encryptionModules = $this->manager->getEncryptionModules();
-		$defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
-		$encryptionModuleList = [];
-		foreach ($encryptionModules as $module) {
-			$encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
-			$encryptionModuleList[$module['id']]['default'] = false;
-			if ($module['id'] === $defaultEncryptionModuleId) {
-				$encryptionModuleList[$module['id']]['default'] = true;
-			}
-		}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $encryptionModules = $this->manager->getEncryptionModules();
+        $defaultEncryptionModuleId = $this->manager->getDefaultEncryptionModuleId();
+        $encryptionModuleList = [];
+        foreach ($encryptionModules as $module) {
+            $encryptionModuleList[$module['id']]['displayName'] = $module['displayName'];
+            $encryptionModuleList[$module['id']]['default'] = false;
+            if ($module['id'] === $defaultEncryptionModuleId) {
+                $encryptionModuleList[$module['id']]['default'] = true;
+            }
+        }
 
-		$parameters = [
-			// Encryption API
-			'encryptionEnabled'       => $this->manager->isEnabled(),
-			'encryptionReady'         => $this->manager->isReady(),
-			'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
-			// Modules
-			'encryptionModules'       => $encryptionModuleList,
-		];
+        $parameters = [
+            // Encryption API
+            'encryptionEnabled'       => $this->manager->isEnabled(),
+            'encryptionReady'         => $this->manager->isReady(),
+            'externalBackendsEnabled' => count($this->userManager->getBackends()) > 1,
+            // Modules
+            'encryptionModules'       => $encryptionModuleList,
+        ];
 
-		return new TemplateResponse('settings', 'admin/encryption', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'admin/encryption', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'encryption';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'encryption';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
 }

lib/private/Settings/Admin/ServerDevNotice.php

Indentation +22 added lines, -22 removed lines

@@ -35,28 +35,28 @@
 use OCP\Settings\ISettings;
 
 class ServerDevNotice implements ISettings {
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		return new TemplateResponse('settings', 'admin/server.development.notice');
-	}
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        return new TemplateResponse('settings', 'admin/server.development.notice');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'server';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'server';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 1000;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 1000;
+    }
 }

lib/private/Settings/Admin/TipsTricks.php

Indentation +34 added lines, -34 removed lines

@@ -28,44 +28,44 @@
 use OCP\Settings\ISettings;
 
 class TipsTricks implements ISettings {
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	/**
-	 * @param IConfig $config
-	 */
-	public function __construct(IConfig $config) {
-		$this->config = $config;
-	}
+    /**
+     * @param IConfig $config
+     */
+    public function __construct(IConfig $config) {
+        $this->config = $config;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$databaseOverload = (strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false);
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $databaseOverload = (strpos($this->config->getSystemValue('dbtype'), 'sqlite') !== false);
 
-		$parameters = [
-			'databaseOverload' => $databaseOverload,
-		];
+        $parameters = [
+            'databaseOverload' => $databaseOverload,
+        ];
 
-		return new TemplateResponse('settings', 'admin/tipstricks', $parameters, '');
-	}
+        return new TemplateResponse('settings', 'admin/tipstricks', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'tips-tricks';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'tips-tricks';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 0;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 0;
+    }
 }

lib/private/Settings/RemoveOrphaned.php

Indentation +43 added lines, -43 removed lines

@@ -36,56 +36,56 @@
  */
 class RemoveOrphaned extends TimedJob {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	/** @var ILogger */
-	private $logger;
+    /** @var ILogger */
+    private $logger;
 
-	/** @var Manager */
-	private $manager;
+    /** @var Manager */
+    private $manager;
 
-	public function __construct(Manager $manager = null) {
-		if($manager !== null) {
-			$this->manager = $manager;
-		} else {
-			// fix DI for Jobs
-			$this->manager = \OC::$server->getSettingsManager();
-		}
-	}
+    public function __construct(Manager $manager = null) {
+        if($manager !== null) {
+            $this->manager = $manager;
+        } else {
+            // fix DI for Jobs
+            $this->manager = \OC::$server->getSettingsManager();
+        }
+    }
 
-	/**
-	 * run the job, then remove it from the job list
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-		// add an interval of 15 mins
-		$this->setInterval(15*60);
+    /**
+     * run the job, then remove it from the job list
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+        // add an interval of 15 mins
+        $this->setInterval(15*60);
 
-		$this->jobList = $jobList;
-		$this->logger = $logger;
-		parent::execute($jobList, $logger);
-	}
+        $this->jobList = $jobList;
+        $this->logger = $logger;
+        parent::execute($jobList, $logger);
+    }
 
-	/**
-	 * @param array $argument
-	 * @throws \Exception
-	 * @throws \OC\NeedsUpdateException
-	 */
-	protected function run($argument) {
-		try {
-			\OC_App::loadApps();
-		} catch (NeedsUpdateException $ex) {
-			// only run when apps are up to date
-			return;
-		}
+    /**
+     * @param array $argument
+     * @throws \Exception
+     * @throws \OC\NeedsUpdateException
+     */
+    protected function run($argument) {
+        try {
+            \OC_App::loadApps();
+        } catch (NeedsUpdateException $ex) {
+            // only run when apps are up to date
+            return;
+        }
 
-		$this->manager->checkForOrphanedClassNames();
+        $this->manager->checkForOrphanedClassNames();
 
-		// remove the job once executed successfully
-		$this->jobList->remove($this);
-	}
+        // remove the job once executed successfully
+        $this->jobList->remove($this);
+    }
 
 }

lib/private/Streamer.php

Indentation +91 added lines, -91 removed lines

@@ -28,105 +28,105 @@
 use ZipStreamer\ZipStreamer;
 
 class Streamer {
-	// array of regexp. Matching user agents will get tar instead of zip
-	private $preferTarFor = [ '/macintosh|mac os x/i' ];
+    // array of regexp. Matching user agents will get tar instead of zip
+    private $preferTarFor = [ '/macintosh|mac os x/i' ];
 
-	// streamer instance
-	private $streamerInstance;
+    // streamer instance
+    private $streamerInstance;
 	
-	public function __construct(){
-		/** @var \OCP\IRequest */
-		$request = \OC::$server->getRequest();
+    public function __construct(){
+        /** @var \OCP\IRequest */
+        $request = \OC::$server->getRequest();
 		
-		if ($request->isUserAgent($this->preferTarFor)) {
-			$this->streamerInstance = new TarStreamer();
-		} else {
-			$this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
-		}
-	}
+        if ($request->isUserAgent($this->preferTarFor)) {
+            $this->streamerInstance = new TarStreamer();
+        } else {
+            $this->streamerInstance = new ZipStreamer(['zip64' => PHP_INT_SIZE !== 4]);
+        }
+    }
 	
-	/**
-	 * Send HTTP headers
-	 * @param string $name 
-	 */
-	public function sendHeaders($name){
-		$extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
-		$fullName = $name . $extension;
-		$this->streamerInstance->sendHeaders($fullName);
-	}
+    /**
+     * Send HTTP headers
+     * @param string $name 
+     */
+    public function sendHeaders($name){
+        $extension = $this->streamerInstance instanceof ZipStreamer ? '.zip' : '.tar';
+        $fullName = $name . $extension;
+        $this->streamerInstance->sendHeaders($fullName);
+    }
 	
-	/**
-	 * Stream directory recursively
-	 * @param string $dir
-	 * @param string $internalDir
-	 */
-	public function addDirRecursive($dir, $internalDir='') {
-		$dirname = basename($dir);
-		$rootDir = $internalDir . $dirname;
-		if (!empty($rootDir)) {
-			$this->streamerInstance->addEmptyDir($rootDir);
-		}
-		$internalDir .= $dirname . '/';
-		// prevent absolute dirs
-		$internalDir = ltrim($internalDir, '/');
+    /**
+     * Stream directory recursively
+     * @param string $dir
+     * @param string $internalDir
+     */
+    public function addDirRecursive($dir, $internalDir='') {
+        $dirname = basename($dir);
+        $rootDir = $internalDir . $dirname;
+        if (!empty($rootDir)) {
+            $this->streamerInstance->addEmptyDir($rootDir);
+        }
+        $internalDir .= $dirname . '/';
+        // prevent absolute dirs
+        $internalDir = ltrim($internalDir, '/');
 
-		$files= \OC\Files\Filesystem::getDirectoryContent($dir);
-		foreach($files as $file) {
-			$filename = $file['name'];
-			$file = $dir . '/' . $filename;
-			if(\OC\Files\Filesystem::is_file($file)) {
-				$filesize = \OC\Files\Filesystem::filesize($file);
-				$fileTime = \OC\Files\Filesystem::filemtime($file);
-				$fh = \OC\Files\Filesystem::fopen($file, 'r');
-				$this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
-				fclose($fh);
-			}elseif(\OC\Files\Filesystem::is_dir($file)) {
-				$this->addDirRecursive($file, $internalDir);
-			}
-		}
-	}
+        $files= \OC\Files\Filesystem::getDirectoryContent($dir);
+        foreach($files as $file) {
+            $filename = $file['name'];
+            $file = $dir . '/' . $filename;
+            if(\OC\Files\Filesystem::is_file($file)) {
+                $filesize = \OC\Files\Filesystem::filesize($file);
+                $fileTime = \OC\Files\Filesystem::filemtime($file);
+                $fh = \OC\Files\Filesystem::fopen($file, 'r');
+                $this->addFileFromStream($fh, $internalDir . $filename, $filesize, $fileTime);
+                fclose($fh);
+            }elseif(\OC\Files\Filesystem::is_dir($file)) {
+                $this->addDirRecursive($file, $internalDir);
+            }
+        }
+    }
 	
-	/**
-	 * Add a file to the archive at the specified location and file name.
-	 *
-	 * @param string $stream Stream to read data from
-	 * @param string $internalName Filepath and name to be used in the archive.
-	 * @param int $size Filesize
-	 * @param int|bool $time File mtime as int, or false
-	 * @return bool $success
-	 */
-	public function addFileFromStream($stream, $internalName, $size, $time) {
-		$options = [];
-		if ($time) {
-			$options = [
-				'timestamp' => $time
-			];
-		}
+    /**
+     * Add a file to the archive at the specified location and file name.
+     *
+     * @param string $stream Stream to read data from
+     * @param string $internalName Filepath and name to be used in the archive.
+     * @param int $size Filesize
+     * @param int|bool $time File mtime as int, or false
+     * @return bool $success
+     */
+    public function addFileFromStream($stream, $internalName, $size, $time) {
+        $options = [];
+        if ($time) {
+            $options = [
+                'timestamp' => $time
+            ];
+        }
 
-		if ($this->streamerInstance instanceof ZipStreamer) {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
-		} else {
-			return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
-		}
-	}
+        if ($this->streamerInstance instanceof ZipStreamer) {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $options);
+        } else {
+            return $this->streamerInstance->addFileFromStream($stream, $internalName, $size, $options);
+        }
+    }
 
-	/**
-	 * Add an empty directory entry to the archive.
-	 *
-	 * @param string $dirName Directory Path and name to be added to the archive.
-	 * @return bool $success
-	 */
-	public function addEmptyDir($dirName){
-		return $this->streamerInstance->addEmptyDir($dirName);
-	}
+    /**
+     * Add an empty directory entry to the archive.
+     *
+     * @param string $dirName Directory Path and name to be added to the archive.
+     * @return bool $success
+     */
+    public function addEmptyDir($dirName){
+        return $this->streamerInstance->addEmptyDir($dirName);
+    }
 
-	/**
-	 * Close the archive.
-	 * A closed archive can no longer have new files added to it. After
-	 * closing, the file is completely written to the output stream.
-	 * @return bool $success
-	 */
-	public function finalize(){
-		return $this->streamerInstance->finalize();
-	}
+    /**
+     * Close the archive.
+     * A closed archive can no longer have new files added to it. After
+     * closing, the file is completely written to the output stream.
+     * @return bool $success
+     */
+    public function finalize(){
+        return $this->streamerInstance->finalize();
+    }
 }

lib/private/Memcache/Factory.php

Indentation +154 added lines, -154 removed lines

@@ -34,158 +34,158 @@
 use \OCP\ILogger;
 
 class Factory implements ICacheFactory {
-	const NULL_CACHE = '\\OC\\Memcache\\NullCache';
-
-	/**
-	 * @var string $globalPrefix
-	 */
-	private $globalPrefix;
-
-	/**
-	 * @var ILogger $logger
-	 */
-	private $logger;
-
-	/**
-	 * @var string $localCacheClass
-	 */
-	private $localCacheClass;
-
-	/**
-	 * @var string $distributedCacheClass
-	 */
-	private $distributedCacheClass;
-
-	/**
-	 * @var string $lockingCacheClass
-	 */
-	private $lockingCacheClass;
-
-	/**
-	 * @param string $globalPrefix
-	 * @param ILogger $logger
-	 * @param string|null $localCacheClass
-	 * @param string|null $distributedCacheClass
-	 * @param string|null $lockingCacheClass
-	 */
-	public function __construct($globalPrefix, ILogger $logger,
-		$localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null)
-	{
-		$this->logger = $logger;
-		$this->globalPrefix = $globalPrefix;
-
-		if (!$localCacheClass) {
-			$localCacheClass = self::NULL_CACHE;
-		}
-		if (!$distributedCacheClass) {
-			$distributedCacheClass = $localCacheClass;
-		}
-
-		$missingCacheMessage = 'Memcache {class} not available for {use} cache';
-		$missingCacheHint = 'Is the matching PHP module installed and enabled?';
-		if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) {
-			if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-				// CLI should not hard-fail on broken memcache
-				$this->logger->info($missingCacheMessage, [
-					'class' => $localCacheClass,
-					'use' => 'local',
-					'app' => 'cli'
-				]);
-				$localCacheClass = self::NULL_CACHE;
-			} else {
-				throw new \OC\HintException(strtr($missingCacheMessage, [
-					'{class}' => $localCacheClass, '{use}' => 'local'
-				]), $missingCacheHint);
-			}
-		}
-		if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) {
-			if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
-				// CLI should not hard-fail on broken memcache
-				$this->logger->info($missingCacheMessage, [
-					'class' => $distributedCacheClass,
-					'use' => 'distributed',
-					'app' => 'cli'
-				]);
-				$distributedCacheClass = self::NULL_CACHE;
-			} else {
-				throw new \OC\HintException(strtr($missingCacheMessage, [
-					'{class}' => $distributedCacheClass, '{use}' => 'distributed'
-				]), $missingCacheHint);
-			}
-		}
-		if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {
-			// don't fallback since the fallback might not be suitable for storing lock
-			$lockingCacheClass = self::NULL_CACHE;
-		}
-
-		$this->localCacheClass = $localCacheClass;
-		$this->distributedCacheClass = $distributedCacheClass;
-		$this->lockingCacheClass = $lockingCacheClass;
-	}
-
-	/**
-	 * create a cache instance for storing locks
-	 *
-	 * @param string $prefix
-	 * @return \OCP\IMemcache
-	 */
-	public function createLocking($prefix = '') {
-		return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * create a distributed cache instance
-	 *
-	 * @param string $prefix
-	 * @return \OC\Memcache\Cache
-	 */
-	public function createDistributed($prefix = '') {
-		return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * create a local cache instance
-	 *
-	 * @param string $prefix
-	 * @return \OC\Memcache\Cache
-	 */
-	public function createLocal($prefix = '') {
-		return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
-	}
-
-	/**
-	 * @see \OC\Memcache\Factory::createDistributed()
-	 * @param string $prefix
-	 * @return \OC\Memcache\Cache
-	 */
-	public function create($prefix = '') {
-		return $this->createDistributed($prefix);
-	}
-
-	/**
-	 * check memcache availability
-	 *
-	 * @return bool
-	 */
-	public function isAvailable() {
-		return ($this->distributedCacheClass !== self::NULL_CACHE);
-	}
-
-	/**
-	 * @see \OC\Memcache\Factory::createLocal()
-	 * @param string $prefix
-	 * @return Cache
-	 */
-	public function createLowLatency($prefix = '') {
-		return $this->createLocal($prefix);
-	}
-
-	/**
-	 * check local memcache availability
-	 *
-	 * @return bool
-	 */
-	public function isAvailableLowLatency() {
-		return ($this->localCacheClass !== self::NULL_CACHE);
-	}
+    const NULL_CACHE = '\\OC\\Memcache\\NullCache';
+
+    /**
+     * @var string $globalPrefix
+     */
+    private $globalPrefix;
+
+    /**
+     * @var ILogger $logger
+     */
+    private $logger;
+
+    /**
+     * @var string $localCacheClass
+     */
+    private $localCacheClass;
+
+    /**
+     * @var string $distributedCacheClass
+     */
+    private $distributedCacheClass;
+
+    /**
+     * @var string $lockingCacheClass
+     */
+    private $lockingCacheClass;
+
+    /**
+     * @param string $globalPrefix
+     * @param ILogger $logger
+     * @param string|null $localCacheClass
+     * @param string|null $distributedCacheClass
+     * @param string|null $lockingCacheClass
+     */
+    public function __construct($globalPrefix, ILogger $logger,
+        $localCacheClass = null, $distributedCacheClass = null, $lockingCacheClass = null)
+    {
+        $this->logger = $logger;
+        $this->globalPrefix = $globalPrefix;
+
+        if (!$localCacheClass) {
+            $localCacheClass = self::NULL_CACHE;
+        }
+        if (!$distributedCacheClass) {
+            $distributedCacheClass = $localCacheClass;
+        }
+
+        $missingCacheMessage = 'Memcache {class} not available for {use} cache';
+        $missingCacheHint = 'Is the matching PHP module installed and enabled?';
+        if (!class_exists($localCacheClass) || !$localCacheClass::isAvailable()) {
+            if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+                // CLI should not hard-fail on broken memcache
+                $this->logger->info($missingCacheMessage, [
+                    'class' => $localCacheClass,
+                    'use' => 'local',
+                    'app' => 'cli'
+                ]);
+                $localCacheClass = self::NULL_CACHE;
+            } else {
+                throw new \OC\HintException(strtr($missingCacheMessage, [
+                    '{class}' => $localCacheClass, '{use}' => 'local'
+                ]), $missingCacheHint);
+            }
+        }
+        if (!class_exists($distributedCacheClass) || !$distributedCacheClass::isAvailable()) {
+            if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+                // CLI should not hard-fail on broken memcache
+                $this->logger->info($missingCacheMessage, [
+                    'class' => $distributedCacheClass,
+                    'use' => 'distributed',
+                    'app' => 'cli'
+                ]);
+                $distributedCacheClass = self::NULL_CACHE;
+            } else {
+                throw new \OC\HintException(strtr($missingCacheMessage, [
+                    '{class}' => $distributedCacheClass, '{use}' => 'distributed'
+                ]), $missingCacheHint);
+            }
+        }
+        if (!($lockingCacheClass && class_exists($distributedCacheClass) && $lockingCacheClass::isAvailable())) {
+            // don't fallback since the fallback might not be suitable for storing lock
+            $lockingCacheClass = self::NULL_CACHE;
+        }
+
+        $this->localCacheClass = $localCacheClass;
+        $this->distributedCacheClass = $distributedCacheClass;
+        $this->lockingCacheClass = $lockingCacheClass;
+    }
+
+    /**
+     * create a cache instance for storing locks
+     *
+     * @param string $prefix
+     * @return \OCP\IMemcache
+     */
+    public function createLocking($prefix = '') {
+        return new $this->lockingCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * create a distributed cache instance
+     *
+     * @param string $prefix
+     * @return \OC\Memcache\Cache
+     */
+    public function createDistributed($prefix = '') {
+        return new $this->distributedCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * create a local cache instance
+     *
+     * @param string $prefix
+     * @return \OC\Memcache\Cache
+     */
+    public function createLocal($prefix = '') {
+        return new $this->localCacheClass($this->globalPrefix . '/' . $prefix);
+    }
+
+    /**
+     * @see \OC\Memcache\Factory::createDistributed()
+     * @param string $prefix
+     * @return \OC\Memcache\Cache
+     */
+    public function create($prefix = '') {
+        return $this->createDistributed($prefix);
+    }
+
+    /**
+     * check memcache availability
+     *
+     * @return bool
+     */
+    public function isAvailable() {
+        return ($this->distributedCacheClass !== self::NULL_CACHE);
+    }
+
+    /**
+     * @see \OC\Memcache\Factory::createLocal()
+     * @param string $prefix
+     * @return Cache
+     */
+    public function createLowLatency($prefix = '') {
+        return $this->createLocal($prefix);
+    }
+
+    /**
+     * check local memcache availability
+     *
+     * @return bool
+     */
+    public function isAvailableLowLatency() {
+        return ($this->localCacheClass !== self::NULL_CACHE);
+    }
 }