nextcloud / server

lib/private/Notification/Action.php

Indentation +144 added lines, -144 removed lines

@@ -27,148 +27,148 @@
 
 class Action implements IAction {
 
-	/** @var string */
-	protected $label;
-
-	/** @var string */
-	protected $labelParsed;
-
-	/** @var string */
-	protected $link;
-
-	/** @var string */
-	protected $requestType;
-
-	/** @var string */
-	protected $icon;
-
-	/** @var bool */
-	protected $primary;
-
-	/**
-	 * Constructor
-	 */
-	public function __construct() {
-		$this->label = '';
-		$this->labelParsed = '';
-		$this->link = '';
-		$this->requestType = '';
-		$this->primary = false;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setLabel($label) {
-		if (!is_string($label) || $label === '' || isset($label[32])) {
-			throw new \InvalidArgumentException('The given label is invalid');
-		}
-		$this->label = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLabel() {
-		return $this->label;
-	}
-
-	/**
-	 * @param string $label
-	 * @return $this
-	 * @throws \InvalidArgumentException if the label is invalid
-	 * @since 8.2.0
-	 */
-	public function setParsedLabel($label) {
-		if (!is_string($label) || $label === '') {
-			throw new \InvalidArgumentException('The given parsed label is invalid');
-		}
-		$this->labelParsed = $label;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getParsedLabel() {
-		return $this->labelParsed;
-	}
-
-	/**
-	 * @param $primary bool
-	 * @return $this
-	 * @throws \InvalidArgumentException if $primary is invalid
-	 * @since 9.0.0
-	 */
-	public function setPrimary($primary) {
-		if (!is_bool($primary)) {
-			throw new \InvalidArgumentException('The given primary option is invalid');
-		}
-
-		$this->primary = $primary;
-		return $this;
-	}
-
-	/**
-	 * @return bool
-	 * @since 9.0.0
-	 */
-	public function isPrimary() {
-		return $this->primary;
-	}
-
-	/**
-	 * @param string $link
-	 * @param string $requestType
-	 * @return $this
-	 * @throws \InvalidArgumentException if the link is invalid
-	 * @since 8.2.0
-	 */
-	public function setLink($link, $requestType) {
-		if (!is_string($link) || $link === '' || isset($link[256])) {
-			throw new \InvalidArgumentException('The given link is invalid');
-		}
-		if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
-			throw new \InvalidArgumentException('The given request type is invalid');
-		}
-		$this->link = $link;
-		$this->requestType = $requestType;
-		return $this;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getLink() {
-		return $this->link;
-	}
-
-	/**
-	 * @return string
-	 * @since 8.2.0
-	 */
-	public function getRequestType() {
-		return $this->requestType;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValid() {
-		return $this->label !== '' && $this->link !== '';
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function isValidParsed() {
-		return $this->labelParsed !== '' && $this->link !== '';
-	}
+    /** @var string */
+    protected $label;
+
+    /** @var string */
+    protected $labelParsed;
+
+    /** @var string */
+    protected $link;
+
+    /** @var string */
+    protected $requestType;
+
+    /** @var string */
+    protected $icon;
+
+    /** @var bool */
+    protected $primary;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        $this->label = '';
+        $this->labelParsed = '';
+        $this->link = '';
+        $this->requestType = '';
+        $this->primary = false;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setLabel($label) {
+        if (!is_string($label) || $label === '' || isset($label[32])) {
+            throw new \InvalidArgumentException('The given label is invalid');
+        }
+        $this->label = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLabel() {
+        return $this->label;
+    }
+
+    /**
+     * @param string $label
+     * @return $this
+     * @throws \InvalidArgumentException if the label is invalid
+     * @since 8.2.0
+     */
+    public function setParsedLabel($label) {
+        if (!is_string($label) || $label === '') {
+            throw new \InvalidArgumentException('The given parsed label is invalid');
+        }
+        $this->labelParsed = $label;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getParsedLabel() {
+        return $this->labelParsed;
+    }
+
+    /**
+     * @param $primary bool
+     * @return $this
+     * @throws \InvalidArgumentException if $primary is invalid
+     * @since 9.0.0
+     */
+    public function setPrimary($primary) {
+        if (!is_bool($primary)) {
+            throw new \InvalidArgumentException('The given primary option is invalid');
+        }
+
+        $this->primary = $primary;
+        return $this;
+    }
+
+    /**
+     * @return bool
+     * @since 9.0.0
+     */
+    public function isPrimary() {
+        return $this->primary;
+    }
+
+    /**
+     * @param string $link
+     * @param string $requestType
+     * @return $this
+     * @throws \InvalidArgumentException if the link is invalid
+     * @since 8.2.0
+     */
+    public function setLink($link, $requestType) {
+        if (!is_string($link) || $link === '' || isset($link[256])) {
+            throw new \InvalidArgumentException('The given link is invalid');
+        }
+        if (!in_array($requestType, ['GET', 'POST', 'PUT', 'DELETE'], true)) {
+            throw new \InvalidArgumentException('The given request type is invalid');
+        }
+        $this->link = $link;
+        $this->requestType = $requestType;
+        return $this;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getLink() {
+        return $this->link;
+    }
+
+    /**
+     * @return string
+     * @since 8.2.0
+     */
+    public function getRequestType() {
+        return $this->requestType;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValid() {
+        return $this->label !== '' && $this->link !== '';
+    }
+
+    /**
+     * @return bool
+     */
+    public function isValidParsed() {
+        return $this->labelParsed !== '' && $this->link !== '';
+    }
 }

lib/private/Notification/Manager.php

Indentation +213 added lines, -213 removed lines

@@ -31,217 +31,217 @@
 use OCP\RichObjectStrings\IValidator;
 
 class Manager implements IManager {
-	/** @var IValidator */
-	protected $validator;
-
-	/** @var IApp[] */
-	protected $apps;
-
-	/** @var INotifier[] */
-	protected $notifiers;
-
-	/** @var array[] */
-	protected $notifiersInfo;
-
-	/** @var \Closure[] */
-	protected $appsClosures;
-
-	/** @var \Closure[] */
-	protected $notifiersClosures;
-
-	/** @var \Closure[] */
-	protected $notifiersInfoClosures;
-
-	/**
-	 * Manager constructor.
-	 *
-	 * @param IValidator $validator
-	 */
-	public function __construct(IValidator $validator) {
-		$this->validator = $validator;
-		$this->apps = [];
-		$this->notifiers = [];
-		$this->notifiersInfo = [];
-		$this->appsClosures = [];
-		$this->notifiersClosures = [];
-		$this->notifiersInfoClosures = [];
-	}
-
-	/**
-	 * @param \Closure $service The service must implement IApp, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @since 8.2.0
-	 */
-	public function registerApp(\Closure $service) {
-		$this->appsClosures[] = $service;
-		$this->apps = [];
-	}
-
-	/**
-	 * @param \Closure $service The service must implement INotifier, otherwise a
-	 *                          \InvalidArgumentException is thrown later
-	 * @param \Closure $info    An array with the keys 'id' and 'name' containing
-	 *                          the app id and the app name
-	 * @since 8.2.0 - Parameter $info was added in 9.0.0
-	 */
-	public function registerNotifier(\Closure $service, \Closure $info) {
-		$this->notifiersClosures[] = $service;
-		$this->notifiersInfoClosures[] = $info;
-		$this->notifiers = [];
-		$this->notifiersInfo = [];
-	}
-
-	/**
-	 * @return IApp[]
-	 */
-	protected function getApps() {
-		if (!empty($this->apps)) {
-			return $this->apps;
-		}
-
-		$this->apps = [];
-		foreach ($this->appsClosures as $closure) {
-			$app = $closure();
-			if (!($app instanceof IApp)) {
-				throw new \InvalidArgumentException('The given notification app does not implement the IApp interface');
-			}
-			$this->apps[] = $app;
-		}
-
-		return $this->apps;
-	}
-
-	/**
-	 * @return INotifier[]
-	 */
-	protected function getNotifiers() {
-		if (!empty($this->notifiers)) {
-			return $this->notifiers;
-		}
-
-		$this->notifiers = [];
-		foreach ($this->notifiersClosures as $closure) {
-			$notifier = $closure();
-			if (!($notifier instanceof INotifier)) {
-				throw new \InvalidArgumentException('The given notifier does not implement the INotifier interface');
-			}
-			$this->notifiers[] = $notifier;
-		}
-
-		return $this->notifiers;
-	}
-
-	/**
-	 * @return array[]
-	 */
-	public function listNotifiers() {
-		if (!empty($this->notifiersInfo)) {
-			return $this->notifiersInfo;
-		}
-
-		$this->notifiersInfo = [];
-		foreach ($this->notifiersInfoClosures as $closure) {
-			$notifier = $closure();
-			if (!is_array($notifier) || sizeof($notifier) !== 2 || !isset($notifier['id']) || !isset($notifier['name'])) {
-				throw new \InvalidArgumentException('The given notifier information is invalid');
-			}
-			if (isset($this->notifiersInfo[$notifier['id']])) {
-				throw new \InvalidArgumentException('The given notifier ID ' . $notifier['id'] . ' is already in use');
-			}
-			$this->notifiersInfo[$notifier['id']] = $notifier['name'];
-		}
-
-		return $this->notifiersInfo;
-	}
-
-	/**
-	 * @return INotification
-	 * @since 8.2.0
-	 */
-	public function createNotification() {
-		return new Notification($this->validator);
-	}
-
-	/**
-	 * @return bool
-	 * @since 8.2.0
-	 */
-	public function hasNotifiers() {
-		return !empty($this->notifiersClosures);
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @throws \InvalidArgumentException When the notification is not valid
-	 * @since 8.2.0
-	 */
-	public function notify(INotification $notification) {
-		if (!$notification->isValid()) {
-			throw new \InvalidArgumentException('The given notification is invalid');
-		}
-
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			try {
-				$app->notify($notification);
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @param string $languageCode The code of the language that should be used to prepare the notification
-	 * @return INotification
-	 * @throws \InvalidArgumentException When the notification was not prepared by a notifier
-	 * @since 8.2.0
-	 */
-	public function prepare(INotification $notification, $languageCode) {
-		$notifiers = $this->getNotifiers();
-
-		foreach ($notifiers as $notifier) {
-			try {
-				$notification = $notifier->prepare($notification, $languageCode);
-			} catch (\InvalidArgumentException $e) {
-				continue;
-			}
-
-			if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
-				throw new \InvalidArgumentException('The given notification has not been handled');
-			}
-		}
-
-		if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
-			throw new \InvalidArgumentException('The given notification has not been handled');
-		}
-
-		return $notification;
-	}
-
-	/**
-	 * @param INotification $notification
-	 */
-	public function markProcessed(INotification $notification) {
-		$apps = $this->getApps();
-
-		foreach ($apps as $app) {
-			$app->markProcessed($notification);
-		}
-	}
-
-	/**
-	 * @param INotification $notification
-	 * @return int
-	 */
-	public function getCount(INotification $notification) {
-		$apps = $this->getApps();
-
-		$count = 0;
-		foreach ($apps as $app) {
-			$count += $app->getCount($notification);
-		}
-
-		return $count;
-	}
+    /** @var IValidator */
+    protected $validator;
+
+    /** @var IApp[] */
+    protected $apps;
+
+    /** @var INotifier[] */
+    protected $notifiers;
+
+    /** @var array[] */
+    protected $notifiersInfo;
+
+    /** @var \Closure[] */
+    protected $appsClosures;
+
+    /** @var \Closure[] */
+    protected $notifiersClosures;
+
+    /** @var \Closure[] */
+    protected $notifiersInfoClosures;
+
+    /**
+     * Manager constructor.
+     *
+     * @param IValidator $validator
+     */
+    public function __construct(IValidator $validator) {
+        $this->validator = $validator;
+        $this->apps = [];
+        $this->notifiers = [];
+        $this->notifiersInfo = [];
+        $this->appsClosures = [];
+        $this->notifiersClosures = [];
+        $this->notifiersInfoClosures = [];
+    }
+
+    /**
+     * @param \Closure $service The service must implement IApp, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @since 8.2.0
+     */
+    public function registerApp(\Closure $service) {
+        $this->appsClosures[] = $service;
+        $this->apps = [];
+    }
+
+    /**
+     * @param \Closure $service The service must implement INotifier, otherwise a
+     *                          \InvalidArgumentException is thrown later
+     * @param \Closure $info    An array with the keys 'id' and 'name' containing
+     *                          the app id and the app name
+     * @since 8.2.0 - Parameter $info was added in 9.0.0
+     */
+    public function registerNotifier(\Closure $service, \Closure $info) {
+        $this->notifiersClosures[] = $service;
+        $this->notifiersInfoClosures[] = $info;
+        $this->notifiers = [];
+        $this->notifiersInfo = [];
+    }
+
+    /**
+     * @return IApp[]
+     */
+    protected function getApps() {
+        if (!empty($this->apps)) {
+            return $this->apps;
+        }
+
+        $this->apps = [];
+        foreach ($this->appsClosures as $closure) {
+            $app = $closure();
+            if (!($app instanceof IApp)) {
+                throw new \InvalidArgumentException('The given notification app does not implement the IApp interface');
+            }
+            $this->apps[] = $app;
+        }
+
+        return $this->apps;
+    }
+
+    /**
+     * @return INotifier[]
+     */
+    protected function getNotifiers() {
+        if (!empty($this->notifiers)) {
+            return $this->notifiers;
+        }
+
+        $this->notifiers = [];
+        foreach ($this->notifiersClosures as $closure) {
+            $notifier = $closure();
+            if (!($notifier instanceof INotifier)) {
+                throw new \InvalidArgumentException('The given notifier does not implement the INotifier interface');
+            }
+            $this->notifiers[] = $notifier;
+        }
+
+        return $this->notifiers;
+    }
+
+    /**
+     * @return array[]
+     */
+    public function listNotifiers() {
+        if (!empty($this->notifiersInfo)) {
+            return $this->notifiersInfo;
+        }
+
+        $this->notifiersInfo = [];
+        foreach ($this->notifiersInfoClosures as $closure) {
+            $notifier = $closure();
+            if (!is_array($notifier) || sizeof($notifier) !== 2 || !isset($notifier['id']) || !isset($notifier['name'])) {
+                throw new \InvalidArgumentException('The given notifier information is invalid');
+            }
+            if (isset($this->notifiersInfo[$notifier['id']])) {
+                throw new \InvalidArgumentException('The given notifier ID ' . $notifier['id'] . ' is already in use');
+            }
+            $this->notifiersInfo[$notifier['id']] = $notifier['name'];
+        }
+
+        return $this->notifiersInfo;
+    }
+
+    /**
+     * @return INotification
+     * @since 8.2.0
+     */
+    public function createNotification() {
+        return new Notification($this->validator);
+    }
+
+    /**
+     * @return bool
+     * @since 8.2.0
+     */
+    public function hasNotifiers() {
+        return !empty($this->notifiersClosures);
+    }
+
+    /**
+     * @param INotification $notification
+     * @throws \InvalidArgumentException When the notification is not valid
+     * @since 8.2.0
+     */
+    public function notify(INotification $notification) {
+        if (!$notification->isValid()) {
+            throw new \InvalidArgumentException('The given notification is invalid');
+        }
+
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            try {
+                $app->notify($notification);
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
+    }
+
+    /**
+     * @param INotification $notification
+     * @param string $languageCode The code of the language that should be used to prepare the notification
+     * @return INotification
+     * @throws \InvalidArgumentException When the notification was not prepared by a notifier
+     * @since 8.2.0
+     */
+    public function prepare(INotification $notification, $languageCode) {
+        $notifiers = $this->getNotifiers();
+
+        foreach ($notifiers as $notifier) {
+            try {
+                $notification = $notifier->prepare($notification, $languageCode);
+            } catch (\InvalidArgumentException $e) {
+                continue;
+            }
+
+            if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+                throw new \InvalidArgumentException('The given notification has not been handled');
+            }
+        }
+
+        if (!($notification instanceof INotification) || !$notification->isValidParsed()) {
+            throw new \InvalidArgumentException('The given notification has not been handled');
+        }
+
+        return $notification;
+    }
+
+    /**
+     * @param INotification $notification
+     */
+    public function markProcessed(INotification $notification) {
+        $apps = $this->getApps();
+
+        foreach ($apps as $app) {
+            $app->markProcessed($notification);
+        }
+    }
+
+    /**
+     * @param INotification $notification
+     * @return int
+     */
+    public function getCount(INotification $notification) {
+        $apps = $this->getApps();
+
+        $count = 0;
+        foreach ($apps as $app) {
+            $count += $app->getCount($notification);
+        }
+
+        return $count;
+    }
 }

lib/private/IntegrityCheck/Iterator/ExcludeFileByNameFilterIterator.php

Indentation +26 added lines, -26 removed lines

@@ -30,32 +30,32 @@
  * @package OC\Integritycheck\Iterator
  */
 class ExcludeFileByNameFilterIterator extends \RecursiveFilterIterator {
-	/**
-	 * Array of excluded file names. Those are not scanned by the integrity checker.
-	 * This is used to exclude files which administrators could upload by mistakes
-	 * such as .DS_Store files.
-	 *
-	 * @var array
-	 */
-	private $excludedFilenames = [
-		'.DS_Store', // Mac OS X
-		'Thumbs.db', // Microsoft Windows
-		'.directory', // Dolphin (KDE)
-		'.webapp', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manager wep-apps.
-	];
+    /**
+     * Array of excluded file names. Those are not scanned by the integrity checker.
+     * This is used to exclude files which administrators could upload by mistakes
+     * such as .DS_Store files.
+     *
+     * @var array
+     */
+    private $excludedFilenames = [
+        '.DS_Store', // Mac OS X
+        'Thumbs.db', // Microsoft Windows
+        '.directory', // Dolphin (KDE)
+        '.webapp', // Gentoo/Funtoo & derivatives use a tool known as webapp-config to manager wep-apps.
+    ];
 
-	/**
-	 * @return bool
-	 */
-	public function accept() {
-		if($this->isDir()) {
-			return true;
-		}
+    /**
+     * @return bool
+     */
+    public function accept() {
+        if($this->isDir()) {
+            return true;
+        }
 
-		return !in_array(
-			$this->current()->getFilename(),
-			$this->excludedFilenames,
-			true
-		);
-	}
+        return !in_array(
+            $this->current()->getFilename(),
+            $this->excludedFilenames,
+            true
+        );
+    }
 }

lib/private/IntegrityCheck/Iterator/ExcludeFoldersByPathFilterIterator.php

Indentation +36 added lines, -36 removed lines

@@ -24,45 +24,45 @@
 namespace OC\IntegrityCheck\Iterator;
 
 class ExcludeFoldersByPathFilterIterator extends \RecursiveFilterIterator {
-	private $excludedFolders = [];
+    private $excludedFolders = [];
 
-	public function __construct(\RecursiveIterator $iterator, $root = '') {
-		parent::__construct($iterator);
+    public function __construct(\RecursiveIterator $iterator, $root = '') {
+        parent::__construct($iterator);
 
-		$appFolders = \OC::$APPSROOTS;
-		foreach($appFolders as $key => $appFolder) {
-			$appFolders[$key] = rtrim($appFolder['path'], '/');
-		}
+        $appFolders = \OC::$APPSROOTS;
+        foreach($appFolders as $key => $appFolder) {
+            $appFolders[$key] = rtrim($appFolder['path'], '/');
+        }
 
-		$excludedFolders = [
-			rtrim($root . '/data', '/'),
-			rtrim($root . '/themes', '/'),
-			rtrim($root . '/config', '/'),
-			rtrim($root . '/apps', '/'),
-			rtrim($root . '/assets', '/'),
-			rtrim($root . '/lost+found', '/'),
-			// Ignore folders generated by updater since the updater is replaced
-			// after the integrity check is run.
-			// See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
-			rtrim($root . '/updater', '/'),
-			rtrim($root . '/_oc_upgrade', '/'),
-		];
-		$customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
-		if($customDataDir !== '') {
-			$excludedFolders[] = rtrim($customDataDir, '/');
-		}
+        $excludedFolders = [
+            rtrim($root . '/data', '/'),
+            rtrim($root . '/themes', '/'),
+            rtrim($root . '/config', '/'),
+            rtrim($root . '/apps', '/'),
+            rtrim($root . '/assets', '/'),
+            rtrim($root . '/lost+found', '/'),
+            // Ignore folders generated by updater since the updater is replaced
+            // after the integrity check is run.
+            // See https://github.com/owncloud/updater/issues/318#issuecomment-212497846
+            rtrim($root . '/updater', '/'),
+            rtrim($root . '/_oc_upgrade', '/'),
+        ];
+        $customDataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', '');
+        if($customDataDir !== '') {
+            $excludedFolders[] = rtrim($customDataDir, '/');
+        }
 
-		$this->excludedFolders = array_merge($excludedFolders, $appFolders);
-	}
+        $this->excludedFolders = array_merge($excludedFolders, $appFolders);
+    }
 
-	/**
-	 * @return bool
-	 */
-	public function accept() {
-		return !in_array(
-			$this->current()->getPathName(),
-			$this->excludedFolders,
-			true
-		);
-	}
+    /**
+     * @return bool
+     */
+    public function accept() {
+        return !in_array(
+            $this->current()->getPathName(),
+            $this->excludedFolders,
+            true
+        );
+    }
 }

lib/private/IntegrityCheck/Helpers/EnvironmentHelper.php

Indentation +16 added lines, -16 removed lines

@@ -29,21 +29,21 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class EnvironmentHelper {
-	/**
-	 * Provides \OC::$SERVERROOT
-	 *
-	 * @return string
-	 */
-	public function getServerRoot() {
-		return rtrim(\OC::$SERVERROOT, '/');
-	}
+    /**
+     * Provides \OC::$SERVERROOT
+     *
+     * @return string
+     */
+    public function getServerRoot() {
+        return rtrim(\OC::$SERVERROOT, '/');
+    }
 
-	/**
-	 * Provides \OC_Util::getChannel()
-	 *
-	 * @return string
-	 */
-	public function getChannel() {
-		return \OC_Util::getChannel();
-	}
+    /**
+     * Provides \OC_Util::getChannel()
+     *
+     * @return string
+     */
+    public function getChannel() {
+        return \OC_Util::getChannel();
+    }
 }

lib/private/IntegrityCheck/Helpers/FileAccessHelper.php

Indentation +49 added lines, -49 removed lines

@@ -29,57 +29,57 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class FileAccessHelper {
-	/**
-	 * Wrapper around file_get_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @return string|false
-	 */
-	public function file_get_contents($filename) {
-		return file_get_contents($filename);
-	}
+    /**
+     * Wrapper around file_get_contents($filename, $data)
+     *
+     * @param string $filename
+     * @return string|false
+     */
+    public function file_get_contents($filename) {
+        return file_get_contents($filename);
+    }
 
-	/**
-	 * Wrapper around file_exists($filename)
-	 *
-	 * @param string $filename
-	 * @return bool
-	 */
-	public function file_exists($filename) {
-		return file_exists($filename);
-	}
+    /**
+     * Wrapper around file_exists($filename)
+     *
+     * @param string $filename
+     * @return bool
+     */
+    public function file_exists($filename) {
+        return file_exists($filename);
+    }
 
-	/**
-	 * Wrapper around file_put_contents($filename, $data)
-	 *
-	 * @param string $filename
-	 * @param string $data
-	 * @return int
-	 * @throws \Exception
-	 */
-	public function file_put_contents($filename, $data) {
-		$bytesWritten = @file_put_contents($filename, $data);
-		if ($bytesWritten === false || $bytesWritten !== strlen($data)){
-			throw new \Exception('Failed to write into ' . $filename);
-		}
-		return $bytesWritten;
-	}
+    /**
+     * Wrapper around file_put_contents($filename, $data)
+     *
+     * @param string $filename
+     * @param string $data
+     * @return int
+     * @throws \Exception
+     */
+    public function file_put_contents($filename, $data) {
+        $bytesWritten = @file_put_contents($filename, $data);
+        if ($bytesWritten === false || $bytesWritten !== strlen($data)){
+            throw new \Exception('Failed to write into ' . $filename);
+        }
+        return $bytesWritten;
+    }
 
-	/**
-	 * @param string $path
-	 * @return bool
-	 */
-	public function is_writable($path) {
-		return is_writable($path);
-	}
+    /**
+     * @param string $path
+     * @return bool
+     */
+    public function is_writable($path) {
+        return is_writable($path);
+    }
 
-	/**
-	 * @param string $path
-	 * @throws \Exception
-	 */
-	public function assertDirectoryExists($path) {
-		if (!is_dir($path)) {
-			throw new \Exception('Directory ' . $path . ' does not exist.');
-		}
-	}
+    /**
+     * @param string $path
+     * @throws \Exception
+     */
+    public function assertDirectoryExists($path) {
+        if (!is_dir($path)) {
+            throw new \Exception('Directory ' . $path . ' does not exist.');
+        }
+    }
 }

lib/private/IntegrityCheck/Helpers/AppLocator.php

Indentation +22 added lines, -22 removed lines

@@ -30,28 +30,28 @@
  * @package OC\IntegrityCheck\Helpers
  */
 class AppLocator {
-	/**
-	 * Provides \OC_App::getAppPath($appId)
-	 *
-	 * @param string $appId
-	 * @return string
-	 * @throws \Exception If the app cannot be found
-	 */
-	public function getAppPath($appId) {
-		$path = \OC_App::getAppPath($appId);
-		if($path === false) {
+    /**
+     * Provides \OC_App::getAppPath($appId)
+     *
+     * @param string $appId
+     * @return string
+     * @throws \Exception If the app cannot be found
+     */
+    public function getAppPath($appId) {
+        $path = \OC_App::getAppPath($appId);
+        if($path === false) {
 
-			throw new \Exception('App not found');
-		}
-		return $path;
-	}
+            throw new \Exception('App not found');
+        }
+        return $path;
+    }
 
-	/**
-	 * Providers \OC_App::getAllApps()
-	 *
-	 * @return array
-	 */
-	public function getAllApps() {
-		return \OC_App::getAllApps();
-	}
+    /**
+     * Providers \OC_App::getAllApps()
+     *
+     * @return array
+     */
+    public function getAllApps() {
+        return \OC_App::getAllApps();
+    }
 }

lib/private/HintException.php

Indentation +39 added lines, -39 removed lines

@@ -35,46 +35,46 @@
  */
 class HintException extends \Exception {
 
-	private $hint;
+    private $hint;
 
-	/**
-	 * HintException constructor.
-	 *
-	 * @param string $message  The error message. It will be not revealed to the
-	 *                         the user (unless the hint is empty) and thus
-	 *                         should be not translated.
-	 * @param string $hint     A useful message that is presented to the end
-	 *                         user. It should be translated, but must not
-	 *                         contain sensitive data.
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 */
-	public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
-		$this->hint = $hint;
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * HintException constructor.
+     *
+     * @param string $message  The error message. It will be not revealed to the
+     *                         the user (unless the hint is empty) and thus
+     *                         should be not translated.
+     * @param string $hint     A useful message that is presented to the end
+     *                         user. It should be translated, but must not
+     *                         contain sensitive data.
+     * @param int $code
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
+        $this->hint = $hint;
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * Returns a string representation of this Exception that includes the error
-	 * code, the message and the hint.
-	 *
-	 * @return string
-	 */
-	public function __toString() {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
-	}
+    /**
+     * Returns a string representation of this Exception that includes the error
+     * code, the message and the hint.
+     *
+     * @return string
+     */
+    public function __toString() {
+        return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+    }
 
-	/**
-	 * Returns the hint with the intention to be presented to the end user. If
-	 * an empty hint was specified upon instatiation, the message is returned
-	 * instead.
-	 *
-	 * @return string
-	 */
-	public function getHint() {
-		if (empty($this->hint)) {
-			return $this->message;
-		}
-		return $this->hint;
-	}
+    /**
+     * Returns the hint with the intention to be presented to the end user. If
+     * an empty hint was specified upon instatiation, the message is returned
+     * instead.
+     *
+     * @return string
+     */
+    public function getHint() {
+        if (empty($this->hint)) {
+            return $this->message;
+        }
+        return $this->hint;
+    }
 }

lib/private/Avatar.php

Indentation +164 added lines, -164 removed lines

@@ -45,168 +45,168 @@
  */
 
 class Avatar implements IAvatar {
-	/** @var ISimpleFolder */
-	private $folder;
-	/** @var IL10N */
-	private $l;
-	/** @var User */
-	private $user;
-	/** @var ILogger  */
-	private $logger;
-	/** @var IConfig */
-	private $config;
-
-	/**
-	 * constructor
-	 *
-	 * @param ISimpleFolder $folder The folder where the avatars are
-	 * @param IL10N $l
-	 * @param User $user
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(ISimpleFolder $folder,
-								IL10N $l,
-								$user,
-								ILogger $logger,
-								IConfig $config) {
-		$this->folder = $folder;
-		$this->l = $l;
-		$this->user = $user;
-		$this->logger = $logger;
-		$this->config = $config;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function get ($size = 64) {
-		try {
-			$file = $this->getFile($size);
-		} catch (NotFoundException $e) {
-			return false;
-		}
-
-		$avatar = new OC_Image();
-		$avatar->loadFromData($file->getContent());
-		return $avatar;
-	}
-
-	/**
-	 * Check if an avatar exists for the user
-	 *
-	 * @return bool
-	 */
-	public function exists() {
-
-		return $this->folder->fileExists('avatar.jpg') || $this->folder->fileExists('avatar.png');
-	}
-
-	/**
-	 * sets the users avatar
-	 * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
-	 * @throws \Exception if the provided file is not a jpg or png image
-	 * @throws \Exception if the provided image is not valid
-	 * @throws NotSquareException if the image is not square
-	 * @return void
-	*/
-	public function set ($data) {
-
-		if($data instanceOf IImage) {
-			$img = $data;
-			$data = $img->data();
-		} else {
-			$img = new OC_Image($data);
-		}
-		$type = substr($img->mimeType(), -3);
-		if ($type === 'peg') {
-			$type = 'jpg';
-		}
-		if ($type !== 'jpg' && $type !== 'png') {
-			throw new \Exception($this->l->t("Unknown filetype"));
-		}
-
-		if (!$img->valid()) {
-			throw new \Exception($this->l->t("Invalid image"));
-		}
-
-		if (!($img->height() === $img->width())) {
-			throw new NotSquareException($this->l->t("Avatar image is not square"));
-		}
-
-		$this->remove();
-		$this->folder->newFile('avatar.'.$type)->putContent($data);
-		$this->user->triggerChange('avatar');
-	}
-
-	/**
-	 * remove the users avatar
-	 * @return void
-	*/
-	public function remove () {
-		$regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/';
-		$avatars = $this->folder->getDirectoryListing();
-
-		$this->config->setUserValue($this->user->getUID(), 'avatar', 'version',
-			(int)$this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1);
-
-		foreach ($avatars as $avatar) {
-			if (preg_match($regex, $avatar->getName())) {
-				$avatar->delete();
-			}
-		}
-		$this->user->triggerChange('avatar');
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getFile($size) {
-		$ext = $this->getExtension();
-
-		if ($size === -1) {
-			$path = 'avatar.' . $ext;
-		} else {
-			$path = 'avatar.' . $size . '.' . $ext;
-		}
-
-		try {
-			$file = $this->folder->getFile($path);
-		} catch (NotFoundException $e) {
-			if ($size <= 0) {
-				throw new NotFoundException;
-			}
-
-			$avatar = new OC_Image();
-			/** @var ISimpleFile $file */
-			$file = $this->folder->getFile('avatar.' . $ext);
-			$avatar->loadFromData($file->getContent());
-			if ($size !== -1) {
-				$avatar->resize($size);
-			}
-			try {
-				$file = $this->folder->newFile($path);
-				$file->putContent($avatar->data());
-			} catch (NotPermittedException $e) {
-				$this->logger->error('Failed to save avatar for ' . $this->user->getUID());
-			}
-		}
-
-		return $file;
-	}
-
-	/**
-	 * Get the extension of the avatar. If there is no avatar throw Exception
-	 *
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	private function getExtension() {
-		if ($this->folder->fileExists('avatar.jpg')) {
-			return 'jpg';
-		} elseif ($this->folder->fileExists('avatar.png')) {
-			return 'png';
-		}
-		throw new NotFoundException;
-	}
+    /** @var ISimpleFolder */
+    private $folder;
+    /** @var IL10N */
+    private $l;
+    /** @var User */
+    private $user;
+    /** @var ILogger  */
+    private $logger;
+    /** @var IConfig */
+    private $config;
+
+    /**
+     * constructor
+     *
+     * @param ISimpleFolder $folder The folder where the avatars are
+     * @param IL10N $l
+     * @param User $user
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(ISimpleFolder $folder,
+                                IL10N $l,
+                                $user,
+                                ILogger $logger,
+                                IConfig $config) {
+        $this->folder = $folder;
+        $this->l = $l;
+        $this->user = $user;
+        $this->logger = $logger;
+        $this->config = $config;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function get ($size = 64) {
+        try {
+            $file = $this->getFile($size);
+        } catch (NotFoundException $e) {
+            return false;
+        }
+
+        $avatar = new OC_Image();
+        $avatar->loadFromData($file->getContent());
+        return $avatar;
+    }
+
+    /**
+     * Check if an avatar exists for the user
+     *
+     * @return bool
+     */
+    public function exists() {
+
+        return $this->folder->fileExists('avatar.jpg') || $this->folder->fileExists('avatar.png');
+    }
+
+    /**
+     * sets the users avatar
+     * @param IImage|resource|string $data An image object, imagedata or path to set a new avatar
+     * @throws \Exception if the provided file is not a jpg or png image
+     * @throws \Exception if the provided image is not valid
+     * @throws NotSquareException if the image is not square
+     * @return void
+     */
+    public function set ($data) {
+
+        if($data instanceOf IImage) {
+            $img = $data;
+            $data = $img->data();
+        } else {
+            $img = new OC_Image($data);
+        }
+        $type = substr($img->mimeType(), -3);
+        if ($type === 'peg') {
+            $type = 'jpg';
+        }
+        if ($type !== 'jpg' && $type !== 'png') {
+            throw new \Exception($this->l->t("Unknown filetype"));
+        }
+
+        if (!$img->valid()) {
+            throw new \Exception($this->l->t("Invalid image"));
+        }
+
+        if (!($img->height() === $img->width())) {
+            throw new NotSquareException($this->l->t("Avatar image is not square"));
+        }
+
+        $this->remove();
+        $this->folder->newFile('avatar.'.$type)->putContent($data);
+        $this->user->triggerChange('avatar');
+    }
+
+    /**
+     * remove the users avatar
+     * @return void
+     */
+    public function remove () {
+        $regex = '/^avatar\.([0-9]+\.)?(jpg|png)$/';
+        $avatars = $this->folder->getDirectoryListing();
+
+        $this->config->setUserValue($this->user->getUID(), 'avatar', 'version',
+            (int)$this->config->getUserValue($this->user->getUID(), 'avatar', 'version', 0) + 1);
+
+        foreach ($avatars as $avatar) {
+            if (preg_match($regex, $avatar->getName())) {
+                $avatar->delete();
+            }
+        }
+        $this->user->triggerChange('avatar');
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getFile($size) {
+        $ext = $this->getExtension();
+
+        if ($size === -1) {
+            $path = 'avatar.' . $ext;
+        } else {
+            $path = 'avatar.' . $size . '.' . $ext;
+        }
+
+        try {
+            $file = $this->folder->getFile($path);
+        } catch (NotFoundException $e) {
+            if ($size <= 0) {
+                throw new NotFoundException;
+            }
+
+            $avatar = new OC_Image();
+            /** @var ISimpleFile $file */
+            $file = $this->folder->getFile('avatar.' . $ext);
+            $avatar->loadFromData($file->getContent());
+            if ($size !== -1) {
+                $avatar->resize($size);
+            }
+            try {
+                $file = $this->folder->newFile($path);
+                $file->putContent($avatar->data());
+            } catch (NotPermittedException $e) {
+                $this->logger->error('Failed to save avatar for ' . $this->user->getUID());
+            }
+        }
+
+        return $file;
+    }
+
+    /**
+     * Get the extension of the avatar. If there is no avatar throw Exception
+     *
+     * @return string
+     * @throws NotFoundException
+     */
+    private function getExtension() {
+        if ($this->folder->fileExists('avatar.jpg')) {
+            return 'jpg';
+        } elseif ($this->folder->fileExists('avatar.png')) {
+            return 'png';
+        }
+        throw new NotFoundException;
+    }
 }