nextcloud / server

lib/private/Collaboration/Collaborators/RemoteGroupPlugin.php

Indentation +51 added lines, -51 removed lines

@@ -34,62 +34,62 @@
 use OCP\Share\IShare;
 
 class RemoteGroupPlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
+    protected $shareeEnumeration;
 
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var bool */
-	private $enabled = false;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var bool */
+    private $enabled = false;
 
-	public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager, ICloudIdManager $cloudIdManager) {
-		try {
-			$fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
-			$supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
-			if (in_array('group', $supportedShareTypes)) {
-				$this->enabled = true;
-			}
-		} catch (\Exception $e) {
-			// do nothing, just don't enable federated group shares
-		}
-		$this->cloudIdManager = $cloudIdManager;
-	}
+    public function __construct(ICloudFederationProviderManager $cloudFederationProviderManager, ICloudIdManager $cloudIdManager) {
+        try {
+            $fileSharingProvider = $cloudFederationProviderManager->getCloudFederationProvider('file');
+            $supportedShareTypes = $fileSharingProvider->getSupportedShareTypes();
+            if (in_array('group', $supportedShareTypes)) {
+                $this->enabled = true;
+            }
+        } catch (\Exception $e) {
+            // do nothing, just don't enable federated group shares
+        }
+        $this->cloudIdManager = $cloudIdManager;
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remote_groups');
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remote_groups');
 
-		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
-			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
-				'guid' => $remoteGroup,
-				'name' => $remoteGroup,
-				'value' => [
-					'shareType' => IShare::TYPE_REMOTE_GROUP,
-					'shareWith' => $search,
-					'server' => $serverUrl,
-				],
-			];
-		}
+        if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            [$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
+            $result['exact'][] = [
+                'label' => $remoteGroup . " ($serverUrl)",
+                'guid' => $remoteGroup,
+                'name' => $remoteGroup,
+                'value' => [
+                    'shareType' => IShare::TYPE_REMOTE_GROUP,
+                    'shareWith' => $search,
+                    'server' => $serverUrl,
+                ],
+            ];
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split group and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitGroupRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split group and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitGroupRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
 		if ($this->enabled && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
 			[$remoteGroup, $serverUrl] = $this->splitGroupRemote($search);
 			$result['exact'][] = [
-				'label' => $remoteGroup . " ($serverUrl)",
+				'label' => $remoteGroup." ($serverUrl)",
 				'guid' => $remoteGroup,
 				'name' => $remoteGroup,
 				'value' => [

lib/private/Collaboration/Collaborators/RemotePlugin.php

Indentation +140 added lines, -140 removed lines

@@ -38,155 +38,155 @@
 use OCP\Share\IShare;
 
 class RemotePlugin implements ISearchPlugin {
-	protected $shareeEnumeration;
+    protected $shareeEnumeration;
 
-	/** @var IManager */
-	private $contactsManager;
-	/** @var ICloudIdManager */
-	private $cloudIdManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IUserManager */
-	private $userManager;
-	/** @var string */
-	private $userId = '';
+    /** @var IManager */
+    private $contactsManager;
+    /** @var ICloudIdManager */
+    private $cloudIdManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IUserManager */
+    private $userManager;
+    /** @var string */
+    private $userId = '';
 
-	public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager, IUserSession $userSession) {
-		$this->contactsManager = $contactsManager;
-		$this->cloudIdManager = $cloudIdManager;
-		$this->config = $config;
-		$this->userManager = $userManager;
-		$user = $userSession->getUser();
-		if ($user !== null) {
-			$this->userId = $user->getUID();
-		}
-		$this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
-	}
+    public function __construct(IManager $contactsManager, ICloudIdManager $cloudIdManager, IConfig $config, IUserManager $userManager, IUserSession $userSession) {
+        $this->contactsManager = $contactsManager;
+        $this->cloudIdManager = $cloudIdManager;
+        $this->config = $config;
+        $this->userManager = $userManager;
+        $user = $userSession->getUser();
+        if ($user !== null) {
+            $this->userId = $user->getUID();
+        }
+        $this->shareeEnumeration = $this->config->getAppValue('core', 'shareapi_allow_share_dialog_user_enumeration', 'yes') === 'yes';
+    }
 
-	public function search($search, $limit, $offset, ISearchResult $searchResult) {
-		$result = ['wide' => [], 'exact' => []];
-		$resultType = new SearchResultType('remotes');
+    public function search($search, $limit, $offset, ISearchResult $searchResult) {
+        $result = ['wide' => [], 'exact' => []];
+        $resultType = new SearchResultType('remotes');
 
-		// Search in contacts
-		$addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], ['limit' => $limit, 'offset' => $offset]);
-		foreach ($addressBookContacts as $contact) {
-			if (isset($contact['isLocalSystemBook'])) {
-				continue;
-			}
-			if (isset($contact['CLOUD'])) {
-				$cloudIds = $contact['CLOUD'];
-				if (is_string($cloudIds)) {
-					$cloudIds = [$cloudIds];
-				}
-				$lowerSearch = strtolower($search);
-				foreach ($cloudIds as $cloudId) {
-					$cloudIdType = '';
-					if (\is_array($cloudId)) {
-						$cloudIdData = $cloudId;
-						$cloudId = $cloudIdData['value'];
-						$cloudIdType = $cloudIdData['type'];
-					}
-					try {
-						[$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
-					} catch (\InvalidArgumentException $e) {
-						continue;
-					}
+        // Search in contacts
+        $addressBookContacts = $this->contactsManager->search($search, ['CLOUD', 'FN'], ['limit' => $limit, 'offset' => $offset]);
+        foreach ($addressBookContacts as $contact) {
+            if (isset($contact['isLocalSystemBook'])) {
+                continue;
+            }
+            if (isset($contact['CLOUD'])) {
+                $cloudIds = $contact['CLOUD'];
+                if (is_string($cloudIds)) {
+                    $cloudIds = [$cloudIds];
+                }
+                $lowerSearch = strtolower($search);
+                foreach ($cloudIds as $cloudId) {
+                    $cloudIdType = '';
+                    if (\is_array($cloudId)) {
+                        $cloudIdData = $cloudId;
+                        $cloudId = $cloudIdData['value'];
+                        $cloudIdType = $cloudIdData['type'];
+                    }
+                    try {
+                        [$remoteUser, $serverUrl] = $this->splitUserRemote($cloudId);
+                    } catch (\InvalidArgumentException $e) {
+                        continue;
+                    }
 
-					$localUser = $this->userManager->get($remoteUser);
-					/**
-					 * Add local share if remote cloud id matches a local user ones
-					 */
-					if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
-						$result['wide'][] = [
-							'label' => $contact['FN'],
-							'uuid' => $contact['UID'],
-							'value' => [
-								'shareType' => IShare::TYPE_USER,
-								'shareWith' => $remoteUser
-							],
-							'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
-						];
-					}
+                    $localUser = $this->userManager->get($remoteUser);
+                    /**
+                     * Add local share if remote cloud id matches a local user ones
+                     */
+                    if ($localUser !== null && $remoteUser !== $this->userId && $cloudId === $localUser->getCloudId()) {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'],
+                            'uuid' => $contact['UID'],
+                            'value' => [
+                                'shareType' => IShare::TYPE_USER,
+                                'shareWith' => $remoteUser
+                            ],
+                            'shareWithDisplayNameUnique' => $contact['EMAIL'] !== null && $contact['EMAIL'] !== '' ? $contact['EMAIL'] : $contact['UID'],
+                        ];
+                    }
 
-					if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
-						if (strtolower($cloudId) === $lowerSearch) {
-							$searchResult->markExactIdMatch($resultType);
-						}
-						$result['exact'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					} else {
-						$result['wide'][] = [
-							'label' => $contact['FN'] . " ($cloudId)",
-							'uuid' => $contact['UID'],
-							'name' => $contact['FN'],
-							'type' => $cloudIdType,
-							'value' => [
-								'shareType' => IShare::TYPE_REMOTE,
-								'shareWith' => $cloudId,
-								'server' => $serverUrl,
-							],
-						];
-					}
-				}
-			}
-		}
+                    if (strtolower($contact['FN']) === $lowerSearch || strtolower($cloudId) === $lowerSearch) {
+                        if (strtolower($cloudId) === $lowerSearch) {
+                            $searchResult->markExactIdMatch($resultType);
+                        }
+                        $result['exact'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    } else {
+                        $result['wide'][] = [
+                            'label' => $contact['FN'] . " ($cloudId)",
+                            'uuid' => $contact['UID'],
+                            'name' => $contact['FN'],
+                            'type' => $cloudIdType,
+                            'value' => [
+                                'shareType' => IShare::TYPE_REMOTE,
+                                'shareWith' => $cloudId,
+                                'server' => $serverUrl,
+                            ],
+                        ];
+                    }
+                }
+            }
+        }
 
-		if (!$this->shareeEnumeration) {
-			$result['wide'] = [];
-		} else {
-			$result['wide'] = array_slice($result['wide'], $offset, $limit);
-		}
+        if (!$this->shareeEnumeration) {
+            $result['wide'] = [];
+        } else {
+            $result['wide'] = array_slice($result['wide'], $offset, $limit);
+        }
 
-		/**
-		 * Add generic share with remote item for valid cloud ids that are not users of the local instance
-		 */
-		if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
-			try {
-				[$remoteUser, $serverUrl] = $this->splitUserRemote($search);
-				$localUser = $this->userManager->get($remoteUser);
-				if ($localUser === null || $search !== $localUser->getCloudId()) {
-					$result['exact'][] = [
-						'label' => $remoteUser . " ($serverUrl)",
-						'uuid' => $remoteUser,
-						'name' => $remoteUser,
-						'value' => [
-							'shareType' => IShare::TYPE_REMOTE,
-							'shareWith' => $search,
-							'server' => $serverUrl,
-						],
-					];
-				}
-			} catch (\InvalidArgumentException $e) {
-			}
-		}
+        /**
+         * Add generic share with remote item for valid cloud ids that are not users of the local instance
+         */
+        if (!$searchResult->hasExactIdMatch($resultType) && $this->cloudIdManager->isValidCloudId($search) && $offset === 0) {
+            try {
+                [$remoteUser, $serverUrl] = $this->splitUserRemote($search);
+                $localUser = $this->userManager->get($remoteUser);
+                if ($localUser === null || $search !== $localUser->getCloudId()) {
+                    $result['exact'][] = [
+                        'label' => $remoteUser . " ($serverUrl)",
+                        'uuid' => $remoteUser,
+                        'name' => $remoteUser,
+                        'value' => [
+                            'shareType' => IShare::TYPE_REMOTE,
+                            'shareWith' => $search,
+                            'server' => $serverUrl,
+                        ],
+                    ];
+                }
+            } catch (\InvalidArgumentException $e) {
+            }
+        }
 
-		$searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
+        $searchResult->addResultSet($resultType, $result['wide'], $result['exact']);
 
-		return true;
-	}
+        return true;
+    }
 
-	/**
-	 * split user and remote from federated cloud id
-	 *
-	 * @param string $address federated share address
-	 * @return array [user, remoteURL]
-	 * @throws \InvalidArgumentException
-	 */
-	public function splitUserRemote($address) {
-		try {
-			$cloudId = $this->cloudIdManager->resolveCloudId($address);
-			return [$cloudId->getUser(), $cloudId->getRemote()];
-		} catch (\InvalidArgumentException $e) {
-			throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
-		}
-	}
+    /**
+     * split user and remote from federated cloud id
+     *
+     * @param string $address federated share address
+     * @return array [user, remoteURL]
+     * @throws \InvalidArgumentException
+     */
+    public function splitUserRemote($address) {
+        try {
+            $cloudId = $this->cloudIdManager->resolveCloudId($address);
+            return [$cloudId->getUser(), $cloudId->getRemote()];
+        } catch (\InvalidArgumentException $e) {
+            throw new \InvalidArgumentException('Invalid Federated Cloud ID', 0, $e);
+        }
+    }
 }

