nextcloud / server

lib/private/Diagnostics/EventLogger.php

Indentation +46 added lines, -46 removed lines

@@ -28,56 +28,56 @@
 use OCP\Diagnostics\IEventLogger;
 
 class EventLogger implements IEventLogger {
-	/**
-	 * @var \OC\Diagnostics\Event[]
-	 */
-	private $events = [];
+    /**
+     * @var \OC\Diagnostics\Event[]
+     */
+    private $events = [];
 	
-	/**
-	 * @var bool - Module needs to be activated by some app
-	 */
-	private $activated = false;
+    /**
+     * @var bool - Module needs to be activated by some app
+     */
+    private $activated = false;
 
-	/**
-	 * @inheritdoc
-	 */
-	public function start($id, $description) {
-		if ($this->activated){
-			$this->events[$id] = new Event($id, $description, microtime(true));
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function start($id, $description) {
+        if ($this->activated){
+            $this->events[$id] = new Event($id, $description, microtime(true));
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function end($id) {
-		if ($this->activated && isset($this->events[$id])) {
-			$timing = $this->events[$id];
-			$timing->end(microtime(true));
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function end($id) {
+        if ($this->activated && isset($this->events[$id])) {
+            $timing = $this->events[$id];
+            $timing->end(microtime(true));
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function log($id, $description, $start, $end) {
-		if ($this->activated) {
-			$this->events[$id] = new Event($id, $description, $start);
-			$this->events[$id]->end($end);
-		}
-	}
+    /**
+     * @inheritdoc
+     */
+    public function log($id, $description, $start, $end) {
+        if ($this->activated) {
+            $this->events[$id] = new Event($id, $description, $start);
+            $this->events[$id]->end($end);
+        }
+    }
 
-	/**
-	 * @inheritdoc
-	 */
-	public function getEvents() {
-		return $this->events;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function getEvents() {
+        return $this->events;
+    }
 	
-	/**
-	 * @inheritdoc
-	 */
-	public function activate() {
-		$this->activated = true;
-	}
+    /**
+     * @inheritdoc
+     */
+    public function activate() {
+        $this->activated = true;
+    }
 }

lib/private/Diagnostics/Query.php

Indentation +49 added lines, -49 removed lines

@@ -26,65 +26,65 @@
 use OCP\Diagnostics\IQuery;
 
 class Query implements IQuery {
-	private $sql;
+    private $sql;
 
-	private $params;
+    private $params;
 
-	private $start;
+    private $start;
 
-	private $end;
+    private $end;
 
-	private $stack;
+    private $stack;
 
-	/**
-	 * @param string $sql
-	 * @param array $params
-	 * @param int $start
-	 */
-	public function __construct($sql, $params, $start, array $stack) {
-		$this->sql = $sql;
-		$this->params = $params;
-		$this->start = $start;
-		$this->stack = $stack;
-	}
+    /**
+     * @param string $sql
+     * @param array $params
+     * @param int $start
+     */
+    public function __construct($sql, $params, $start, array $stack) {
+        $this->sql = $sql;
+        $this->params = $params;
+        $this->start = $start;
+        $this->stack = $stack;
+    }
 
-	public function end($time) {
-		$this->end = $time;
-	}
+    public function end($time) {
+        $this->end = $time;
+    }
 
-	/**
-	 * @return array
-	 */
-	public function getParams() {
-		return $this->params;
-	}
+    /**
+     * @return array
+     */
+    public function getParams() {
+        return $this->params;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getSql() {
-		return $this->sql;
-	}
+    /**
+     * @return string
+     */
+    public function getSql() {
+        return $this->sql;
+    }
 
-	/**
-	 * @return float
-	 */
-	public function getStart() {
-		return $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getStart() {
+        return $this->start;
+    }
 	
-	/**
-	 * @return float
-	 */
-	public function getDuration() {
-		return $this->end - $this->start;
-	}
+    /**
+     * @return float
+     */
+    public function getDuration() {
+        return $this->end - $this->start;
+    }
 
-	public function getStartTime() {
-		return $this->start;
-	}
+    public function getStartTime() {
+        return $this->start;
+    }
 
-	public function getStacktrace() {
-		return $this->stack;
-	}
+    public function getStacktrace() {
+        return $this->stack;
+    }
 }

apps/files_external/lib/Config/ExternalMountPoint.php

Indentation +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@
 use OC\Files\Mount\MountPoint;
 
 class ExternalMountPoint extends MountPoint {
-	public function getMountType() {
-		return 'external';
-	}
+    public function getMountType() {
+        return 'external';
+    }
 }

lib/private/App/AppStore/Bundles/SocialSharingBundle.php

Indentation +18 added lines, -18 removed lines

@@ -23,24 +23,24 @@
 
 class SocialSharingBundle extends Bundle {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getName() {
-		return (string)$this->l10n->t('Social sharing bundle');
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getName() {
+        return (string)$this->l10n->t('Social sharing bundle');
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getAppIdentifiers() {
-		return [
-			'socialsharing_twitter',
-			'socialsharing_googleplus',
-			'socialsharing_facebook',
-			'socialsharing_email',
-			'socialsharing_diaspora',
-		];
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getAppIdentifiers() {
+        return [
+            'socialsharing_twitter',
+            'socialsharing_googleplus',
+            'socialsharing_facebook',
+            'socialsharing_email',
+            'socialsharing_diaspora',
+        ];
+    }
 
 }

lib/public/Files/Mount/IMountPoint.php

Indentation +88 added lines, -88 removed lines

@@ -29,103 +29,103 @@
  */
 interface IMountPoint {
 
-	/**
-	 * get complete path to the mount point
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getMountPoint();
+    /**
+     * get complete path to the mount point
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getMountPoint();
 
-	/**
-	 * Set the mountpoint
-	 *
-	 * @param string $mountPoint new mount point
-	 * @since 8.0.0
-	 */
-	public function setMountPoint($mountPoint);
+    /**
+     * Set the mountpoint
+     *
+     * @param string $mountPoint new mount point
+     * @since 8.0.0
+     */
+    public function setMountPoint($mountPoint);
 
-	/**
-	 * Get the storage that is mounted
-	 *
-	 * @return \OC\Files\Storage\Storage
-	 * @since 8.0.0
-	 */
-	public function getStorage();
+    /**
+     * Get the storage that is mounted
+     *
+     * @return \OC\Files\Storage\Storage
+     * @since 8.0.0
+     */
+    public function getStorage();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return string
+     * @since 8.0.0
+     */
+    public function getStorageId();
 
-	/**
-	 * Get the id of the storages
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getNumericStorageId();
+    /**
+     * Get the id of the storages
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getNumericStorageId();
 
-	/**
-	 * Get the path relative to the mountpoint
-	 *
-	 * @param string $path absolute path to a file or folder
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function getInternalPath($path);
+    /**
+     * Get the path relative to the mountpoint
+     *
+     * @param string $path absolute path to a file or folder
+     * @return string
+     * @since 8.0.0
+     */
+    public function getInternalPath($path);
 
-	/**
-	 * Apply a storage wrapper to the mounted storage
-	 *
-	 * @param callable $wrapper
-	 * @since 8.0.0
-	 */
-	public function wrapStorage($wrapper);
+    /**
+     * Apply a storage wrapper to the mounted storage
+     *
+     * @param callable $wrapper
+     * @since 8.0.0
+     */
+    public function wrapStorage($wrapper);
 
-	/**
-	 * Get a mount option
-	 *
-	 * @param string $name Name of the mount option to get
-	 * @param mixed $default Default value for the mount option
-	 * @return mixed
-	 * @since 8.0.0
-	 */
-	public function getOption($name, $default);
+    /**
+     * Get a mount option
+     *
+     * @param string $name Name of the mount option to get
+     * @param mixed $default Default value for the mount option
+     * @return mixed
+     * @since 8.0.0
+     */
+    public function getOption($name, $default);
 
-	/**
-	 * Get all options for the mount
-	 *
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getOptions();
+    /**
+     * Get all options for the mount
+     *
+     * @return array
+     * @since 8.1.0
+     */
+    public function getOptions();
 
-	/**
-	 * Get the file id of the root of the storage
-	 *
-	 * @return int
-	 * @since 9.1.0
-	 */
-	public function getStorageRootId();
+    /**
+     * Get the file id of the root of the storage
+     *
+     * @return int
+     * @since 9.1.0
+     */
+    public function getStorageRootId();
 
-	/**
-	 * Get the id of the configured mount
-	 *
-	 * @return int|null mount id or null if not applicable
-	 * @since 9.1.0
-	 */
-	public function getMountId();
+    /**
+     * Get the id of the configured mount
+     *
+     * @return int|null mount id or null if not applicable
+     * @since 9.1.0
+     */
+    public function getMountId();
 
-	/**
-	 * Get the type of mount point, used to distinguish things like shares and external storages
-	 * in the web interface
-	 *
-	 * @return string
-	 * @since 12.0.0
-	 */
-	public function getMountType();
+    /**
+     * Get the type of mount point, used to distinguish things like shares and external storages
+     * in the web interface
+     *
+     * @return string
+     * @since 12.0.0
+     */
+    public function getMountType();
 }

apps/dav/lib/Migration/BuildCalendarSearchIndexBackgroundJob.php

Indentation +86 added lines, -86 removed lines

@@ -31,90 +31,90 @@
 
 class BuildCalendarSearchIndexBackgroundJob extends QueuedJob {
 
-	/** @var IDBConnection */
-	private $db;
-
-	/** @var CalDavBackend */
-	private $calDavBackend;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var IJobList */
-	private $jobList;
-
-	/** @var ITimeFactory */
-	private $timeFactory;
-
-	/**
-	 * @param IDBConnection $db
-	 * @param CalDavBackend $calDavBackend
-	 * @param ILogger $logger
-	 * @param IJobList $jobList
-	 * @param ITimeFactory $timeFactory
-	 */
-	public function __construct(IDBConnection $db,
-								CalDavBackend $calDavBackend,
-								ILogger $logger,
-								IJobList $jobList,
-								ITimeFactory $timeFactory) {
-		$this->db = $db;
-		$this->calDavBackend = $calDavBackend;
-		$this->logger = $logger;
-		$this->jobList = $jobList;
-		$this->timeFactory = $timeFactory;
-	}
-
-	public function run($arguments) {
-		$offset = $arguments['offset'];
-		$stopAt = $arguments['stopAt'];
-
-		$this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
-
-		$offset = $this->buildIndex($offset, $stopAt);
-
-		if ($offset >= $stopAt) {
-			$this->logger->info('Building calendar index done');
-		} else {
-			$this->jobList->add(self::class, [
-				'offset' => $offset,
-				'stopAt' => $stopAt
-			]);
-			$this->logger->info('New building calendar index job scheduled with offset ' . $offset);
-		}
-	}
-
-	/**
-	 * @param int $offset
-	 * @param int $stopAt
-	 * @return int
-	 */
-	private function buildIndex($offset, $stopAt) {
-		$startTime = $this->timeFactory->getTime();
-
-		$query = $this->db->getQueryBuilder();
-		$query->select(['id', 'calendarid', 'uri', 'calendardata'])
-			->from('calendarobjects')
-			->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
-			->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
-			->orderBy('id', 'ASC');
-
-		$stmt = $query->execute();
-		while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
-			$offset = $row['id'];
-
-			$calendarData = $row['calendardata'];
-			if (is_resource($calendarData)) {
-				$calendarData = stream_get_contents($calendarData);
-			}
-
-			$this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
-
-			if (($this->timeFactory->getTime() - $startTime) > 15) {
-				return $offset;
-			}
-		}
-
-		return $stopAt;
-	}
+    /** @var IDBConnection */
+    private $db;
+
+    /** @var CalDavBackend */
+    private $calDavBackend;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var IJobList */
+    private $jobList;
+
+    /** @var ITimeFactory */
+    private $timeFactory;
+
+    /**
+     * @param IDBConnection $db
+     * @param CalDavBackend $calDavBackend
+     * @param ILogger $logger
+     * @param IJobList $jobList
+     * @param ITimeFactory $timeFactory
+     */
+    public function __construct(IDBConnection $db,
+                                CalDavBackend $calDavBackend,
+                                ILogger $logger,
+                                IJobList $jobList,
+                                ITimeFactory $timeFactory) {
+        $this->db = $db;
+        $this->calDavBackend = $calDavBackend;
+        $this->logger = $logger;
+        $this->jobList = $jobList;
+        $this->timeFactory = $timeFactory;
+    }
+
+    public function run($arguments) {
+        $offset = $arguments['offset'];
+        $stopAt = $arguments['stopAt'];
+
+        $this->logger->info('Building calendar index (' . $offset .'/' . $stopAt . ')');
+
+        $offset = $this->buildIndex($offset, $stopAt);
+
+        if ($offset >= $stopAt) {
+            $this->logger->info('Building calendar index done');
+        } else {
+            $this->jobList->add(self::class, [
+                'offset' => $offset,
+                'stopAt' => $stopAt
+            ]);
+            $this->logger->info('New building calendar index job scheduled with offset ' . $offset);
+        }
+    }
+
+    /**
+     * @param int $offset
+     * @param int $stopAt
+     * @return int
+     */
+    private function buildIndex($offset, $stopAt) {
+        $startTime = $this->timeFactory->getTime();
+
+        $query = $this->db->getQueryBuilder();
+        $query->select(['id', 'calendarid', 'uri', 'calendardata'])
+            ->from('calendarobjects')
+            ->where($query->expr()->lte('id', $query->createNamedParameter($stopAt)))
+            ->andWhere($query->expr()->gt('id', $query->createNamedParameter($offset)))
+            ->orderBy('id', 'ASC');
+
+        $stmt = $query->execute();
+        while($row = $stmt->fetch(\PDO::FETCH_ASSOC)) {
+            $offset = $row['id'];
+
+            $calendarData = $row['calendardata'];
+            if (is_resource($calendarData)) {
+                $calendarData = stream_get_contents($calendarData);
+            }
+
+            $this->calDavBackend->updateProperties($row['calendarid'], $row['uri'], $calendarData);
+
+            if (($this->timeFactory->getTime() - $startTime) > 15) {
+                return $offset;
+            }
+        }
+
+        return $stopAt;
+    }
 }

lib/public/IPreview.php

Indentation +74 added lines, -74 removed lines

@@ -43,86 +43,86 @@
  */
 interface IPreview {
 
-	/**
-	 * @since 9.2.0
-	 */
-	const EVENT = self::class . ':' . 'PreviewRequested';
+    /**
+     * @since 9.2.0
+     */
+    const EVENT = self::class . ':' . 'PreviewRequested';
 
-	const MODE_FILL = 'fill';
-	const MODE_COVER = 'cover';
+    const MODE_FILL = 'fill';
+    const MODE_COVER = 'cover';
 
-	/**
-	 * In order to improve lazy loading a closure can be registered which will be
-	 * called in case preview providers are actually requested
-	 *
-	 * $callable has to return an instance of \OCP\Preview\IProvider
-	 *
-	 * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
-	 * @param \Closure $callable
-	 * @return void
-	 * @since 8.1.0
-	 */
-	public function registerProvider($mimeTypeRegex, \Closure $callable);
+    /**
+     * In order to improve lazy loading a closure can be registered which will be
+     * called in case preview providers are actually requested
+     *
+     * $callable has to return an instance of \OCP\Preview\IProvider
+     *
+     * @param string $mimeTypeRegex Regex with the mime types that are supported by this provider
+     * @param \Closure $callable
+     * @return void
+     * @since 8.1.0
+     */
+    public function registerProvider($mimeTypeRegex, \Closure $callable);
 
-	/**
-	 * Get all providers
-	 * @return array
-	 * @since 8.1.0
-	 */
-	public function getProviders();
+    /**
+     * Get all providers
+     * @return array
+     * @since 8.1.0
+     */
+    public function getProviders();
 
-	/**
-	 * Does the manager have any providers
-	 * @return bool
-	 * @since 8.1.0
-	 */
-	public function hasProviders();
+    /**
+     * Does the manager have any providers
+     * @return bool
+     * @since 8.1.0
+     */
+    public function hasProviders();
 
-	/**
-	 * Return a preview of a file
-	 * @param string $file The path to the file where you want a thumbnail from
-	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
-	 * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
-	 * @return \OCP\IImage
-	 * @since 6.0.0
-	 * @deprecated 11 Use getPreview
-	 */
-	public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false);
+    /**
+     * Return a preview of a file
+     * @param string $file The path to the file where you want a thumbnail from
+     * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
+     * @param boolean $scaleUp Scale smaller images up to the thumbnail size or not. Might look ugly
+     * @return \OCP\IImage
+     * @since 6.0.0
+     * @deprecated 11 Use getPreview
+     */
+    public function createPreview($file, $maxX = 100, $maxY = 75, $scaleUp = false);
 
-	/**
-	 * Returns a preview of a file
-	 *
-	 * The cache is searched first and if nothing usable was found then a preview is
-	 * generated by one of the providers
-	 *
-	 * @param File $file
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param string $mode
-	 * @param string $mimeType To force a given mimetype for the file (files_versions needs this)
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 * @since 11.0.0 - \InvalidArgumentException was added in 12.0.0
-	 */
-	public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null);
+    /**
+     * Returns a preview of a file
+     *
+     * The cache is searched first and if nothing usable was found then a preview is
+     * generated by one of the providers
+     *
+     * @param File $file
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param string $mode
+     * @param string $mimeType To force a given mimetype for the file (files_versions needs this)
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     * @since 11.0.0 - \InvalidArgumentException was added in 12.0.0
+     */
+    public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null);
 
-	/**
-	 * Returns true if the passed mime type is supported
-	 * @param string $mimeType
-	 * @return boolean
-	 * @since 6.0.0
-	 */
-	public function isMimeSupported($mimeType = '*');
+    /**
+     * Returns true if the passed mime type is supported
+     * @param string $mimeType
+     * @return boolean
+     * @since 6.0.0
+     */
+    public function isMimeSupported($mimeType = '*');
 
-	/**
-	 * Check if a preview can be generated for a file
-	 *
-	 * @param \OCP\Files\FileInfo $file
-	 * @return bool
-	 * @since 8.0.0
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file);
+    /**
+     * Check if a preview can be generated for a file
+     *
+     * @param \OCP\Files\FileInfo $file
+     * @return bool
+     * @since 8.0.0
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file);
 }

apps/dav/lib/CardDAV/PhotoCache.php

Indentation +230 added lines, -230 removed lines

@@ -13,234 +13,234 @@
 
 class PhotoCache {
 
-	/** @var IAppData $appData */
-	protected $appData;
-
-	/**
-	 * PhotoCache constructor.
-	 *
-	 * @param IAppData $appData
-	 */
-	public function __construct(IAppData $appData) {
-		$this->appData = $appData;
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @param int $size
-	 * @param Card $card
-	 *
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 */
-	public function get($addressBookId, $cardUri, $size, Card $card) {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-
-		if ($this->isEmpty($folder)) {
-			$this->init($folder, $card);
-		}
-
-		if (!$this->hasPhoto($folder)) {
-			throw new NotFoundException();
-		}
-
-		if ($size !== -1) {
-			$size = 2 ** ceil(log($size) / log(2));
-		}
-
-		return $this->getFile($folder, $size);
-	}
-
-	/**
-	 * @param ISimpleFolder $folder
-	 * @return bool
-	 */
-	private function isEmpty(ISimpleFolder $folder) {
-		return $folder->getDirectoryListing() === [];
-	}
-
-	/**
-	 * @param ISimpleFolder $folder
-	 * @param Card $card
-	 */
-	private function init(ISimpleFolder $folder, Card $card) {
-		$data = $this->getPhoto($card);
-
-		if ($data === false) {
-			$folder->newFile('nophoto');
-		} else {
-			switch ($data['Content-Type']) {
-				case 'image/png':
-					$ext = 'png';
-					break;
-				case 'image/jpeg':
-					$ext = 'jpg';
-					break;
-				case 'image/gif':
-					$ext = 'gif';
-					break;
-			}
-			$file = $folder->newFile('photo.' . $ext);
-			$file->putContent($data['body']);
-		}
-	}
-
-	private function hasPhoto(ISimpleFolder $folder) {
-		return !$folder->fileExists('nophoto');
-	}
-
-	private function getFile(ISimpleFolder $folder, $size) {
-		$ext = $this->getExtension($folder);
-
-		if ($size === -1) {
-			$path = 'photo.' . $ext;
-		} else {
-			$path = 'photo.' . $size . '.' . $ext;
-		}
-
-		try {
-			$file = $folder->getFile($path);
-		} catch (NotFoundException $e) {
-			if ($size <= 0) {
-				throw new NotFoundException;
-			}
-
-			$photo = new \OC_Image();
-			/** @var ISimpleFile $file */
-			$file = $folder->getFile('photo.' . $ext);
-			$photo->loadFromData($file->getContent());
-
-			$ratio = $photo->width() / $photo->height();
-			if ($ratio < 1) {
-				$ratio = 1/$ratio;
-			}
-			$size = (int)($size * $ratio);
-
-			if ($size !== -1) {
-				$photo->resize($size);
-			}
-			try {
-				$file = $folder->newFile($path);
-				$file->putContent($photo->data());
-			} catch (NotPermittedException $e) {
-
-			}
-		}
-
-		return $file;
-	}
-
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 * @return ISimpleFolder
-	 */
-	private function getFolder($addressBookId, $cardUri) {
-		$hash = md5($addressBookId . ' ' . $cardUri);
-		try {
-			return $this->appData->getFolder($hash);
-		} catch (NotFoundException $e) {
-			return $this->appData->newFolder($hash);
-		}
-	}
-
-	/**
-	 * Get the extension of the avatar. If there is no avatar throw Exception
-	 *
-	 * @param ISimpleFolder $folder
-	 * @return string
-	 * @throws NotFoundException
-	 */
-	private function getExtension(ISimpleFolder $folder) {
-		if ($folder->fileExists('photo.jpg')) {
-			return 'jpg';
-		} elseif ($folder->fileExists('photo.png')) {
-			return 'png';
-		} elseif ($folder->fileExists('photo.gif')) {
-			return 'gif';
-		}
-		throw new NotFoundException;
-	}
-
-	private function getPhoto(Card $node) {
-		try {
-			$vObject = $this->readCard($node->get());
-			if (!$vObject->PHOTO) {
-				return false;
-			}
-
-			$photo = $vObject->PHOTO;
-			$type = $this->getType($photo);
-
-			$val = $photo->getValue();
-			if ($photo->getValueType() === 'URI') {
-				$parsed = \Sabre\URI\parse($val);
-				//only allow data://
-				if ($parsed['scheme'] !== 'data') {
-					return false;
-				}
-				if (substr_count($parsed['path'], ';') === 1) {
-					list($type,) = explode(';', $parsed['path']);
-				}
-				$val = file_get_contents($val);
-			}
-
-			$allowedContentTypes = [
-				'image/png',
-				'image/jpeg',
-				'image/gif',
-			];
-
-			if(!in_array($type, $allowedContentTypes, true)) {
-				$type = 'application/octet-stream';
-			}
-
-			return [
-				'Content-Type' => $type,
-				'body' => $val
-			];
-		} catch(\Exception $ex) {
-
-		}
-		return false;
-	}
-
-	/**
-	 * @param string $cardData
-	 * @return \Sabre\VObject\Document
-	 */
-	private function readCard($cardData) {
-		return Reader::read($cardData);
-	}
-
-	/**
-	 * @param Binary $photo
-	 * @return string
-	 */
-	private function getType(Binary $photo) {
-		$params = $photo->parameters();
-		if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
-			/** @var Parameter $typeParam */
-			$typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
-			$type = $typeParam->getValue();
-
-			if (strpos($type, 'image/') === 0) {
-				return $type;
-			} else {
-				return 'image/' . strtolower($type);
-			}
-		}
-		return '';
-	}
-
-	/**
-	 * @param int $addressBookId
-	 * @param string $cardUri
-	 */
-	public function delete($addressBookId, $cardUri) {
-		$folder = $this->getFolder($addressBookId, $cardUri);
-		$folder->delete();
-	}
+    /** @var IAppData $appData */
+    protected $appData;
+
+    /**
+     * PhotoCache constructor.
+     *
+     * @param IAppData $appData
+     */
+    public function __construct(IAppData $appData) {
+        $this->appData = $appData;
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @param int $size
+     * @param Card $card
+     *
+     * @return ISimpleFile
+     * @throws NotFoundException
+     */
+    public function get($addressBookId, $cardUri, $size, Card $card) {
+        $folder = $this->getFolder($addressBookId, $cardUri);
+
+        if ($this->isEmpty($folder)) {
+            $this->init($folder, $card);
+        }
+
+        if (!$this->hasPhoto($folder)) {
+            throw new NotFoundException();
+        }
+
+        if ($size !== -1) {
+            $size = 2 ** ceil(log($size) / log(2));
+        }
+
+        return $this->getFile($folder, $size);
+    }
+
+    /**
+     * @param ISimpleFolder $folder
+     * @return bool
+     */
+    private function isEmpty(ISimpleFolder $folder) {
+        return $folder->getDirectoryListing() === [];
+    }
+
+    /**
+     * @param ISimpleFolder $folder
+     * @param Card $card
+     */
+    private function init(ISimpleFolder $folder, Card $card) {
+        $data = $this->getPhoto($card);
+
+        if ($data === false) {
+            $folder->newFile('nophoto');
+        } else {
+            switch ($data['Content-Type']) {
+                case 'image/png':
+                    $ext = 'png';
+                    break;
+                case 'image/jpeg':
+                    $ext = 'jpg';
+                    break;
+                case 'image/gif':
+                    $ext = 'gif';
+                    break;
+            }
+            $file = $folder->newFile('photo.' . $ext);
+            $file->putContent($data['body']);
+        }
+    }
+
+    private function hasPhoto(ISimpleFolder $folder) {
+        return !$folder->fileExists('nophoto');
+    }
+
+    private function getFile(ISimpleFolder $folder, $size) {
+        $ext = $this->getExtension($folder);
+
+        if ($size === -1) {
+            $path = 'photo.' . $ext;
+        } else {
+            $path = 'photo.' . $size . '.' . $ext;
+        }
+
+        try {
+            $file = $folder->getFile($path);
+        } catch (NotFoundException $e) {
+            if ($size <= 0) {
+                throw new NotFoundException;
+            }
+
+            $photo = new \OC_Image();
+            /** @var ISimpleFile $file */
+            $file = $folder->getFile('photo.' . $ext);
+            $photo->loadFromData($file->getContent());
+
+            $ratio = $photo->width() / $photo->height();
+            if ($ratio < 1) {
+                $ratio = 1/$ratio;
+            }
+            $size = (int)($size * $ratio);
+
+            if ($size !== -1) {
+                $photo->resize($size);
+            }
+            try {
+                $file = $folder->newFile($path);
+                $file->putContent($photo->data());
+            } catch (NotPermittedException $e) {
+
+            }
+        }
+
+        return $file;
+    }
+
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     * @return ISimpleFolder
+     */
+    private function getFolder($addressBookId, $cardUri) {
+        $hash = md5($addressBookId . ' ' . $cardUri);
+        try {
+            return $this->appData->getFolder($hash);
+        } catch (NotFoundException $e) {
+            return $this->appData->newFolder($hash);
+        }
+    }
+
+    /**
+     * Get the extension of the avatar. If there is no avatar throw Exception
+     *
+     * @param ISimpleFolder $folder
+     * @return string
+     * @throws NotFoundException
+     */
+    private function getExtension(ISimpleFolder $folder) {
+        if ($folder->fileExists('photo.jpg')) {
+            return 'jpg';
+        } elseif ($folder->fileExists('photo.png')) {
+            return 'png';
+        } elseif ($folder->fileExists('photo.gif')) {
+            return 'gif';
+        }
+        throw new NotFoundException;
+    }
+
+    private function getPhoto(Card $node) {
+        try {
+            $vObject = $this->readCard($node->get());
+            if (!$vObject->PHOTO) {
+                return false;
+            }
+
+            $photo = $vObject->PHOTO;
+            $type = $this->getType($photo);
+
+            $val = $photo->getValue();
+            if ($photo->getValueType() === 'URI') {
+                $parsed = \Sabre\URI\parse($val);
+                //only allow data://
+                if ($parsed['scheme'] !== 'data') {
+                    return false;
+                }
+                if (substr_count($parsed['path'], ';') === 1) {
+                    list($type,) = explode(';', $parsed['path']);
+                }
+                $val = file_get_contents($val);
+            }
+
+            $allowedContentTypes = [
+                'image/png',
+                'image/jpeg',
+                'image/gif',
+            ];
+
+            if(!in_array($type, $allowedContentTypes, true)) {
+                $type = 'application/octet-stream';
+            }
+
+            return [
+                'Content-Type' => $type,
+                'body' => $val
+            ];
+        } catch(\Exception $ex) {
+
+        }
+        return false;
+    }
+
+    /**
+     * @param string $cardData
+     * @return \Sabre\VObject\Document
+     */
+    private function readCard($cardData) {
+        return Reader::read($cardData);
+    }
+
+    /**
+     * @param Binary $photo
+     * @return string
+     */
+    private function getType(Binary $photo) {
+        $params = $photo->parameters();
+        if (isset($params['TYPE']) || isset($params['MEDIATYPE'])) {
+            /** @var Parameter $typeParam */
+            $typeParam = isset($params['TYPE']) ? $params['TYPE'] : $params['MEDIATYPE'];
+            $type = $typeParam->getValue();
+
+            if (strpos($type, 'image/') === 0) {
+                return $type;
+            } else {
+                return 'image/' . strtolower($type);
+            }
+        }
+        return '';
+    }
+
+    /**
+     * @param int $addressBookId
+     * @param string $cardUri
+     */
+    public function delete($addressBookId, $cardUri) {
+        $folder = $this->getFolder($addressBookId, $cardUri);
+        $folder->delete();
+    }
 }

apps/dav/lib/Connector/PublicAuth.php

Indentation +75 added lines, -75 removed lines

@@ -42,89 +42,89 @@
  */
 class PublicAuth extends AbstractBasic {
 
-	/** @var \OCP\Share\IShare */
-	private $share;
+    /** @var \OCP\Share\IShare */
+    private $share;
 
-	/** @var IManager */
-	private $shareManager;
+    /** @var IManager */
+    private $shareManager;
 
-	/** @var ISession */
-	private $session;
+    /** @var ISession */
+    private $session;
 
-	/** @var IRequest */
-	private $request;
+    /** @var IRequest */
+    private $request;
 
-	/**
-	 * @param IRequest $request
-	 * @param IManager $shareManager
-	 * @param ISession $session
-	 */
-	public function __construct(IRequest $request,
-								IManager $shareManager,
-								ISession $session) {
-		$this->request = $request;
-		$this->shareManager = $shareManager;
-		$this->session = $session;
+    /**
+     * @param IRequest $request
+     * @param IManager $shareManager
+     * @param ISession $session
+     */
+    public function __construct(IRequest $request,
+                                IManager $shareManager,
+                                ISession $session) {
+        $this->request = $request;
+        $this->shareManager = $shareManager;
+        $this->session = $session;
 
-		// setup realm
-		$defaults = new \OCP\Defaults();
-		$this->realm = $defaults->getName();
-	}
+        // setup realm
+        $defaults = new \OCP\Defaults();
+        $this->realm = $defaults->getName();
+    }
 
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 *
-	 * @return bool
-	 * @throws \Sabre\DAV\Exception\NotAuthenticated
-	 */
-	protected function validateUserPass($username, $password) {
-		try {
-			$share = $this->shareManager->getShareByToken($username);
-		} catch (ShareNotFound $e) {
-			return false;
-		}
+    /**
+     * Validates a username and password
+     *
+     * This method should return true or false depending on if login
+     * succeeded.
+     *
+     * @param string $username
+     * @param string $password
+     *
+     * @return bool
+     * @throws \Sabre\DAV\Exception\NotAuthenticated
+     */
+    protected function validateUserPass($username, $password) {
+        try {
+            $share = $this->shareManager->getShareByToken($username);
+        } catch (ShareNotFound $e) {
+            return false;
+        }
 
-		$this->share = $share;
+        $this->share = $share;
 
-		\OC_User::setIncognitoMode(true);
+        \OC_User::setIncognitoMode(true);
 
-		// check if the share is password protected
-		if ($share->getPassword() !== null) {
-			if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
-				if ($this->shareManager->checkPassword($share, $password)) {
-					return true;
-				} else if ($this->session->exists('public_link_authenticated')
-					&& $this->session->get('public_link_authenticated') === (string)$share->getId()) {
-					return true;
-				} else {
-					if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
-						// do not re-authenticate over ajax, use dummy auth name to prevent browser popup
-						http_response_code(401);
-						header('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
-						throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
-					}
-					return false;
-				}
-			} else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			return true;
-		}
-	}
+        // check if the share is password protected
+        if ($share->getPassword() !== null) {
+            if ($share->getShareType() === \OCP\Share::SHARE_TYPE_LINK || $share->getShareType() === \OCP\Share::SHARE_TYPE_EMAIL) {
+                if ($this->shareManager->checkPassword($share, $password)) {
+                    return true;
+                } else if ($this->session->exists('public_link_authenticated')
+                    && $this->session->get('public_link_authenticated') === (string)$share->getId()) {
+                    return true;
+                } else {
+                    if (in_array('XMLHttpRequest', explode(',', $this->request->getHeader('X-Requested-With')))) {
+                        // do not re-authenticate over ajax, use dummy auth name to prevent browser popup
+                        http_response_code(401);
+                        header('WWW-Authenticate','DummyBasic realm="' . $this->realm . '"');
+                        throw new \Sabre\DAV\Exception\NotAuthenticated('Cannot authenticate over ajax calls');
+                    }
+                    return false;
+                }
+            } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_REMOTE) {
+                return true;
+            } else {
+                return false;
+            }
+        } else {
+            return true;
+        }
+    }
 
-	/**
-	 * @return \OCP\Share\IShare
-	 */
-	public function getShare() {
-		return $this->share;
-	}
+    /**
+     * @return \OCP\Share\IShare
+     */
+    public function getShare() {
+        return $this->share;
+    }
 }