nextcloud / server

core/Command/User/ResetPassword.php

Indentation +94 added lines, -94 removed lines

@@ -39,98 +39,98 @@
 
 class ResetPassword extends Command {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
-		parent::__construct();
-	}
-
-	protected function configure() {
-		$this
-			->setName('user:resetpassword')
-			->setDescription('Resets the password of the named user')
-			->addArgument(
-				'user',
-				InputArgument::REQUIRED,
-				'Username to reset password'
-			)
-			->addOption(
-				'password-from-env',
-				null,
-				InputOption::VALUE_NONE,
-				'read password from environment variable OC_PASS'
-			)
-		;
-	}
-
-	protected function execute(InputInterface $input, OutputInterface $output) {
-		$username = $input->getArgument('user');
-
-		/** @var $user \OCP\IUser */
-		$user = $this->userManager->get($username);
-		if (is_null($user)) {
-			$output->writeln('<error>User does not exist</error>');
-			return 1;
-		}
-
-		if ($input->getOption('password-from-env')) {
-			$password = getenv('OC_PASS');
-			if (!$password) {
-				$output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
-				return 1;
-			}
-		} elseif ($input->isInteractive()) {
-			/** @var QuestionHelper $helper */
-			$helper = $this->getHelper('question');
-
-			if (\OCP\App::isEnabled('encryption')) {
-				$output->writeln(
-					'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
-				);
-
-				$question = new ConfirmationQuestion('Do you want to continue?');
-				if (!$helper->ask($input, $output, $question)) {
-					return 1;
-				}
-			}
-
-			$question = new Question('Enter a new password: ');
-			$question->setHidden(true);
-			$password = $helper->ask($input, $output, $question);
-
-			if ($password === null) {
-				$output->writeln("<error>Password cannot be empty!</error>");
-				return 1;
-			}
-
-			$question = new Question('Confirm the new password: ');
-			$question->setHidden(true);
-			$confirm = $helper->ask($input, $output, $question);
-
-			if ($password !== $confirm) {
-				$output->writeln("<error>Passwords did not match!</error>");
-				return 1;
-			}
-		} else {
-			$output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
-			return 1;
-		}
-
-
-		try {
-			$success = $user->setPassword($password);
-		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
-			return 1;
-		}
-
-		if ($success) {
-			$output->writeln("<info>Successfully reset password for " . $username . "</info>");
-		} else {
-			$output->writeln("<error>Error while resetting password!</error>");
-			return 1;
-		}
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    public function __construct(IUserManager $userManager) {
+        $this->userManager = $userManager;
+        parent::__construct();
+    }
+
+    protected function configure() {
+        $this
+            ->setName('user:resetpassword')
+            ->setDescription('Resets the password of the named user')
+            ->addArgument(
+                'user',
+                InputArgument::REQUIRED,
+                'Username to reset password'
+            )
+            ->addOption(
+                'password-from-env',
+                null,
+                InputOption::VALUE_NONE,
+                'read password from environment variable OC_PASS'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output) {
+        $username = $input->getArgument('user');
+
+        /** @var $user \OCP\IUser */
+        $user = $this->userManager->get($username);
+        if (is_null($user)) {
+            $output->writeln('<error>User does not exist</error>');
+            return 1;
+        }
+
+        if ($input->getOption('password-from-env')) {
+            $password = getenv('OC_PASS');
+            if (!$password) {
+                $output->writeln('<error>--password-from-env given, but OC_PASS is empty!</error>');
+                return 1;
+            }
+        } elseif ($input->isInteractive()) {
+            /** @var QuestionHelper $helper */
+            $helper = $this->getHelper('question');
+
+            if (\OCP\App::isEnabled('encryption')) {
+                $output->writeln(
+                    '<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
+                );
+
+                $question = new ConfirmationQuestion('Do you want to continue?');
+                if (!$helper->ask($input, $output, $question)) {
+                    return 1;
+                }
+            }
+
+            $question = new Question('Enter a new password: ');
+            $question->setHidden(true);
+            $password = $helper->ask($input, $output, $question);
+
+            if ($password === null) {
+                $output->writeln("<error>Password cannot be empty!</error>");
+                return 1;
+            }
+
+            $question = new Question('Confirm the new password: ');
+            $question->setHidden(true);
+            $confirm = $helper->ask($input, $output, $question);
+
+            if ($password !== $confirm) {
+                $output->writeln("<error>Passwords did not match!</error>");
+                return 1;
+            }
+        } else {
+            $output->writeln("<error>Interactive input or --password-from-env is needed for entering a new password!</error>");
+            return 1;
+        }
+
+
+        try {
+            $success = $user->setPassword($password);
+        } catch (\Exception $e) {
+            $output->writeln('<error>' . $e->getMessage() . '</error>');
+            return 1;
+        }
+
+        if ($success) {
+            $output->writeln("<info>Successfully reset password for " . $username . "</info>");
+        } else {
+            $output->writeln("<error>Error while resetting password!</error>");
+            return 1;
+        }
+    }
 }

lib/private/Contacts/ContactsMenu/Entry.php

Indentation +136 added lines, -136 removed lines

@@ -29,141 +29,141 @@
 
 class Entry implements IEntry {
 
-	/** @var string|int|null */
-	private $id = null;
-
-	/** @var string */
-	private $fullName = '';
-
-	/** @var string[] */
-	private $emailAddresses = [];
-
-	/** @var string|null */
-	private $avatar;
-
-	/** @var IAction[] */
-	private $actions = [];
-
-	/** @var array */
-	private $properties = [];
-
-	/**
-	 * @param string $id
-	 */
-	public function setId($id) {
-		$this->id = $id;
-	}
-
-	/**
-	 * @param string $displayName
-	 */
-	public function setFullName($displayName) {
-		$this->fullName = $displayName;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getFullName() {
-		return $this->fullName;
-	}
-
-	/**
-	 * @param string $address
-	 */
-	public function addEMailAddress($address) {
-		$this->emailAddresses[] = $address;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getEMailAddresses() {
-		return $this->emailAddresses;
-	}
-
-	/**
-	 * @param string $avatar
-	 */
-	public function setAvatar($avatar) {
-		$this->avatar = $avatar;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAvatar() {
-		return $this->avatar;
-	}
-
-	/**
-	 * @param IAction $action
-	 */
-	public function addAction(IAction $action) {
-		$this->actions[] = $action;
-		$this->sortActions();
-	}
-
-	/**
-	 * @return IAction[]
-	 */
-	public function getActions() {
-		return $this->actions;
-	}
-
-	/**
-	 * sort the actions by priority and name
-	 */
-	private function sortActions() {
-		usort($this->actions, function(IAction $action1, IAction $action2) {
-			$prio1 = $action1->getPriority();
-			$prio2 = $action2->getPriority();
-
-			if ($prio1 === $prio2) {
-				// Ascending order for same priority
-				return strcasecmp($action1->getName(), $action2->getName());
-			}
-
-			// Descending order when priority differs
-			return $prio2 - $prio1;
-		});
-	}
-
-	/**
-	 * @param array $contact key-value array containing additional properties
-	 */
-	public function setProperties(array $contact) {
-		$this->properties = $contact;
-	}
-
-	/**
-	 * @param string $key
-	 * @return mixed
-	 */
-	public function getProperty($key) {
-		if (!isset($this->properties[$key])) {
-			return null;
-		}
-		return $this->properties[$key];
-	}
-
-	/**
-	 * @return array
-	 */
-	public function jsonSerialize() {
-		$topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
-		$otherActions = array_map(function(IAction $action) {
-			return $action->jsonSerialize();
-		}, array_slice($this->actions, 1));
-
-		return [
-			'id' => $this->id,
-			'fullName' => $this->fullName,
-			'avatar' => $this->getAvatar(),
-			'topAction' => $topAction,
-			'actions' => $otherActions,
-			'lastMessage' => '',
-		];
-	}
+    /** @var string|int|null */
+    private $id = null;
+
+    /** @var string */
+    private $fullName = '';
+
+    /** @var string[] */
+    private $emailAddresses = [];
+
+    /** @var string|null */
+    private $avatar;
+
+    /** @var IAction[] */
+    private $actions = [];
+
+    /** @var array */
+    private $properties = [];
+
+    /**
+     * @param string $id
+     */
+    public function setId($id) {
+        $this->id = $id;
+    }
+
+    /**
+     * @param string $displayName
+     */
+    public function setFullName($displayName) {
+        $this->fullName = $displayName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getFullName() {
+        return $this->fullName;
+    }
+
+    /**
+     * @param string $address
+     */
+    public function addEMailAddress($address) {
+        $this->emailAddresses[] = $address;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEMailAddresses() {
+        return $this->emailAddresses;
+    }
+
+    /**
+     * @param string $avatar
+     */
+    public function setAvatar($avatar) {
+        $this->avatar = $avatar;
+    }
+
+    /**
+     * @return string
+     */
+    public function getAvatar() {
+        return $this->avatar;
+    }
+
+    /**
+     * @param IAction $action
+     */
+    public function addAction(IAction $action) {
+        $this->actions[] = $action;
+        $this->sortActions();
+    }
+
+    /**
+     * @return IAction[]
+     */
+    public function getActions() {
+        return $this->actions;
+    }
+
+    /**
+     * sort the actions by priority and name
+     */
+    private function sortActions() {
+        usort($this->actions, function(IAction $action1, IAction $action2) {
+            $prio1 = $action1->getPriority();
+            $prio2 = $action2->getPriority();
+
+            if ($prio1 === $prio2) {
+                // Ascending order for same priority
+                return strcasecmp($action1->getName(), $action2->getName());
+            }
+
+            // Descending order when priority differs
+            return $prio2 - $prio1;
+        });
+    }
+
+    /**
+     * @param array $contact key-value array containing additional properties
+     */
+    public function setProperties(array $contact) {
+        $this->properties = $contact;
+    }
+
+    /**
+     * @param string $key
+     * @return mixed
+     */
+    public function getProperty($key) {
+        if (!isset($this->properties[$key])) {
+            return null;
+        }
+        return $this->properties[$key];
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize() {
+        $topAction = !empty($this->actions) ? $this->actions[0]->jsonSerialize() : null;
+        $otherActions = array_map(function(IAction $action) {
+            return $action->jsonSerialize();
+        }, array_slice($this->actions, 1));
+
+        return [
+            'id' => $this->id,
+            'fullName' => $this->fullName,
+            'avatar' => $this->getAvatar(),
+            'topAction' => $topAction,
+            'actions' => $otherActions,
+            'lastMessage' => '',
+        ];
+    }
 
 }

lib/public/Contacts/ContactsMenu/IEntry.php

Indentation +28 added lines, -28 removed lines

@@ -31,36 +31,36 @@
  */
 interface IEntry extends JsonSerializable {
 
-	/**
-	 * @since 12.0
-	 * @return string
-	 */
-	public function getFullName();
+    /**
+     * @since 12.0
+     * @return string
+     */
+    public function getFullName();
 
-	/**
-	 * @since 12.0
-	 * @return string[]
-	 */
-	public function getEMailAddresses();
+    /**
+     * @since 12.0
+     * @return string[]
+     */
+    public function getEMailAddresses();
 
-	/**
-	 * @since 12.0
-	 * @return string|null image URI
-	 */
-	public function getAvatar();
+    /**
+     * @since 12.0
+     * @return string|null image URI
+     */
+    public function getAvatar();
 
-	/**
-	 * @since 12.0
-	 * @param IAction $action an action to show in the contacts menu
-	 */
-	public function addAction(IAction $action);
+    /**
+     * @since 12.0
+     * @param IAction $action an action to show in the contacts menu
+     */
+    public function addAction(IAction $action);
 
-	/**
-	 * Get an arbitrary property from the contact
-	 *
-	 * @since 12.0
-	 * @param string $key
-	 * @return mixed the value of the property or null
-	 */
-	public function getProperty($key);
+    /**
+     * Get an arbitrary property from the contact
+     *
+     * @since 12.0
+     * @param string $key
+     * @return mixed the value of the property or null
+     */
+    public function getProperty($key);
 }

apps/dav/lib/Avatars/RootCollection.php

Indentation +17 added lines, -17 removed lines

@@ -7,23 +7,23 @@
 
 class RootCollection extends AbstractPrincipalCollection {
 
-	/**
-	 * This method returns a node for a principal.
-	 *
-	 * The passed array contains principal information, and is guaranteed to
-	 * at least contain a uri item. Other properties may or may not be
-	 * supplied by the authentication backend.
-	 *
-	 * @param array $principalInfo
-	 * @return AvatarHome
-	 */
-	public function getChildForPrincipal(array $principalInfo) {
-		$avatarManager = \OC::$server->getAvatarManager();
-		return new AvatarHome($principalInfo, $avatarManager);
-	}
+    /**
+     * This method returns a node for a principal.
+     *
+     * The passed array contains principal information, and is guaranteed to
+     * at least contain a uri item. Other properties may or may not be
+     * supplied by the authentication backend.
+     *
+     * @param array $principalInfo
+     * @return AvatarHome
+     */
+    public function getChildForPrincipal(array $principalInfo) {
+        $avatarManager = \OC::$server->getAvatarManager();
+        return new AvatarHome($principalInfo, $avatarManager);
+    }
 
-	public function getName() {
-		return 'avatars';
-	}
+    public function getName() {
+        return 'avatars';
+    }
 
 }

apps/dav/lib/Migration/CalDAVRemoveEmptyValue.php

Indentation +83 added lines, -83 removed lines

@@ -33,87 +33,87 @@
 
 class CalDAVRemoveEmptyValue implements IRepairStep {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var ILogger */
-	private $logger;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param CalDavBackend $calDavBackend
-	 * @param ILogger $logger
-	 */
-	public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
-	}
-
-	public function getName() {
-		return 'Fix broken values of calendar objects';
-	}
-
-	public function run(IOutput $output) {
-		$pattern = ';VALUE=:';
-		$count = $warnings = 0;
-
-		$objects = $this->getInvalidObjects($pattern);
-
-		$output->startProgress(count($objects));
-		foreach ($objects as $row) {
-			$calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
-			$data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
-
-			if ($data !== $calObject['calendardata']) {
-				$output->advance();
-
-				try {
-					$this->calDavBackend->getDenormalizedData($data);
-				} catch (InvalidDataException $e) {
-					$this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
-						'app' => 'dav',
-						'cal' => (int)$row['calendarid'],
-						'uri' => $row['uri'],
-					]);
-					$warnings++;
-					continue;
-				}
-
-				$this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
-				$count++;
-			}
-		}
-		$output->finishProgress();
-
-		if ($warnings > 0) {
-			$output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
-		}
-		if ($count > 0) {
-			$output->info(sprintf('Updated %d events', $count));
-		}
-	}
-
-	protected function getInvalidObjects($pattern) {
-		$query = $this->db->getQueryBuilder();
-		$query->select(['calendarid', 'uri'])
-			->from('calendarobjects')
-			->where($query->expr()->like(
-				'calendardata',
-				$query->createNamedParameter(
-					'%' . $this->db->escapeLikeParameter($pattern) . '%',
-					IQueryBuilder::PARAM_STR
-				),
-				IQueryBuilder::PARAM_STR
-			));
-
-		$result = $query->execute();
-		$rows = $result->fetchAll();
-		$result->closeCursor();
-
-		return $rows;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var ILogger */
+    private $logger;
+
+    /**
+     * @param IDBConnection $db
+     * @param CalDavBackend $calDavBackend
+     * @param ILogger $logger
+     */
+    public function __construct(IDBConnection $db, CalDavBackend $calDavBackend, ILogger $logger) {
+        $this->db = $db;
+        $this->calDavBackend = $calDavBackend;
+        $this->logger = $logger;
+    }
+
+    public function getName() {
+        return 'Fix broken values of calendar objects';
+    }
+
+    public function run(IOutput $output) {
+        $pattern = ';VALUE=:';
+        $count = $warnings = 0;
+
+        $objects = $this->getInvalidObjects($pattern);
+
+        $output->startProgress(count($objects));
+        foreach ($objects as $row) {
+            $calObject = $this->calDavBackend->getCalendarObject((int)$row['calendarid'], $row['uri']);
+            $data = preg_replace('/' . $pattern . '/', ':', $calObject['calendardata']);
+
+            if ($data !== $calObject['calendardata']) {
+                $output->advance();
+
+                try {
+                    $this->calDavBackend->getDenormalizedData($data);
+                } catch (InvalidDataException $e) {
+                    $this->logger->info('Calendar object for calendar {cal} with uri {uri} still invalid', [
+                        'app' => 'dav',
+                        'cal' => (int)$row['calendarid'],
+                        'uri' => $row['uri'],
+                    ]);
+                    $warnings++;
+                    continue;
+                }
+
+                $this->calDavBackend->updateCalendarObject((int)$row['calendarid'], $row['uri'], $data);
+                $count++;
+            }
+        }
+        $output->finishProgress();
+
+        if ($warnings > 0) {
+            $output->warning(sprintf('%d events could not be updated, see log file for more information', $warnings));
+        }
+        if ($count > 0) {
+            $output->info(sprintf('Updated %d events', $count));
+        }
+    }
+
+    protected function getInvalidObjects($pattern) {
+        $query = $this->db->getQueryBuilder();
+        $query->select(['calendarid', 'uri'])
+            ->from('calendarobjects')
+            ->where($query->expr()->like(
+                'calendardata',
+                $query->createNamedParameter(
+                    '%' . $this->db->escapeLikeParameter($pattern) . '%',
+                    IQueryBuilder::PARAM_STR
+                ),
+                IQueryBuilder::PARAM_STR
+            ));
+
+        $result = $query->execute();
+        $rows = $result->fetchAll();
+        $result->closeCursor();
+
+        return $rows;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/CompFilter.php

Indentation +14 added lines, -14 removed lines

@@ -27,21 +27,21 @@
 
 class CompFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$att = $reader->parseAttributes();
-		$componentName = $att['name'];
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $att = $reader->parseAttributes();
+        $componentName = $att['name'];
 
-		$reader->parseInnerTree();
+        $reader->parseInnerTree();
 
-		if (!is_string($componentName)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}comp-filter requires a valid name attribute');
-		}
+        if (!is_string($componentName)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}comp-filter requires a valid name attribute');
+        }
 
-		return $componentName;
-	}
+        return $componentName;
+    }
 }

apps/dav/lib/CalDAV/Search/Xml/Filter/PropFilter.php

Indentation +14 added lines, -14 removed lines

@@ -27,21 +27,21 @@
 
 class PropFilter implements XmlDeserializable {
 
-	/**
-	 * @param Reader $reader
-	 * @throws BadRequest
-	 * @return string
-	 */
-	static function xmlDeserialize(Reader $reader) {
-		$att = $reader->parseAttributes();
-		$componentName = $att['name'];
+    /**
+     * @param Reader $reader
+     * @throws BadRequest
+     * @return string
+     */
+    static function xmlDeserialize(Reader $reader) {
+        $att = $reader->parseAttributes();
+        $componentName = $att['name'];
 
-		$reader->parseInnerTree();
+        $reader->parseInnerTree();
 
-		if (!is_string($componentName)) {
-			throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
-		}
+        if (!is_string($componentName)) {
+            throw new BadRequest('The {' . SearchPlugin::NS_Nextcloud . '}prop-filter requires a valid name attribute');
+        }
 
-		return $componentName;
-	}
+        return $componentName;
+    }
 }

apps/dav/lib/Avatars/AvatarNode.php

Indentation +59 added lines, -59 removed lines

@@ -27,72 +27,72 @@
 use Sabre\DAV\File;
 
 class AvatarNode extends File {
-	private $ext;
-	private $size;
-	private $avatar;
+    private $ext;
+    private $size;
+    private $avatar;
 
-	/**
-	 * AvatarNode constructor.
-	 *
-	 * @param integer $size
-	 * @param string $ext
-	 * @param IAvatar $avatar
-	 */
-	public function __construct($size, $ext, $avatar) {
-		$this->size = $size;
-		$this->ext = $ext;
-		$this->avatar = $avatar;
-	}
+    /**
+     * AvatarNode constructor.
+     *
+     * @param integer $size
+     * @param string $ext
+     * @param IAvatar $avatar
+     */
+    public function __construct($size, $ext, $avatar) {
+        $this->size = $size;
+        $this->ext = $ext;
+        $this->avatar = $avatar;
+    }
 
-	/**
-	 * Returns the name of the node.
-	 *
-	 * This is used to generate the url.
-	 *
-	 * @return string
-	 */
-	public function getName() {
-		return "$this->size.$this->ext";
-	}
+    /**
+     * Returns the name of the node.
+     *
+     * This is used to generate the url.
+     *
+     * @return string
+     */
+    public function getName() {
+        return "$this->size.$this->ext";
+    }
 
-	public function get() {
-		$image = $this->avatar->get($this->size);
-		$res = $image->resource();
+    public function get() {
+        $image = $this->avatar->get($this->size);
+        $res = $image->resource();
 
-		ob_start();
-		if ($this->ext === 'png') {
-			imagepng($res);
-		} else {
-			imagejpeg($res);
-		}
+        ob_start();
+        if ($this->ext === 'png') {
+            imagepng($res);
+        } else {
+            imagejpeg($res);
+        }
 
-		return ob_get_clean();
-	}
+        return ob_get_clean();
+    }
 
-	/**
-	 * Returns the mime-type for a file
-	 *
-	 * If null is returned, we'll assume application/octet-stream
-	 *
-	 * @return string|null
-	 */
-	public function getContentType() {
-		if ($this->ext === 'png') {
-			return 'image/png';
-		}
-		return 'image/jpeg';
-	}
+    /**
+     * Returns the mime-type for a file
+     *
+     * If null is returned, we'll assume application/octet-stream
+     *
+     * @return string|null
+     */
+    public function getContentType() {
+        if ($this->ext === 'png') {
+            return 'image/png';
+        }
+        return 'image/jpeg';
+    }
 
-	public function getETag() {
-		return $this->avatar->getFile($this->size)->getEtag();
-	}
+    public function getETag() {
+        return $this->avatar->getFile($this->size)->getEtag();
+    }
 
-	public function getLastModified() {
-		$timestamp = $this->avatar->getFile($this->size)->getMTime();
-		if (!empty($timestamp)) {
-			return (int)$timestamp;
-		}
-		return $timestamp;
+    public function getLastModified() {
+        $timestamp = $this->avatar->getFile($this->size)->getMTime();
+        if (!empty($timestamp)) {
+            return (int)$timestamp;
+        }
+        return $timestamp;
 
-	}
+    }
 }

lib/private/Cache/CappedMemoryCache.php

Indentation +62 added lines, -62 removed lines

@@ -31,66 +31,66 @@
  */
 class CappedMemoryCache implements ICache, \ArrayAccess {
 
-	private $capacity;
-	private $cache = [];
-
-	public function __construct($capacity = 512) {
-		$this->capacity = $capacity;
-	}
-
-	public function hasKey($key) {
-		return isset($this->cache[$key]);
-	}
-
-	public function get($key) {
-		return isset($this->cache[$key]) ? $this->cache[$key] : null;
-	}
-
-	public function set($key, $value, $ttl = 0) {
-		if (is_null($key)) {
-			$this->cache[] = $value;
-		} else {
-			$this->cache[$key] = $value;
-		}
-		$this->garbageCollect();
-	}
-
-	public function remove($key) {
-		unset($this->cache[$key]);
-		return true;
-	}
-
-	public function clear($prefix = '') {
-		$this->cache = [];
-		return true;
-	}
-
-	public function offsetExists($offset) {
-		return $this->hasKey($offset);
-	}
-
-	public function &offsetGet($offset) {
-		return $this->cache[$offset];
-	}
-
-	public function offsetSet($offset, $value) {
-		$this->set($offset, $value);
-	}
-
-	public function offsetUnset($offset) {
-		$this->remove($offset);
-	}
-
-	public function getData() {
-		return $this->cache;
-	}
-
-
-	private function garbageCollect() {
-		while (count($this->cache) > $this->capacity) {
-			reset($this->cache);
-			$key = key($this->cache);
-			$this->remove($key);
-		}
-	}
+    private $capacity;
+    private $cache = [];
+
+    public function __construct($capacity = 512) {
+        $this->capacity = $capacity;
+    }
+
+    public function hasKey($key) {
+        return isset($this->cache[$key]);
+    }
+
+    public function get($key) {
+        return isset($this->cache[$key]) ? $this->cache[$key] : null;
+    }
+
+    public function set($key, $value, $ttl = 0) {
+        if (is_null($key)) {
+            $this->cache[] = $value;
+        } else {
+            $this->cache[$key] = $value;
+        }
+        $this->garbageCollect();
+    }
+
+    public function remove($key) {
+        unset($this->cache[$key]);
+        return true;
+    }
+
+    public function clear($prefix = '') {
+        $this->cache = [];
+        return true;
+    }
+
+    public function offsetExists($offset) {
+        return $this->hasKey($offset);
+    }
+
+    public function &offsetGet($offset) {
+        return $this->cache[$offset];
+    }
+
+    public function offsetSet($offset, $value) {
+        $this->set($offset, $value);
+    }
+
+    public function offsetUnset($offset) {
+        $this->remove($offset);
+    }
+
+    public function getData() {
+        return $this->cache;
+    }
+
+
+    private function garbageCollect() {
+        while (count($this->cache) > $this->capacity) {
+            reset($this->cache);
+            $key = key($this->cache);
+            $this->remove($key);
+        }
+    }
 }