lib/private/Template/IconsCacher.php

Indentation +222 added lines, -222 removed lines

@@ -42,226 +42,226 @@
 
 class IconsCacher {
 
-	/** @var ILogger */
-	protected $logger;
-
-	/** @var IAppData */
-	protected $appData;
-
-	/** @var ISimpleFolder */
-	private $folder;
-
-	/** @var IURLGenerator */
-	protected $urlGenerator;
-
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var string */
-	private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+):\s?url\(["\']?([a-zA-Z0-9-_\~\/\.\?\&\=\:\;\+\,]+)[^;]+;/m';
-
-	/** @var string */
-	private $fileName = 'icons-vars.css';
-
-	private $iconList = 'icons-list.template';
-
-	private $cachedCss;
-	private $cachedList;
-
-	/**
-	 * @param ILogger $logger
-	 * @param Factory $appDataFactory
-	 * @param IURLGenerator $urlGenerator
-	 * @param ITimeFactory $timeFactory
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function __construct(ILogger $logger,
-								Factory $appDataFactory,
-								IURLGenerator $urlGenerator,
-								ITimeFactory $timeFactory) {
-		$this->logger = $logger;
-		$this->appData = $appDataFactory->get('css');
-		$this->urlGenerator = $urlGenerator;
-		$this->timeFactory = $timeFactory;
-
-		try {
-			$this->folder = $this->appData->getFolder('icons');
-		} catch (NotFoundException $e) {
-			$this->folder = $this->appData->newFolder('icons');
-		}
-	}
-
-	private function getIconsFromCss(string $css): array {
-		preg_match_all($this->iconVarRE, $css, $matches, PREG_SET_ORDER);
-		$icons = [];
-		foreach ($matches as $icon) {
-			$icons[$icon[1]] = $icon[2];
-		}
-
-		return $icons;
-	}
-
-	/**
-	 * @param string $css
-	 * @return string
-	 * @throws NotFoundException
-	 * @throws \OCP\Files\NotPermittedException
-	 */
-	public function setIconsCss(string $css): string {
-		$cachedFile = $this->getCachedList();
-		if (!$cachedFile) {
-			$currentData = '';
-			$cachedFile = $this->folder->newFile($this->iconList);
-		} else {
-			$currentData = $cachedFile->getContent();
-		}
-
-		$cachedVarsCssFile = $this->getCachedCSS();
-		if (!$cachedVarsCssFile) {
-			$cachedVarsCssFile = $this->folder->newFile($this->fileName);
-		}
-
-		$icons = $this->getIconsFromCss($currentData . $css);
-
-		$data = '';
-		$list = '';
-		foreach ($icons as $icon => $url) {
-			$list .= "--$icon: url('$url');";
-			[$location,$color] = $this->parseUrl($url);
-			$svg = false;
-			if ($location !== '' && \file_exists($location)) {
-				$svg = \file_get_contents($location);
-			}
-			if ($svg === false) {
-				$this->logger->debug('Failed to get icon file ' . $location);
-				$data .= "--$icon: url('$url');";
-				continue;
-			}
-			$encode = base64_encode($this->colorizeSvg($svg, $color));
-			$data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
-		}
-
-		if (\strlen($data) > 0 && \strlen($list) > 0) {
-			$data = ":root {\n$data\n}";
-			$cachedVarsCssFile->putContent($data);
-			$list = ":root {\n$list\n}";
-			$cachedFile->putContent($list);
-			$this->cachedList = null;
-			$this->cachedCss = null;
-		}
-
-		return preg_replace($this->iconVarRE, '', $css);
-	}
-
-	/**
-	 * @param $url
-	 * @return array
-	 */
-	private function parseUrl($url): array {
-		$location = '';
-		$color = '';
-		$base = $this->getRoutePrefix() . '/svg/';
-		$cleanUrl = \substr($url, \strlen($base));
-		if (\strpos($url, $base . 'core') === 0) {
-			$cleanUrl = \substr($cleanUrl, \strlen('core'));
-			if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				[,$cleanUrl,$color] = $matches;
-				$location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
-			}
-		} elseif (\strpos($url, $base) === 0) {
-			if (\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				[,$app,$cleanUrl, $color] = $matches;
-				$location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
-				if ($app === 'settings') {
-					$location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
-				}
-			}
-		}
-		return [
-			$location,
-			$color
-		];
-	}
-
-	/**
-	 * @param $svg
-	 * @param $color
-	 * @return string
-	 */
-	public function colorizeSvg($svg, $color): string {
-		if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
-			// Prevent not-sane colors from being written into the SVG
-			$color = '000';
-		}
-
-		// add fill (fill is not present on black elements)
-		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
-		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
-
-		// replace any fill or stroke colors
-		$svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
-		$svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
-		return $svg;
-	}
-
-	private function getRoutePrefix() {
-		$frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
-		if ($frontControllerActive) {
-			$prefix = \OC::$WEBROOT;
-		}
-		return $prefix;
-	}
-
-	/**
-	 * Get icons css file
-	 * @return ISimpleFile|boolean
-	 */
-	public function getCachedCSS() {
-		try {
-			if (!$this->cachedCss) {
-				$this->cachedCss = $this->folder->getFile($this->fileName);
-			}
-			return $this->cachedCss;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Get icon-vars list template
-	 * @return ISimpleFile|boolean
-	 */
-	public function getCachedList() {
-		try {
-			if (!$this->cachedList) {
-				$this->cachedList = $this->folder->getFile($this->iconList);
-			}
-			return $this->cachedList;
-		} catch (NotFoundException $e) {
-			return false;
-		}
-	}
-
-	/**
-	 * Add the icons cache css into the header
-	 */
-	public function injectCss() {
-		$mtime = $this->timeFactory->getTime();
-		$file = $this->getCachedList();
-		if ($file) {
-			$mtime = $file->getMTime();
-		}
-		// Only inject once
-		foreach (\OC_Util::$headers as $header) {
-			if (
-				array_key_exists('attributes', $header) &&
-				array_key_exists('href', $header['attributes']) &&
-				strpos($header['attributes']['href'], $this->fileName) !== false) {
-				return;
-			}
-		}
-		$linkToCSS = $this->urlGenerator->linkToRoute('core.Css.getCss', ['appName' => 'icons', 'fileName' => $this->fileName, 'v' => $mtime]);
-		\OC_Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS], null, true);
-	}
+    /** @var ILogger */
+    protected $logger;
+
+    /** @var IAppData */
+    protected $appData;
+
+    /** @var ISimpleFolder */
+    private $folder;
+
+    /** @var IURLGenerator */
+    protected $urlGenerator;
+
+    /** @var ITimeFactory */
+    protected $timeFactory;
+
+    /** @var string */
+    private $iconVarRE = '/--(icon-[a-zA-Z0-9-]+):\s?url\(["\']?([a-zA-Z0-9-_\~\/\.\?\&\=\:\;\+\,]+)[^;]+;/m';
+
+    /** @var string */
+    private $fileName = 'icons-vars.css';
+
+    private $iconList = 'icons-list.template';
+
+    private $cachedCss;
+    private $cachedList;
+
+    /**
+     * @param ILogger $logger
+     * @param Factory $appDataFactory
+     * @param IURLGenerator $urlGenerator
+     * @param ITimeFactory $timeFactory
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function __construct(ILogger $logger,
+                                Factory $appDataFactory,
+                                IURLGenerator $urlGenerator,
+                                ITimeFactory $timeFactory) {
+        $this->logger = $logger;
+        $this->appData = $appDataFactory->get('css');
+        $this->urlGenerator = $urlGenerator;
+        $this->timeFactory = $timeFactory;
+
+        try {
+            $this->folder = $this->appData->getFolder('icons');
+        } catch (NotFoundException $e) {
+            $this->folder = $this->appData->newFolder('icons');
+        }
+    }
+
+    private function getIconsFromCss(string $css): array {
+        preg_match_all($this->iconVarRE, $css, $matches, PREG_SET_ORDER);
+        $icons = [];
+        foreach ($matches as $icon) {
+            $icons[$icon[1]] = $icon[2];
+        }
+
+        return $icons;
+    }
+
+    /**
+     * @param string $css
+     * @return string
+     * @throws NotFoundException
+     * @throws \OCP\Files\NotPermittedException
+     */
+    public function setIconsCss(string $css): string {
+        $cachedFile = $this->getCachedList();
+        if (!$cachedFile) {
+            $currentData = '';
+            $cachedFile = $this->folder->newFile($this->iconList);
+        } else {
+            $currentData = $cachedFile->getContent();
+        }
+
+        $cachedVarsCssFile = $this->getCachedCSS();
+        if (!$cachedVarsCssFile) {
+            $cachedVarsCssFile = $this->folder->newFile($this->fileName);
+        }
+
+        $icons = $this->getIconsFromCss($currentData . $css);
+
+        $data = '';
+        $list = '';
+        foreach ($icons as $icon => $url) {
+            $list .= "--$icon: url('$url');";
+            [$location,$color] = $this->parseUrl($url);
+            $svg = false;
+            if ($location !== '' && \file_exists($location)) {
+                $svg = \file_get_contents($location);
+            }
+            if ($svg === false) {
+                $this->logger->debug('Failed to get icon file ' . $location);
+                $data .= "--$icon: url('$url');";
+                continue;
+            }
+            $encode = base64_encode($this->colorizeSvg($svg, $color));
+            $data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
+        }
+
+        if (\strlen($data) > 0 && \strlen($list) > 0) {
+            $data = ":root {\n$data\n}";
+            $cachedVarsCssFile->putContent($data);
+            $list = ":root {\n$list\n}";
+            $cachedFile->putContent($list);
+            $this->cachedList = null;
+            $this->cachedCss = null;
+        }
+
+        return preg_replace($this->iconVarRE, '', $css);
+    }
+
+    /**
+     * @param $url
+     * @return array
+     */
+    private function parseUrl($url): array {
+        $location = '';
+        $color = '';
+        $base = $this->getRoutePrefix() . '/svg/';
+        $cleanUrl = \substr($url, \strlen($base));
+        if (\strpos($url, $base . 'core') === 0) {
+            $cleanUrl = \substr($cleanUrl, \strlen('core'));
+            if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
+                [,$cleanUrl,$color] = $matches;
+                $location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
+            }
+        } elseif (\strpos($url, $base) === 0) {
+            if (\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
+                [,$app,$cleanUrl, $color] = $matches;
+                $location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
+                if ($app === 'settings') {
+                    $location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
+                }
+            }
+        }
+        return [
+            $location,
+            $color
+        ];
+    }
+
+    /**
+     * @param $svg
+     * @param $color
+     * @return string
+     */
+    public function colorizeSvg($svg, $color): string {
+        if (!preg_match('/^[0-9a-f]{3,6}$/i', $color)) {
+            // Prevent not-sane colors from being written into the SVG
+            $color = '000';
+        }
+
+        // add fill (fill is not present on black elements)
+        $fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
+        $svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
+
+        // replace any fill or stroke colors
+        $svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
+        $svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
+        return $svg;
+    }
+
+    private function getRoutePrefix() {
+        $frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
+        $prefix = \OC::$WEBROOT . '/index.php';
+        if ($frontControllerActive) {
+            $prefix = \OC::$WEBROOT;
+        }
+        return $prefix;
+    }
+
+    /**
+     * Get icons css file
+     * @return ISimpleFile|boolean
+     */
+    public function getCachedCSS() {
+        try {
+            if (!$this->cachedCss) {
+                $this->cachedCss = $this->folder->getFile($this->fileName);
+            }
+            return $this->cachedCss;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Get icon-vars list template
+     * @return ISimpleFile|boolean
+     */
+    public function getCachedList() {
+        try {
+            if (!$this->cachedList) {
+                $this->cachedList = $this->folder->getFile($this->iconList);
+            }
+            return $this->cachedList;
+        } catch (NotFoundException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * Add the icons cache css into the header
+     */
+    public function injectCss() {
+        $mtime = $this->timeFactory->getTime();
+        $file = $this->getCachedList();
+        if ($file) {
+            $mtime = $file->getMTime();
+        }
+        // Only inject once
+        foreach (\OC_Util::$headers as $header) {
+            if (
+                array_key_exists('attributes', $header) &&
+                array_key_exists('href', $header['attributes']) &&
+                strpos($header['attributes']['href'], $this->fileName) !== false) {
+                return;
+            }
+        }
+        $linkToCSS = $this->urlGenerator->linkToRoute('core.Css.getCss', ['appName' => 'icons', 'fileName' => $this->fileName, 'v' => $mtime]);
+        \OC_Util::addHeader('link', ['rel' => 'stylesheet', 'href' => $linkToCSS], null, true);
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -121,24 +121,24 @@ 
 			$cachedVarsCssFile = $this->folder->newFile($this->fileName);
 		}
 
-		$icons = $this->getIconsFromCss($currentData . $css);
+		$icons = $this->getIconsFromCss($currentData.$css);
 
 		$data = '';
 		$list = '';
 		foreach ($icons as $icon => $url) {
 			$list .= "--$icon: url('$url');";
-			[$location,$color] = $this->parseUrl($url);
+			[$location, $color] = $this->parseUrl($url);
 			$svg = false;
 			if ($location !== '' && \file_exists($location)) {
 				$svg = \file_get_contents($location);
 			}
 			if ($svg === false) {
-				$this->logger->debug('Failed to get icon file ' . $location);
+				$this->logger->debug('Failed to get icon file '.$location);
 				$data .= "--$icon: url('$url');";
 				continue;
 			}
 			$encode = base64_encode($this->colorizeSvg($svg, $color));
-			$data .= '--' . $icon . ': url(data:image/svg+xml;base64,' . $encode . ');';
+			$data .= '--'.$icon.': url(data:image/svg+xml;base64,'.$encode.');';
 		}
 
 		if (\strlen($data) > 0 && \strlen($list) > 0) {
@@ -160,20 +160,20 @@ 
 	private function parseUrl($url): array {
 		$location = '';
 		$color = '';
-		$base = $this->getRoutePrefix() . '/svg/';
+		$base = $this->getRoutePrefix().'/svg/';
 		$cleanUrl = \substr($url, \strlen($base));
-		if (\strpos($url, $base . 'core') === 0) {
+		if (\strpos($url, $base.'core') === 0) {
 			$cleanUrl = \substr($cleanUrl, \strlen('core'));
 			if (\preg_match('/\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				[,$cleanUrl,$color] = $matches;
-				$location = \OC::$SERVERROOT . '/core/img/' . $cleanUrl . '.svg';
+				[,$cleanUrl, $color] = $matches;
+				$location = \OC::$SERVERROOT.'/core/img/'.$cleanUrl.'.svg';
 			}
 		} elseif (\strpos($url, $base) === 0) {
 			if (\preg_match('/([A-z0-9\_\-]+)\/([a-zA-Z0-9-_\~\/\.\=\:\;\+\,]+)\?color=([0-9a-fA-F]{3,6})/', $cleanUrl, $matches)) {
-				[,$app,$cleanUrl, $color] = $matches;
-				$location = \OC_App::getAppPath($app) . '/img/' . $cleanUrl . '.svg';
+				[,$app, $cleanUrl, $color] = $matches;
+				$location = \OC_App::getAppPath($app).'/img/'.$cleanUrl.'.svg';
 				if ($app === 'settings') {
-					$location = \OC::$SERVERROOT . '/settings/img/' . $cleanUrl . '.svg';
+					$location = \OC::$SERVERROOT.'/settings/img/'.$cleanUrl.'.svg';
 				}
 			}
 		}
@@ -196,17 +196,17 @@ 
 
 		// add fill (fill is not present on black elements)
 		$fillRe = '/<((circle|rect|path)((?!fill)[a-z0-9 =".\-#():;,])+)\/>/mi';
-		$svg = preg_replace($fillRe, '<$1 fill="#' . $color . '"/>', $svg);
+		$svg = preg_replace($fillRe, '<$1 fill="#'.$color.'"/>', $svg);
 
 		// replace any fill or stroke colors
-		$svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#' . $color . '"', $svg);
-		$svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#' . $color . '"', $svg);
+		$svg = preg_replace('/stroke="#([a-z0-9]{3,6})"/mi', 'stroke="#'.$color.'"', $svg);
+		$svg = preg_replace('/fill="#([a-z0-9]{3,6})"/mi', 'fill="#'.$color.'"', $svg);
 		return $svg;
 	}
 
 	private function getRoutePrefix() {
 		$frontControllerActive = (\OC::$server->getConfig()->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true');
-		$prefix = \OC::$WEBROOT . '/index.php';
+		$prefix = \OC::$WEBROOT.'/index.php';
 		if ($frontControllerActive) {
 			$prefix = \OC::$WEBROOT;
 		}

lib/private/Activity/EventMerger.php

Indentation +202 added lines, -202 removed lines

@@ -31,231 +31,231 @@
 
 class EventMerger implements IEventMerger {
 
-	/** @var IL10N */
-	protected $l10n;
+    /** @var IL10N */
+    protected $l10n;
 
-	/**
-	 * @param IL10N $l10n
-	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
-	}
+    /**
+     * @param IL10N $l10n
+     */
+    public function __construct(IL10N $l10n) {
+        $this->l10n = $l10n;
+    }
 
-	/**
-	 * Combines two events when possible to have grouping:
-	 *
-	 * Example1: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with different file and same user will be merged
-	 * to '{user} created {file1} and {file2}' and the childEvent on the return
-	 * will be set, if the events have been merged.
-	 *
-	 * Example2: Two events with subject '{user} created {file}' and
-	 * $mergeParameter file with same file and same user will be merged to
-	 * '{user} created {file1}' and the childEvent on the return will be set, if
-	 * the events have been merged.
-	 *
-	 * The following requirements have to be met, in order to be merged:
-	 * - Both events need to have the same `getApp()`
-	 * - Both events must not have a message `getMessage()`
-	 * - Both events need to have the same subject `getSubject()`
-	 * - Both events need to have the same object type `getObjectType()`
-	 * - The time difference between both events must not be bigger then 3 hours
-	 * - Only up to 5 events can be merged.
-	 * - All parameters apart from such starting with $mergeParameter must be
-	 *   the same for both events.
-	 *
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 */
-	public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) {
-		// No second event => can not combine
-		if (!$previousEvent instanceof IEvent) {
-			return $event;
-		}
+    /**
+     * Combines two events when possible to have grouping:
+     *
+     * Example1: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with different file and same user will be merged
+     * to '{user} created {file1} and {file2}' and the childEvent on the return
+     * will be set, if the events have been merged.
+     *
+     * Example2: Two events with subject '{user} created {file}' and
+     * $mergeParameter file with same file and same user will be merged to
+     * '{user} created {file1}' and the childEvent on the return will be set, if
+     * the events have been merged.
+     *
+     * The following requirements have to be met, in order to be merged:
+     * - Both events need to have the same `getApp()`
+     * - Both events must not have a message `getMessage()`
+     * - Both events need to have the same subject `getSubject()`
+     * - Both events need to have the same object type `getObjectType()`
+     * - The time difference between both events must not be bigger then 3 hours
+     * - Only up to 5 events can be merged.
+     * - All parameters apart from such starting with $mergeParameter must be
+     *   the same for both events.
+     *
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     */
+    public function mergeEvents($mergeParameter, IEvent $event, IEvent $previousEvent = null) {
+        // No second event => can not combine
+        if (!$previousEvent instanceof IEvent) {
+            return $event;
+        }
 
-		// Different app => can not combine
-		if ($event->getApp() !== $previousEvent->getApp()) {
-			return $event;
-		}
+        // Different app => can not combine
+        if ($event->getApp() !== $previousEvent->getApp()) {
+            return $event;
+        }
 
-		// Message is set => can not combine
-		if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
-			return $event;
-		}
+        // Message is set => can not combine
+        if ($event->getMessage() !== '' || $previousEvent->getMessage() !== '') {
+            return $event;
+        }
 
-		// Different subject => can not combine
-		if ($event->getSubject() !== $previousEvent->getSubject()) {
-			return $event;
-		}
+        // Different subject => can not combine
+        if ($event->getSubject() !== $previousEvent->getSubject()) {
+            return $event;
+        }
 
-		// Different object type => can not combine
-		if ($event->getObjectType() !== $previousEvent->getObjectType()) {
-			return $event;
-		}
+        // Different object type => can not combine
+        if ($event->getObjectType() !== $previousEvent->getObjectType()) {
+            return $event;
+        }
 
-		// More than 3 hours difference => can not combine
-		if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
-			return $event;
-		}
+        // More than 3 hours difference => can not combine
+        if (abs($event->getTimestamp() - $previousEvent->getTimestamp()) > 3 * 60 * 60) {
+            return $event;
+        }
 
-		// Other parameters are not the same => can not combine
-		try {
-			[$combined, $parameters] = $this->combineParameters($mergeParameter, $event, $previousEvent);
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+        // Other parameters are not the same => can not combine
+        try {
+            [$combined, $parameters] = $this->combineParameters($mergeParameter, $event, $previousEvent);
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
 
-		try {
-			$newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
-			$parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
+        try {
+            $newSubject = $this->getExtendedSubject($event->getRichSubject(), $mergeParameter, $combined);
+            $parsedSubject = $this->generateParsedSubject($newSubject, $parameters);
 
-			$event->setRichSubject($newSubject, $parameters)
-				->setParsedSubject($parsedSubject)
-				->setChildEvent($previousEvent)
-				->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
-		} catch (\UnexpectedValueException $e) {
-			return $event;
-		}
+            $event->setRichSubject($newSubject, $parameters)
+                ->setParsedSubject($parsedSubject)
+                ->setChildEvent($previousEvent)
+                ->setTimestamp(max($event->getTimestamp(), $previousEvent->getTimestamp()));
+        } catch (\UnexpectedValueException $e) {
+            return $event;
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param string $mergeParameter
-	 * @param IEvent $event
-	 * @param IEvent $previousEvent
-	 * @return array
-	 * @throws \UnexpectedValueException
-	 */
-	protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
-		$params1 = $event->getRichSubjectParameters();
-		$params2 = $previousEvent->getRichSubjectParameters();
-		$params = [];
+    /**
+     * @param string $mergeParameter
+     * @param IEvent $event
+     * @param IEvent $previousEvent
+     * @return array
+     * @throws \UnexpectedValueException
+     */
+    protected function combineParameters($mergeParameter, IEvent $event, IEvent $previousEvent) {
+        $params1 = $event->getRichSubjectParameters();
+        $params2 = $previousEvent->getRichSubjectParameters();
+        $params = [];
 
-		$combined = 0;
+        $combined = 0;
 
-		// Check that all parameters from $event exist in $previousEvent
-		foreach ($params1 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
+        // Check that all parameters from $event exist in $previousEvent
+        foreach ($params1 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
 
-			if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
-				// Parameter missing on $previousEvent or different => can not combine
-				throw new \UnexpectedValueException();
-			}
+            if (!isset($params2[$key]) || $params2[$key] !== $parameter) {
+                // Parameter missing on $previousEvent or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $params[$key] = $parameter;
+        }
 
-		// Check that all parameters from $previousEvent exist in $event
-		foreach ($params2 as $key => $parameter) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
-					$combined++;
-					$params[$mergeParameter . $combined] = $parameter;
-				}
-				continue;
-			}
+        // Check that all parameters from $previousEvent exist in $event
+        foreach ($params2 as $key => $parameter) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if (!$this->checkParameterAlreadyExits($params, $mergeParameter, $parameter)) {
+                    $combined++;
+                    $params[$mergeParameter . $combined] = $parameter;
+                }
+                continue;
+            }
 
-			if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
-				// Parameter missing on $event or different => can not combine
-				throw new \UnexpectedValueException();
-			}
+            if (!isset($params1[$key]) || $params1[$key] !== $parameter) {
+                // Parameter missing on $event or different => can not combine
+                throw new \UnexpectedValueException();
+            }
 
-			$params[$key] = $parameter;
-		}
+            $params[$key] = $parameter;
+        }
 
-		return [$combined, $params];
-	}
+        return [$combined, $params];
+    }
 
-	/**
-	 * @param array[] $parameters
-	 * @param string $mergeParameter
-	 * @param array $parameter
-	 * @return bool
-	 */
-	protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
-		foreach ($parameters as $key => $param) {
-			if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
-				if ($param === $parameter) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
+    /**
+     * @param array[] $parameters
+     * @param string $mergeParameter
+     * @param array $parameter
+     * @return bool
+     */
+    protected function checkParameterAlreadyExits($parameters, $mergeParameter, $parameter) {
+        foreach ($parameters as $key => $param) {
+            if (preg_match('/^' . $mergeParameter . '(\d+)?$/', $key)) {
+                if ($param === $parameter) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
-	/**
-	 * @param string $subject
-	 * @param string $parameter
-	 * @param int $counter
-	 * @return mixed
-	 */
-	protected function getExtendedSubject($subject, $parameter, $counter) {
-		switch ($counter) {
-			case 1:
-				$replacement = '{' . $parameter . '1}';
-				break;
-			case 2:
-				$replacement = $this->l10n->t(
-					'%1$s and %2$s',
-					['{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 3:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s and %3$s',
-					['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 4:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s and %4$s',
-					['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			case 5:
-				$replacement = $this->l10n->t(
-					'%1$s, %2$s, %3$s, %4$s and %5$s',
-					['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
-				);
-				break;
-			default:
-				throw new \UnexpectedValueException();
-		}
+    /**
+     * @param string $subject
+     * @param string $parameter
+     * @param int $counter
+     * @return mixed
+     */
+    protected function getExtendedSubject($subject, $parameter, $counter) {
+        switch ($counter) {
+            case 1:
+                $replacement = '{' . $parameter . '1}';
+                break;
+            case 2:
+                $replacement = $this->l10n->t(
+                    '%1$s and %2$s',
+                    ['{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 3:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s and %3$s',
+                    ['{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 4:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s and %4$s',
+                    ['{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            case 5:
+                $replacement = $this->l10n->t(
+                    '%1$s, %2$s, %3$s, %4$s and %5$s',
+                    ['{' . $parameter . '5}', '{' . $parameter . '4}', '{' . $parameter . '3}', '{' . $parameter . '2}', '{' . $parameter . '1}']
+                );
+                break;
+            default:
+                throw new \UnexpectedValueException();
+        }
 
-		return str_replace(
-			'{' . $parameter . '}',
-			$replacement,
-			$subject
-		);
-	}
+        return str_replace(
+            '{' . $parameter . '}',
+            $replacement,
+            $subject
+        );
+    }
 
-	/**
-	 * @param string $subject
-	 * @param array[] $parameters
-	 * @return string
-	 */
-	protected function generateParsedSubject($subject, $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			if ($parameter['type'] === 'file') {
-				$replacements[] = trim($parameter['path'], '/');
-			} elseif (isset($parameter['name'])) {
-				$replacements[] = $parameter['name'];
-			} else {
-				$replacements[] = $parameter['id'];
-			}
-		}
+    /**
+     * @param string $subject
+     * @param array[] $parameters
+     * @return string
+     */
+    protected function generateParsedSubject($subject, $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            if ($parameter['type'] === 'file') {
+                $replacements[] = trim($parameter['path'], '/');
+            } elseif (isset($parameter['name'])) {
+                $replacements[] = $parameter['name'];
+            } else {
+                $replacements[] = $parameter['id'];
+            }
+        }
 
-		return str_replace($placeholders, $replacements, $subject);
-	}
+        return str_replace($placeholders, $replacements, $subject);
+    }
 }

lib/private/Preview/HEIC.php

Indentation +101 added lines, -101 removed lines

@@ -40,106 +40,106 @@
  * @package OC\Preview
  */
 class HEIC extends ProviderV2 {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/hei(f|c)/';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file): bool {
-		return in_array('HEIC', \Imagick::queryFormats("HEI*"));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$tmpPath = $this->getLocalFile($file);
-
-		// Creates \Imagick object from the heic file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-			$bp->setFormat('jpg');
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
-
-		$this->cleanTmpFiles();
-
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData($bp);
-		//check if image object is valid
-		return $image->valid() ? $image : null;
-	}
-
-	/**
-	 * Returns a preview of maxX times maxY dimensions in JPG format
-	 *
-	 *    * The default resolution is already 72dpi, no need to change it for a bitmap output
-	 *    * It's possible to have proper colour conversion using profileimage().
-	 *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
-	 *    * It's possible to Gamma-correct an image via gammaImage()
-	 *
-	 * @param string $tmpPath the location of the file to convert
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function getResizedPreview($tmpPath, $maxX, $maxY) {
-		$bp = new \Imagick();
-
-		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
-
-		$bp->setImageFormat('jpg');
-
-		$bp = $this->resize($bp, $maxX, $maxY);
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/hei(f|c)/';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file): bool {
+        return in_array('HEIC', \Imagick::queryFormats("HEI*"));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $tmpPath = $this->getLocalFile($file);
+
+        // Creates \Imagick object from the heic file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+            $bp->setFormat('jpg');
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
+
+        $this->cleanTmpFiles();
+
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData($bp);
+        //check if image object is valid
+        return $image->valid() ? $image : null;
+    }
+
+    /**
+     * Returns a preview of maxX times maxY dimensions in JPG format
+     *
+     *    * The default resolution is already 72dpi, no need to change it for a bitmap output
+     *    * It's possible to have proper colour conversion using profileimage().
+     *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
+     *    * It's possible to Gamma-correct an image via gammaImage()
+     *
+     * @param string $tmpPath the location of the file to convert
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function getResizedPreview($tmpPath, $maxX, $maxY) {
+        $bp = new \Imagick();
+
+        // Layer 0 contains either the bitmap or a flat representation of all vector layers
+        $bp->readImage($tmpPath . '[0]');
+
+        $bp->setImageFormat('jpg');
+
+        $bp = $this->resize($bp, $maxX, $maxY);
 		
-		return $bp;
-	}
-
-	/**
-	 * Returns a resized \Imagick object
-	 *
-	 * If you want to know more on the various methods available to resize an
-	 * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
-	 *
-	 * @param \Imagick $bp
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function resize($bp, $maxX, $maxY) {
-		[$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
-
-		// We only need to resize a preview which doesn't fit in the maximum dimensions
-		if ($previewWidth > $maxX || $previewHeight > $maxY) {
-			// If we want a small image (thumbnail) let's be most space- and time-efficient
-			if ($maxX <= 500 && $maxY <= 500) {
-				$bp->thumbnailImage($maxY, $maxX, true);
-				$bp->stripImage();
-			} else {
-				// A bigger image calls for some better resizing algorithm
-				// According to http://www.imagemagick.org/Usage/filter/#lanczos
-				// the catrom filter is almost identical to Lanczos2, but according
-				// to https://www.php.net/manual/en/imagick.resizeimage.php it is
-				// significantly faster
-				$bp->resizeImage($maxX, $maxY, \Imagick::FILTER_CATROM, 1, true);
-			}
-		}
-
-		return $bp;
-	}
+        return $bp;
+    }
+
+    /**
+     * Returns a resized \Imagick object
+     *
+     * If you want to know more on the various methods available to resize an
+     * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
+     *
+     * @param \Imagick $bp
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function resize($bp, $maxX, $maxY) {
+        [$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
+
+        // We only need to resize a preview which doesn't fit in the maximum dimensions
+        if ($previewWidth > $maxX || $previewHeight > $maxY) {
+            // If we want a small image (thumbnail) let's be most space- and time-efficient
+            if ($maxX <= 500 && $maxY <= 500) {
+                $bp->thumbnailImage($maxY, $maxX, true);
+                $bp->stripImage();
+            } else {
+                // A bigger image calls for some better resizing algorithm
+                // According to http://www.imagemagick.org/Usage/filter/#lanczos
+                // the catrom filter is almost identical to Lanczos2, but according
+                // to https://www.php.net/manual/en/imagick.resizeimage.php it is
+                // significantly faster
+                $bp->resizeImage($maxX, $maxY, \Imagick::FILTER_CATROM, 1, true);
+            }
+        }
+
+        return $bp;
+    }
 }

lib/private/Preview/MarkDown.php

Indentation +113 added lines, -113 removed lines

@@ -28,117 +28,117 @@
 use OCP\IImage;
 
 class MarkDown extends TXT {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/text\/(x-)?markdown/';
-	}
-
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$content = $file->fopen('r');
-
-		if ($content === false) {
-			return null;
-		}
-
-		$content = stream_get_contents($content,3000);
-
-		//don't create previews of empty text files
-		if (trim($content) === '') {
-			return null;
-		}
-
-		// Merge text paragraph lines that might belong together
-		$content = preg_replace('/^(\s*)\*\s/mU', '$1- ', $content);
-
-		$content = preg_replace('/((?!^(\s*-|#)).*)(\w|\\|\.)(\r\n|\n|\r)(\w|\*)/mU', '$1 $3', $content);
-
-		// Remove markdown symbols that we cannot easily represent in rendered text in the preview
-		$content = preg_replace('/\*\*(.*)\*\*/U', '$1', $content);
-		$content = preg_replace('/\*(.*)\*/U', '$1', $content);
-		$content = preg_replace('/\_\_(.*)\_\_/U', '$1', $content);
-		$content = preg_replace('/\_(.*)\_/U', '$1', $content);
-		$content = preg_replace('/\~\~(.*)\~\~/U', '$1', $content);
-
-		$content = preg_replace('/\!?\[((.|\n)*)\]\((.*)\)/mU', '$1 ($3)', $content);
-		$content = preg_replace('/\n\n+/', "\n", $content);
-
-		$content = preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $content);
-
-		$lines = preg_split("/\r\n|\n|\r/", $content);
-
-		// Define text size of text file preview
-		$fontSize = $maxX ? (int) ((1 / ($maxX >= 512 ? 60 : 40) * $maxX)) : 10;
-
-		$image = imagecreate($maxX, $maxY);
-		imagecolorallocate($image, 255, 255, 255);
-		$textColor = imagecolorallocate($image, 0, 0, 0);
-
-		$fontFile = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
-		$fontFileBold = __DIR__ . '/../../../core/fonts/NotoSans-Bold.ttf';
-
-		$canUseTTF = function_exists('imagettftext');
-
-		$textOffset = (int)min($maxX * 0.05, $maxY * 0.05);
-		$nextLineStart = 0;
-		$y = $textOffset;
-		foreach ($lines as $line) {
-			$actualFontSize = $fontSize;
-			if (mb_strpos($line, '# ') === 0) {
-				$actualFontSize *= 2;
-			}
-			if (mb_strpos($line, '## ') === 0) {
-				$actualFontSize *= 1.8;
-			}
-			if (mb_strpos($line, '### ') === 0) {
-				$actualFontSize *= 1.6;
-			}
-			if (mb_strpos($line, '#### ') === 0) {
-				$actualFontSize *= 1.4;
-			}
-			if (mb_strpos($line, '##### ') === 0) {
-				$actualFontSize *= 1.2;
-			}
-			if (mb_strpos($line, '###### ') === 0) {
-				$actualFontSize *= 1.1;
-			}
-
-			// Add spacing before headlines
-			if ($actualFontSize !== $fontSize && $y !== $textOffset) {
-				$y += (int)($actualFontSize * 2);
-			}
-
-			$x = $textOffset;
-			$y += (int)($nextLineStart + $actualFontSize);
-
-			if ($canUseTTF === true) {
-				$wordWrap = (int)((1 / $actualFontSize * 1.3) * $maxX);
-
-				// Get rid of markdown symbols that we still needed for the font size
-				$line = preg_replace('/^#*\s/', '', $line);
-
-				$wrappedText = wordwrap($line, $wordWrap,"\n");
-				$linesWrapped = count(explode("\n", $wrappedText));
-				imagettftext($image, $actualFontSize, 0, $x, $y, $textColor, $actualFontSize === $fontSize ? $fontFile : $fontFileBold, $wrappedText);
-				$nextLineStart = (int)($linesWrapped * ceil($actualFontSize * 2));
-				if ($actualFontSize !== $fontSize && $y !== $textOffset) {
-					$nextLineStart -= $actualFontSize;
-				}
-			} else {
-				$y -= $fontSize;
-				imagestring($image, 1, $x, $y, $line, $textColor);
-				$nextLineStart = $fontSize;
-			}
-
-			if ($y >= $maxY) {
-				break;
-			}
-		}
-
-		$imageObject = new \OC_Image();
-		$imageObject->setResource($image);
-
-		return $imageObject->valid() ? $imageObject : null;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/text\/(x-)?markdown/';
+    }
+
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $content = $file->fopen('r');
+
+        if ($content === false) {
+            return null;
+        }
+
+        $content = stream_get_contents($content,3000);
+
+        //don't create previews of empty text files
+        if (trim($content) === '') {
+            return null;
+        }
+
+        // Merge text paragraph lines that might belong together
+        $content = preg_replace('/^(\s*)\*\s/mU', '$1- ', $content);
+
+        $content = preg_replace('/((?!^(\s*-|#)).*)(\w|\\|\.)(\r\n|\n|\r)(\w|\*)/mU', '$1 $3', $content);
+
+        // Remove markdown symbols that we cannot easily represent in rendered text in the preview
+        $content = preg_replace('/\*\*(.*)\*\*/U', '$1', $content);
+        $content = preg_replace('/\*(.*)\*/U', '$1', $content);
+        $content = preg_replace('/\_\_(.*)\_\_/U', '$1', $content);
+        $content = preg_replace('/\_(.*)\_/U', '$1', $content);
+        $content = preg_replace('/\~\~(.*)\~\~/U', '$1', $content);
+
+        $content = preg_replace('/\!?\[((.|\n)*)\]\((.*)\)/mU', '$1 ($3)', $content);
+        $content = preg_replace('/\n\n+/', "\n", $content);
+
+        $content = preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $content);
+
+        $lines = preg_split("/\r\n|\n|\r/", $content);
+
+        // Define text size of text file preview
+        $fontSize = $maxX ? (int) ((1 / ($maxX >= 512 ? 60 : 40) * $maxX)) : 10;
+
+        $image = imagecreate($maxX, $maxY);
+        imagecolorallocate($image, 255, 255, 255);
+        $textColor = imagecolorallocate($image, 0, 0, 0);
+
+        $fontFile = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
+        $fontFileBold = __DIR__ . '/../../../core/fonts/NotoSans-Bold.ttf';
+
+        $canUseTTF = function_exists('imagettftext');
+
+        $textOffset = (int)min($maxX * 0.05, $maxY * 0.05);
+        $nextLineStart = 0;
+        $y = $textOffset;
+        foreach ($lines as $line) {
+            $actualFontSize = $fontSize;
+            if (mb_strpos($line, '# ') === 0) {
+                $actualFontSize *= 2;
+            }
+            if (mb_strpos($line, '## ') === 0) {
+                $actualFontSize *= 1.8;
+            }
+            if (mb_strpos($line, '### ') === 0) {
+                $actualFontSize *= 1.6;
+            }
+            if (mb_strpos($line, '#### ') === 0) {
+                $actualFontSize *= 1.4;
+            }
+            if (mb_strpos($line, '##### ') === 0) {
+                $actualFontSize *= 1.2;
+            }
+            if (mb_strpos($line, '###### ') === 0) {
+                $actualFontSize *= 1.1;
+            }
+
+            // Add spacing before headlines
+            if ($actualFontSize !== $fontSize && $y !== $textOffset) {
+                $y += (int)($actualFontSize * 2);
+            }
+
+            $x = $textOffset;
+            $y += (int)($nextLineStart + $actualFontSize);
+
+            if ($canUseTTF === true) {
+                $wordWrap = (int)((1 / $actualFontSize * 1.3) * $maxX);
+
+                // Get rid of markdown symbols that we still needed for the font size
+                $line = preg_replace('/^#*\s/', '', $line);
+
+                $wrappedText = wordwrap($line, $wordWrap,"\n");
+                $linesWrapped = count(explode("\n", $wrappedText));
+                imagettftext($image, $actualFontSize, 0, $x, $y, $textColor, $actualFontSize === $fontSize ? $fontFile : $fontFileBold, $wrappedText);
+                $nextLineStart = (int)($linesWrapped * ceil($actualFontSize * 2));
+                if ($actualFontSize !== $fontSize && $y !== $textOffset) {
+                    $nextLineStart -= $actualFontSize;
+                }
+            } else {
+                $y -= $fontSize;
+                imagestring($image, 1, $x, $y, $line, $textColor);
+                $nextLineStart = $fontSize;
+            }
+
+            if ($y >= $maxY) {
+                break;
+            }
+        }
+
+        $imageObject = new \OC_Image();
+        $imageObject->setResource($image);
+
+        return $imageObject->valid() ? $imageObject : null;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -42,7 +42,7 @@ 
 			return null;
 		}
 
-		$content = stream_get_contents($content,3000);
+		$content = stream_get_contents($content, 3000);
 
 		//don't create previews of empty text files
 		if (trim($content) === '') {
@@ -75,12 +75,12 @@ 
 		imagecolorallocate($image, 255, 255, 255);
 		$textColor = imagecolorallocate($image, 0, 0, 0);
 
-		$fontFile = __DIR__ . '/../../../core/fonts/NotoSans-Regular.ttf';
-		$fontFileBold = __DIR__ . '/../../../core/fonts/NotoSans-Bold.ttf';
+		$fontFile = __DIR__.'/../../../core/fonts/NotoSans-Regular.ttf';
+		$fontFileBold = __DIR__.'/../../../core/fonts/NotoSans-Bold.ttf';
 
 		$canUseTTF = function_exists('imagettftext');
 
-		$textOffset = (int)min($maxX * 0.05, $maxY * 0.05);
+		$textOffset = (int) min($maxX * 0.05, $maxY * 0.05);
 		$nextLineStart = 0;
 		$y = $textOffset;
 		foreach ($lines as $line) {
@@ -106,22 +106,22 @@ 
 
 			// Add spacing before headlines
 			if ($actualFontSize !== $fontSize && $y !== $textOffset) {
-				$y += (int)($actualFontSize * 2);
+				$y += (int) ($actualFontSize * 2);
 			}
 
 			$x = $textOffset;
-			$y += (int)($nextLineStart + $actualFontSize);
+			$y += (int) ($nextLineStart + $actualFontSize);
 
 			if ($canUseTTF === true) {
-				$wordWrap = (int)((1 / $actualFontSize * 1.3) * $maxX);
+				$wordWrap = (int) ((1 / $actualFontSize * 1.3) * $maxX);
 
 				// Get rid of markdown symbols that we still needed for the font size
 				$line = preg_replace('/^#*\s/', '', $line);
 
-				$wrappedText = wordwrap($line, $wordWrap,"\n");
+				$wrappedText = wordwrap($line, $wordWrap, "\n");
 				$linesWrapped = count(explode("\n", $wrappedText));
 				imagettftext($image, $actualFontSize, 0, $x, $y, $textColor, $actualFontSize === $fontSize ? $fontFile : $fontFileBold, $wrappedText);
-				$nextLineStart = (int)($linesWrapped * ceil($actualFontSize * 2));
+				$nextLineStart = (int) ($linesWrapped * ceil($actualFontSize * 2));
 				if ($actualFontSize !== $fontSize && $y !== $textOffset) {
 					$nextLineStart -= $actualFontSize;
 				}

lib/private/Preview/Office.php

Indentation +78 added lines, -78 removed lines

@@ -34,82 +34,82 @@
 use OCP\ILogger;
 
 abstract class Office extends ProviderV2 {
-	private $cmd;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$this->initCmd();
-		if (is_null($this->cmd)) {
-			return null;
-		}
-
-		$absPath = $this->getLocalFile($file);
-
-		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
-
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
-		$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
-
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
-
-		shell_exec($exec);
-
-		//create imagick object from png
-		$pngPreview = null;
-		try {
-			[$dirname, , , $filename] = array_values(pathinfo($absPath));
-			$pngPreview = $tmpDir . '/' . $filename . '.png';
-
-			$png = new \imagick($pngPreview . '[0]');
-			$png->setImageFormat('jpg');
-		} catch (\Exception $e) {
-			$this->cleanTmpFiles();
-			unlink($pngPreview);
-			\OC::$server->getLogger()->logException($e, [
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
-
-		$image = new \OC_Image();
-		$image->loadFromData($png);
-
-		$this->cleanTmpFiles();
-		unlink($pngPreview);
-
-		if ($image->valid()) {
-			$image->scaleDownToFit($maxX, $maxY);
-
-			return $image;
-		}
-		return null;
-	}
-
-	private function initCmd() {
-		$cmd = '';
-
-		$libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
-		if (is_string($libreOfficePath)) {
-			$cmd = $libreOfficePath;
-		}
-
-		$whichLibreOffice = shell_exec('command -v libreoffice');
-		if ($cmd === '' && !empty($whichLibreOffice)) {
-			$cmd = 'libreoffice';
-		}
-
-		$whichOpenOffice = shell_exec('command -v openoffice');
-		if ($cmd === '' && !empty($whichOpenOffice)) {
-			$cmd = 'openoffice';
-		}
-
-		if ($cmd === '') {
-			$cmd = null;
-		}
-
-		$this->cmd = $cmd;
-	}
+    private $cmd;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $this->initCmd();
+        if (is_null($this->cmd)) {
+            return null;
+        }
+
+        $absPath = $this->getLocalFile($file);
+
+        $tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
+
+        $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
+        $clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
+
+        $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+
+        shell_exec($exec);
+
+        //create imagick object from png
+        $pngPreview = null;
+        try {
+            [$dirname, , , $filename] = array_values(pathinfo($absPath));
+            $pngPreview = $tmpDir . '/' . $filename . '.png';
+
+            $png = new \imagick($pngPreview . '[0]');
+            $png->setImageFormat('jpg');
+        } catch (\Exception $e) {
+            $this->cleanTmpFiles();
+            unlink($pngPreview);
+            \OC::$server->getLogger()->logException($e, [
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
+
+        $image = new \OC_Image();
+        $image->loadFromData($png);
+
+        $this->cleanTmpFiles();
+        unlink($pngPreview);
+
+        if ($image->valid()) {
+            $image->scaleDownToFit($maxX, $maxY);
+
+            return $image;
+        }
+        return null;
+    }
+
+    private function initCmd() {
+        $cmd = '';
+
+        $libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
+        if (is_string($libreOfficePath)) {
+            $cmd = $libreOfficePath;
+        }
+
+        $whichLibreOffice = shell_exec('command -v libreoffice');
+        if ($cmd === '' && !empty($whichLibreOffice)) {
+            $cmd = 'libreoffice';
+        }
+
+        $whichOpenOffice = shell_exec('command -v openoffice');
+        if ($cmd === '' && !empty($whichOpenOffice)) {
+            $cmd = 'openoffice';
+        }
+
+        if ($cmd === '') {
+            $cmd = null;
+        }
+
+        $this->cmd = $cmd;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -49,20 +49,20 @@
 
 		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
+		$defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to png --outdir ';
 		$clParameters = \OC::$server->getConfig()->getSystemValue('preview_office_cl_parameters', $defaultParameters);
 
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+		$exec = $this->cmd.$clParameters.escapeshellarg($tmpDir).' '.escapeshellarg($absPath);
 
 		shell_exec($exec);
 
 		//create imagick object from png
 		$pngPreview = null;
 		try {
-			[$dirname, , , $filename] = array_values(pathinfo($absPath));
-			$pngPreview = $tmpDir . '/' . $filename . '.png';
+			[$dirname,,, $filename] = array_values(pathinfo($absPath));
+			$pngPreview = $tmpDir.'/'.$filename.'.png';
 
-			$png = new \imagick($pngPreview . '[0]');
+			$png = new \imagick($pngPreview.'[0]');
 			$png->setImageFormat('jpg');
 		} catch (\Exception $e) {
 			$this->cleanTmpFiles();

lib/private/Preview/Bitmap.php

Indentation +66 added lines, -66 removed lines

@@ -39,81 +39,81 @@
  */
 abstract class Bitmap extends ProviderV2 {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$tmpPath = $this->getLocalFile($file);
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $tmpPath = $this->getLocalFile($file);
 
-		// Creates \Imagick object from bitmap or vector file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
+        // Creates \Imagick object from bitmap or vector file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
 
-		$this->cleanTmpFiles();
+        $this->cleanTmpFiles();
 
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData($bp);
-		//check if image object is valid
-		return $image->valid() ? $image : null;
-	}
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData($bp);
+        //check if image object is valid
+        return $image->valid() ? $image : null;
+    }
 
-	/**
-	 * Returns a preview of maxX times maxY dimensions in PNG format
-	 *
-	 *    * The default resolution is already 72dpi, no need to change it for a bitmap output
-	 *    * It's possible to have proper colour conversion using profileimage().
-	 *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
-	 *    * It's possible to Gamma-correct an image via gammaImage()
-	 *
-	 * @param string $tmpPath the location of the file to convert
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function getResizedPreview($tmpPath, $maxX, $maxY) {
-		$bp = new Imagick();
+    /**
+     * Returns a preview of maxX times maxY dimensions in PNG format
+     *
+     *    * The default resolution is already 72dpi, no need to change it for a bitmap output
+     *    * It's possible to have proper colour conversion using profileimage().
+     *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
+     *    * It's possible to Gamma-correct an image via gammaImage()
+     *
+     * @param string $tmpPath the location of the file to convert
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function getResizedPreview($tmpPath, $maxX, $maxY) {
+        $bp = new Imagick();
 
-		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
+        // Layer 0 contains either the bitmap or a flat representation of all vector layers
+        $bp->readImage($tmpPath . '[0]');
 
-		$bp = $this->resize($bp, $maxX, $maxY);
+        $bp = $this->resize($bp, $maxX, $maxY);
 
-		$bp->setImageFormat('png');
+        $bp->setImageFormat('png');
 
-		return $bp;
-	}
+        return $bp;
+    }
 
-	/**
-	 * Returns a resized \Imagick object
-	 *
-	 * If you want to know more on the various methods available to resize an
-	 * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
-	 *
-	 * @param \Imagick $bp
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function resize($bp, $maxX, $maxY) {
-		[$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
+    /**
+     * Returns a resized \Imagick object
+     *
+     * If you want to know more on the various methods available to resize an
+     * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
+     *
+     * @param \Imagick $bp
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function resize($bp, $maxX, $maxY) {
+        [$previewWidth, $previewHeight] = array_values($bp->getImageGeometry());
 
-		// We only need to resize a preview which doesn't fit in the maximum dimensions
-		if ($previewWidth > $maxX || $previewHeight > $maxY) {
-			// TODO: LANCZOS is the default filter, CATROM could bring similar results faster
-			$bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
-		}
+        // We only need to resize a preview which doesn't fit in the maximum dimensions
+        if ($previewWidth > $maxX || $previewHeight > $maxY) {
+            // TODO: LANCZOS is the default filter, CATROM could bring similar results faster
+            $bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
+        }
 
-		return $bp;
-	}
+        return $bp;
+    }
 }

lib/private/Preview/ProviderV1Adapter.php

Indentation +20 added lines, -20 removed lines

@@ -35,30 +35,30 @@
 use OCP\Preview\IProviderV2;
 
 class ProviderV1Adapter implements IProviderV2 {
-	private $providerV1;
+    private $providerV1;
 
-	public function __construct(IProvider $providerV1) {
-		$this->providerV1 = $providerV1;
-	}
+    public function __construct(IProvider $providerV1) {
+        $this->providerV1 = $providerV1;
+    }
 
-	public function getMimeType(): string {
-		return (string)$this->providerV1->getMimeType();
-	}
+    public function getMimeType(): string {
+        return (string)$this->providerV1->getMimeType();
+    }
 
-	public function isAvailable(FileInfo $file): bool {
-		return (bool)$this->providerV1->isAvailable($file);
-	}
+    public function isAvailable(FileInfo $file): bool {
+        return (bool)$this->providerV1->isAvailable($file);
+    }
 
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		[$view, $path] = $this->getViewAndPath($file);
-		$thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view);
-		return $thumbnail === false ? null: $thumbnail;
-	}
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        [$view, $path] = $this->getViewAndPath($file);
+        $thumbnail = $this->providerV1->getThumbnail($path, $maxX, $maxY, false, $view);
+        return $thumbnail === false ? null: $thumbnail;
+    }
 
-	private function getViewAndPath(File $file) {
-		$view = new View($file->getParent()->getPath());
-		$path = $file->getName();
+    private function getViewAndPath(File $file) {
+        $view = new View($file->getParent()->getPath());
+        $path = $file->getName();
 
-		return [$view, $path];
-	}
+        return [$view, $path];
+    }
 }