nextcloud / server

apps/files/templates/appnavigation.php

Spacing +8 added lines, -8 removed lines

@@ -2,18 +2,18 @@ 
 	<ul class="with-icon">
 	<?php $pinned = 0 ?>
 		<?php foreach ($_['navigationItems'] as $item) {
-			strpos($item['classes'], 'pinned')!==false ? $pinned++ : '';
+			strpos($item['classes'], 'pinned') !== false ? $pinned++ : '';
 		?>
-		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned===1?'first-pinned':'') ?>">
+		<li data-id="<?php p($item['id']) ?>" class="nav-<?php p($item['id']) ?> <?php p($item['classes']) ?> <?php p($pinned === 1 ? 'first-pinned' : '') ?>">
 			<a href="<?php p(isset($item['href']) ? $item['href'] : '#') ?>"
 				class="nav-icon-<?php p($item['icon'] !== '' ? $item['icon'] : $item['id']) ?> svg">
-				<?php p($item['name']);?>
+				<?php p($item['name']); ?>
 			</a>
 		</li>
 		<?php } ?>
 		<li id="quota" class="pinned <?php
 		if ($_['quota'] !== \OCP\Files\FileInfo::SPACE_UNLIMITED) {
-			?>has-tooltip" title="<?php p($_['usage_relative'] . '%');
+			?>has-tooltip" title="<?php p($_['usage_relative'].'%');
 		} ?>">
 			<a href="#" class="nav-icon-quota svg">
 				<p id="quotatext"><?php
@@ -24,7 +24,7 @@ 
 					} ?></p>
 				<div class="quota-container">
 					<progress value="<?php p($_['usage_relative']); ?>" max="100"
-						<?php if($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>></progress>
+						<?php if ($_['usage_relative'] > 80): ?> class="quota-warning" <?php endif; ?>></progress>
 				</div>
 			</a>
 		</li>
@@ -32,7 +32,7 @@ 
 	<div id="app-settings">
 		<div id="app-settings-header">
 			<button class="settings-button" data-apps-slide-toggle="#app-settings-content">
-				<?php p($l->t('Settings'));?>
+				<?php p($l->t('Settings')); ?>
 			</button>
 		</div>
 		<div id="app-settings-content">
@@ -40,9 +40,9 @@ 
 				<input class="checkbox" id="showhiddenfilesToggle" checked="checked" type="checkbox">
 				<label for="showhiddenfilesToggle"><?php p($l->t('Show hidden files')); ?></label>
 			</div>
-			<label for="webdavurl"><?php p($l->t('WebDAV'));?></label>
+			<label for="webdavurl"><?php p($l->t('WebDAV')); ?></label>
 			<input id="webdavurl" type="text" readonly="readonly" value="<?php p(\OCP\Util::linkToRemote('webdav')); ?>" />
-			<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer noopener">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em>
+			<em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank" rel="noreferrer noopener">access your Files via WebDAV</a>', array(link_to_docs('user-webdav')))); ?></em>
 		</div>
 	</div>
 </div>

apps/federatedfilesharing/templates/settings-admin.php

Spacing +7 added lines, -7 removed lines

@@ -4,12 +4,12 @@ 
 script('federatedfilesharing', 'settings-admin');
 ?>
 
-<?php if($_['internalOnly'] === false): ?>
+<?php if ($_['internalOnly'] === false): ?>
 
 <div id="fileSharingSettings" class="followupsection">
-	<h3><?php p($l->t('Federated Cloud Sharing'));?></h3>
+	<h3><?php p($l->t('Federated Cloud Sharing')); ?></h3>
 	<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
-		title="<?php p($l->t('Open documentation'));?>"
+		title="<?php p($l->t('Open documentation')); ?>"
 		href="<?php p(link_to_docs('admin-sharing-federated')); ?>"></a>
 	<p class="settings-hint"><?php p($l->t('Adjust how people can share between servers.')); ?></p>
 
@@ -17,7 +17,7 @@ 
 		<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled" class="checkbox"
 			   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
 		<label for="outgoingServer2serverShareEnabled">
-			<?php p($l->t('Allow users on this server to send shares to other servers'));?>
+			<?php p($l->t('Allow users on this server to send shares to other servers')); ?>
 		</label>
 	</p>
 
@@ -25,21 +25,21 @@ 
 		<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled" class="checkbox"
 			   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
 		<label for="incomingServer2serverShareEnabled">
-			<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
+			<?php p($l->t('Allow users on this server to receive shares from other servers')); ?>
 		</label><br/>
 	</p>
 	<p>
 		<input type="checkbox" name="lookupServerEnabled" id="lookupServerEnabled" class="checkbox"
 			   value="1" <?php if ($_['lookupServerEnabled']) print_unescaped('checked="checked"'); ?> />
 		<label for="lookupServerEnabled">
-			<?php p($l->t('Search global and public address book for users'));?>
+			<?php p($l->t('Search global and public address book for users')); ?>
 		</label><br/>
 	</p>
 	<p>
 		<input type="checkbox" name="lookupServerUploadEnabled" id="lookupServerUploadEnabled" class="checkbox"
 			   value="1" <?php if ($_['lookupServerUploadEnabled']) print_unescaped('checked="checked"'); ?> />
 		<label for="lookupServerUploadEnabled">
-			<?php p($l->t('Allow users to publish their data to a global and public address book'));?>
+			<?php p($l->t('Allow users to publish their data to a global and public address book')); ?>
 		</label><br/>
 	</p>
 

apps/theming/lib/ThemingDefaults.php

Indentation +334 added lines, -334 removed lines

@@ -33,338 +33,338 @@
 
 class ThemingDefaults extends \OC_Defaults {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IAppData */
-	private $appData;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-	/** @var Util */
-	private $util;
-	/** @var IAppManager */
-	private $appManager;
-	/** @var string */
-	private $name;
-	/** @var string */
-	private $title;
-	/** @var string */
-	private $entity;
-	/** @var string */
-	private $url;
-	/** @var string */
-	private $slogan;
-	/** @var string */
-	private $color;
-
-	/** @var string */
-	private $iTunesAppId;
-	/** @var string */
-	private $iOSClientUrl;
-	/** @var string */
-	private $AndroidClientUrl;
-
-	/**
-	 * ThemingDefaults constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 * @param \OC_Defaults $defaults
-	 * @param IAppData $appData
-	 * @param ICacheFactory $cacheFactory
-	 * @param Util $util
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IConfig $config,
-								IL10N $l,
-								IURLGenerator $urlGenerator,
-								IAppData $appData,
-								ICacheFactory $cacheFactory,
-								Util $util,
-								IAppManager $appManager
-	) {
-		parent::__construct();
-		$this->config = $config;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-		$this->appData = $appData;
-		$this->cacheFactory = $cacheFactory;
-		$this->util = $util;
-		$this->appManager = $appManager;
-
-		$this->name = parent::getName();
-		$this->title = parent::getTitle();
-		$this->entity = parent::getEntity();
-		$this->url = parent::getBaseUrl();
-		$this->slogan = parent::getSlogan();
-		$this->color = parent::getColorPrimary();
-		$this->iTunesAppId = parent::getiTunesAppId();
-		$this->iOSClientUrl = parent::getiOSClientUrl();
-		$this->AndroidClientUrl = parent::getAndroidClientUrl();
-	}
-
-	public function getName() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
-	}
-
-	public function getHTMLName() {
-		return $this->config->getAppValue('theming', 'name', $this->name);
-	}
-
-	public function getTitle() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->title));
-	}
-
-	public function getEntity() {
-		return strip_tags($this->config->getAppValue('theming', 'name', $this->entity));
-	}
-
-	public function getBaseUrl() {
-		return $this->config->getAppValue('theming', 'url', $this->url);
-	}
-
-	public function getSlogan() {
-		return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
-	}
-
-	public function getShortFooter() {
-		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer noopener">' .$this->getEntity() . '</a>'.
-			($slogan !== '' ? ' – ' . $slogan : '');
-
-		return $footer;
-	}
-
-	/**
-	 * Color that is used for the header as well as for mail headers
-	 *
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return $this->config->getAppValue('theming', 'color', $this->color);
-	}
-
-	/**
-	 * Themed logo url
-	 *
-	 * @param bool $useSvg Whether to point to the SVG image or a fallback
-	 * @return string
-	 */
-	public function getLogo($useSvg = true) {
-		$logo = $this->config->getAppValue('theming', 'logoMime', false);
-
-		$logoExists = true;
-		try {
-			$this->appData->getFolder('images')->getFile('logo');
-		} catch (\Exception $e) {
-			$logoExists = false;
-		}
-
-		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
-
-		if(!$logo || !$logoExists) {
-			if($useSvg) {
-				$logo = $this->urlGenerator->imagePath('core', 'logo.svg');
-			} else {
-				$logo = $this->urlGenerator->imagePath('core', 'logo.png');
-			}
-			return $logo . '?v=' . $cacheBusterCounter;
-		}
-
-		return $this->urlGenerator->linkToRoute('theming.Theming.getLogo') . '?v=' . $cacheBusterCounter;
-	}
-
-	/**
-	 * Themed background image url
-	 *
-	 * @return string
-	 */
-	public function getBackground() {
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime',false);
-
-		$backgroundExists = true;
-		try {
-			$this->appData->getFolder('images')->getFile('background');
-		} catch (\Exception $e) {
-			$backgroundExists = false;
-		}
-
-		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
-
-		if(!$backgroundLogo || !$backgroundExists) {
-			return $this->urlGenerator->imagePath('core','background.png') . '?v=' . $cacheBusterCounter;
-		}
-
-		return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground') . '?v=' . $cacheBusterCounter;
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getiTunesAppId() {
-		return $this->config->getAppValue('theming', 'iTunesAppId', $this->iTunesAppId);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getiOSClientUrl() {
-		return $this->config->getAppValue('theming', 'iOSClientUrl', $this->iOSClientUrl);
-	}
-
-	/**
-	 * @return string
-	 */
-	public function getAndroidClientUrl() {
-		return $this->config->getAppValue('theming', 'AndroidClientUrl', $this->AndroidClientUrl);
-	}
-
-
-	/**
-	 * @return array scss variables to overwrite
-	 */
-	public function getScssVariables() {
-		$cache = $this->cacheFactory->create('theming');
-		if ($value = $cache->get('getScssVariables')) {
-			return $value;
-		}
-
-		$variables = [
-			'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
-			'theming-logo-mime' => "'" . $this->config->getAppValue('theming', 'logoMime', '') . "'",
-			'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime', '') . "'"
-		];
-
-		$variables['image-logo'] = "'".$this->urlGenerator->getAbsoluteURL($this->getLogo())."'";
-		$variables['image-login-background'] = "'".$this->urlGenerator->getAbsoluteURL($this->getBackground())."'";
-		$variables['image-login-plain'] = 'false';
-
-		if ($this->config->getAppValue('theming', 'color', null) !== null) {
-			if ($this->util->invertTextColor($this->getColorPrimary())) {
-				$colorPrimaryText = '#000000';
-			} else {
-				$colorPrimaryText = '#ffffff';
-			}
-			$variables['color-primary'] = $this->getColorPrimary();
-			$variables['color-primary-text'] = $colorPrimaryText;
-			$variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary());
-		}
-
-		if ($this->config->getAppValue('theming', 'backgroundMime', null) === 'backgroundColor') {
-			$variables['image-login-plain'] = 'true';
-		}
-		$cache->set('getScssVariables', $variables);
-		return $variables;
-	}
-
-	/**
-	 * Check if the image should be replaced by the theming app
-	 * and return the new image location then
-	 *
-	 * @param string $app name of the app
-	 * @param string $image filename of the image
-	 * @return bool|string false if image should not replaced, otherwise the location of the image
-	 */
-	public function replaceImagePath($app, $image) {
-		if($app==='') {
-			$app = 'core';
-		}
-		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
-
-		if ($image === 'favicon.ico' && $this->shouldReplaceIcons()) {
-			return $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]) . '?v=' . $cacheBusterValue;
-		}
-		if ($image === 'favicon-touch.png' && $this->shouldReplaceIcons()) {
-			return $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]) . '?v=' . $cacheBusterValue;
-		}
-		if ($image === 'manifest.json') {
-			try {
-				$appPath = $this->appManager->getAppPath($app);
-				if (file_exists($appPath . '/img/manifest.json')) {
-					return false;
-				}
-			} catch (AppPathNotFoundException $e) {}
-			return $this->urlGenerator->linkToRoute('theming.Theming.getManifest') . '?v=' . $cacheBusterValue;
-		}
-		return false;
-	}
-
-	/**
-	 * Check if Imagemagick is enabled and if SVG is supported
-	 * otherwise we can't render custom icons
-	 *
-	 * @return bool
-	 */
-	public function shouldReplaceIcons() {
-		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
-		}
-		$value = false;
-		if(extension_loaded('imagick')) {
-			$checkImagick = new \Imagick();
-			if (count($checkImagick->queryFormats('SVG')) >= 1) {
-				$value = true;
-			}
-			$checkImagick->clear();
-		}
-		$cache->set('shouldReplaceIcons', $value);
-		return $value;
-	}
-
-	/**
-	 * Increases the cache buster key
-	 */
-	private function increaseCacheBuster() {
-		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
-		$this->cacheFactory->create('theming')->clear('getScssVariables');
-	}
-
-	/**
-	 * Update setting in the database
-	 *
-	 * @param string $setting
-	 * @param string $value
-	 */
-	public function set($setting, $value) {
-		$this->config->setAppValue('theming', $setting, $value);
-		$this->increaseCacheBuster();
-	}
-
-	/**
-	 * Revert settings to the default value
-	 *
-	 * @param string $setting setting which should be reverted
-	 * @return string default value
-	 */
-	public function undo($setting) {
-		$this->config->deleteAppValue('theming', $setting);
-		$this->increaseCacheBuster();
-
-		switch ($setting) {
-			case 'name':
-				$returnValue = $this->getEntity();
-				break;
-			case 'url':
-				$returnValue = $this->getBaseUrl();
-				break;
-			case 'slogan':
-				$returnValue = $this->getSlogan();
-				break;
-			case 'color':
-				$returnValue = $this->getColorPrimary();
-				break;
-			default:
-				$returnValue = '';
-				break;
-		}
-
-		return $returnValue;
-	}
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    private $l;
+    /** @var IURLGenerator */
+    private $urlGenerator;
+    /** @var IAppData */
+    private $appData;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+    /** @var Util */
+    private $util;
+    /** @var IAppManager */
+    private $appManager;
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $title;
+    /** @var string */
+    private $entity;
+    /** @var string */
+    private $url;
+    /** @var string */
+    private $slogan;
+    /** @var string */
+    private $color;
+
+    /** @var string */
+    private $iTunesAppId;
+    /** @var string */
+    private $iOSClientUrl;
+    /** @var string */
+    private $AndroidClientUrl;
+
+    /**
+     * ThemingDefaults constructor.
+     *
+     * @param IConfig $config
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     * @param \OC_Defaults $defaults
+     * @param IAppData $appData
+     * @param ICacheFactory $cacheFactory
+     * @param Util $util
+     * @param IAppManager $appManager
+     */
+    public function __construct(IConfig $config,
+                                IL10N $l,
+                                IURLGenerator $urlGenerator,
+                                IAppData $appData,
+                                ICacheFactory $cacheFactory,
+                                Util $util,
+                                IAppManager $appManager
+    ) {
+        parent::__construct();
+        $this->config = $config;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+        $this->appData = $appData;
+        $this->cacheFactory = $cacheFactory;
+        $this->util = $util;
+        $this->appManager = $appManager;
+
+        $this->name = parent::getName();
+        $this->title = parent::getTitle();
+        $this->entity = parent::getEntity();
+        $this->url = parent::getBaseUrl();
+        $this->slogan = parent::getSlogan();
+        $this->color = parent::getColorPrimary();
+        $this->iTunesAppId = parent::getiTunesAppId();
+        $this->iOSClientUrl = parent::getiOSClientUrl();
+        $this->AndroidClientUrl = parent::getAndroidClientUrl();
+    }
+
+    public function getName() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->name));
+    }
+
+    public function getHTMLName() {
+        return $this->config->getAppValue('theming', 'name', $this->name);
+    }
+
+    public function getTitle() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->title));
+    }
+
+    public function getEntity() {
+        return strip_tags($this->config->getAppValue('theming', 'name', $this->entity));
+    }
+
+    public function getBaseUrl() {
+        return $this->config->getAppValue('theming', 'url', $this->url);
+    }
+
+    public function getSlogan() {
+        return \OCP\Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
+    }
+
+    public function getShortFooter() {
+        $slogan = $this->getSlogan();
+        $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
+            ' rel="noreferrer noopener">' .$this->getEntity() . '</a>'.
+            ($slogan !== '' ? ' – ' . $slogan : '');
+
+        return $footer;
+    }
+
+    /**
+     * Color that is used for the header as well as for mail headers
+     *
+     * @return string
+     */
+    public function getColorPrimary() {
+        return $this->config->getAppValue('theming', 'color', $this->color);
+    }
+
+    /**
+     * Themed logo url
+     *
+     * @param bool $useSvg Whether to point to the SVG image or a fallback
+     * @return string
+     */
+    public function getLogo($useSvg = true) {
+        $logo = $this->config->getAppValue('theming', 'logoMime', false);
+
+        $logoExists = true;
+        try {
+            $this->appData->getFolder('images')->getFile('logo');
+        } catch (\Exception $e) {
+            $logoExists = false;
+        }
+
+        $cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
+
+        if(!$logo || !$logoExists) {
+            if($useSvg) {
+                $logo = $this->urlGenerator->imagePath('core', 'logo.svg');
+            } else {
+                $logo = $this->urlGenerator->imagePath('core', 'logo.png');
+            }
+            return $logo . '?v=' . $cacheBusterCounter;
+        }
+
+        return $this->urlGenerator->linkToRoute('theming.Theming.getLogo') . '?v=' . $cacheBusterCounter;
+    }
+
+    /**
+     * Themed background image url
+     *
+     * @return string
+     */
+    public function getBackground() {
+        $backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime',false);
+
+        $backgroundExists = true;
+        try {
+            $this->appData->getFolder('images')->getFile('background');
+        } catch (\Exception $e) {
+            $backgroundExists = false;
+        }
+
+        $cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
+
+        if(!$backgroundLogo || !$backgroundExists) {
+            return $this->urlGenerator->imagePath('core','background.png') . '?v=' . $cacheBusterCounter;
+        }
+
+        return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground') . '?v=' . $cacheBusterCounter;
+    }
+
+    /**
+     * @return string
+     */
+    public function getiTunesAppId() {
+        return $this->config->getAppValue('theming', 'iTunesAppId', $this->iTunesAppId);
+    }
+
+    /**
+     * @return string
+     */
+    public function getiOSClientUrl() {
+        return $this->config->getAppValue('theming', 'iOSClientUrl', $this->iOSClientUrl);
+    }
+
+    /**
+     * @return string
+     */
+    public function getAndroidClientUrl() {
+        return $this->config->getAppValue('theming', 'AndroidClientUrl', $this->AndroidClientUrl);
+    }
+
+
+    /**
+     * @return array scss variables to overwrite
+     */
+    public function getScssVariables() {
+        $cache = $this->cacheFactory->create('theming');
+        if ($value = $cache->get('getScssVariables')) {
+            return $value;
+        }
+
+        $variables = [
+            'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
+            'theming-logo-mime' => "'" . $this->config->getAppValue('theming', 'logoMime', '') . "'",
+            'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime', '') . "'"
+        ];
+
+        $variables['image-logo'] = "'".$this->urlGenerator->getAbsoluteURL($this->getLogo())."'";
+        $variables['image-login-background'] = "'".$this->urlGenerator->getAbsoluteURL($this->getBackground())."'";
+        $variables['image-login-plain'] = 'false';
+
+        if ($this->config->getAppValue('theming', 'color', null) !== null) {
+            if ($this->util->invertTextColor($this->getColorPrimary())) {
+                $colorPrimaryText = '#000000';
+            } else {
+                $colorPrimaryText = '#ffffff';
+            }
+            $variables['color-primary'] = $this->getColorPrimary();
+            $variables['color-primary-text'] = $colorPrimaryText;
+            $variables['color-primary-element'] = $this->util->elementColor($this->getColorPrimary());
+        }
+
+        if ($this->config->getAppValue('theming', 'backgroundMime', null) === 'backgroundColor') {
+            $variables['image-login-plain'] = 'true';
+        }
+        $cache->set('getScssVariables', $variables);
+        return $variables;
+    }
+
+    /**
+     * Check if the image should be replaced by the theming app
+     * and return the new image location then
+     *
+     * @param string $app name of the app
+     * @param string $image filename of the image
+     * @return bool|string false if image should not replaced, otherwise the location of the image
+     */
+    public function replaceImagePath($app, $image) {
+        if($app==='') {
+            $app = 'core';
+        }
+        $cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
+
+        if ($image === 'favicon.ico' && $this->shouldReplaceIcons()) {
+            return $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]) . '?v=' . $cacheBusterValue;
+        }
+        if ($image === 'favicon-touch.png' && $this->shouldReplaceIcons()) {
+            return $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]) . '?v=' . $cacheBusterValue;
+        }
+        if ($image === 'manifest.json') {
+            try {
+                $appPath = $this->appManager->getAppPath($app);
+                if (file_exists($appPath . '/img/manifest.json')) {
+                    return false;
+                }
+            } catch (AppPathNotFoundException $e) {}
+            return $this->urlGenerator->linkToRoute('theming.Theming.getManifest') . '?v=' . $cacheBusterValue;
+        }
+        return false;
+    }
+
+    /**
+     * Check if Imagemagick is enabled and if SVG is supported
+     * otherwise we can't render custom icons
+     *
+     * @return bool
+     */
+    public function shouldReplaceIcons() {
+        $cache = $this->cacheFactory->create('theming');
+        if($value = $cache->get('shouldReplaceIcons')) {
+            return (bool)$value;
+        }
+        $value = false;
+        if(extension_loaded('imagick')) {
+            $checkImagick = new \Imagick();
+            if (count($checkImagick->queryFormats('SVG')) >= 1) {
+                $value = true;
+            }
+            $checkImagick->clear();
+        }
+        $cache->set('shouldReplaceIcons', $value);
+        return $value;
+    }
+
+    /**
+     * Increases the cache buster key
+     */
+    private function increaseCacheBuster() {
+        $cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
+        $this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+        $this->cacheFactory->create('theming')->clear('getScssVariables');
+    }
+
+    /**
+     * Update setting in the database
+     *
+     * @param string $setting
+     * @param string $value
+     */
+    public function set($setting, $value) {
+        $this->config->setAppValue('theming', $setting, $value);
+        $this->increaseCacheBuster();
+    }
+
+    /**
+     * Revert settings to the default value
+     *
+     * @param string $setting setting which should be reverted
+     * @return string default value
+     */
+    public function undo($setting) {
+        $this->config->deleteAppValue('theming', $setting);
+        $this->increaseCacheBuster();
+
+        switch ($setting) {
+            case 'name':
+                $returnValue = $this->getEntity();
+                break;
+            case 'url':
+                $returnValue = $this->getBaseUrl();
+                break;
+            case 'slogan':
+                $returnValue = $this->getSlogan();
+                break;
+            case 'color':
+                $returnValue = $this->getColorPrimary();
+                break;
+            default:
+                $returnValue = '';
+                break;
+        }
+
+        return $returnValue;
+    }
 }

Spacing +23 added lines, -23 removed lines

@@ -133,9 +133,9 @@ 
 
 	public function getShortFooter() {
 		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer noopener">' .$this->getEntity() . '</a>'.
-			($slogan !== '' ? ' – ' . $slogan : '');
+		$footer = '<a href="'.$this->getBaseUrl().'" target="_blank"'.
+			' rel="noreferrer noopener">'.$this->getEntity().'</a>'.
+			($slogan !== '' ? ' – '.$slogan : '');
 
 		return $footer;
 	}
@@ -167,16 +167,16 @@ 
 
 		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
 
-		if(!$logo || !$logoExists) {
-			if($useSvg) {
+		if (!$logo || !$logoExists) {
+			if ($useSvg) {
 				$logo = $this->urlGenerator->imagePath('core', 'logo.svg');
 			} else {
 				$logo = $this->urlGenerator->imagePath('core', 'logo.png');
 			}
-			return $logo . '?v=' . $cacheBusterCounter;
+			return $logo.'?v='.$cacheBusterCounter;
 		}
 
-		return $this->urlGenerator->linkToRoute('theming.Theming.getLogo') . '?v=' . $cacheBusterCounter;
+		return $this->urlGenerator->linkToRoute('theming.Theming.getLogo').'?v='.$cacheBusterCounter;
 	}
 
 	/**
@@ -185,7 +185,7 @@ 
 	 * @return string
 	 */
 	public function getBackground() {
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime',false);
+		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime', false);
 
 		$backgroundExists = true;
 		try {
@@ -196,11 +196,11 @@ 
 
 		$cacheBusterCounter = $this->config->getAppValue('theming', 'cachebuster', '0');
 
-		if(!$backgroundLogo || !$backgroundExists) {
-			return $this->urlGenerator->imagePath('core','background.png') . '?v=' . $cacheBusterCounter;
+		if (!$backgroundLogo || !$backgroundExists) {
+			return $this->urlGenerator->imagePath('core', 'background.png').'?v='.$cacheBusterCounter;
 		}
 
-		return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground') . '?v=' . $cacheBusterCounter;
+		return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground').'?v='.$cacheBusterCounter;
 	}
 
 	/**
@@ -235,9 +235,9 @@ 
 		}
 
 		$variables = [
-			'theming-cachebuster' => "'" . $this->config->getAppValue('theming', 'cachebuster', '0') . "'",
-			'theming-logo-mime' => "'" . $this->config->getAppValue('theming', 'logoMime', '') . "'",
-			'theming-background-mime' => "'" . $this->config->getAppValue('theming', 'backgroundMime', '') . "'"
+			'theming-cachebuster' => "'".$this->config->getAppValue('theming', 'cachebuster', '0')."'",
+			'theming-logo-mime' => "'".$this->config->getAppValue('theming', 'logoMime', '')."'",
+			'theming-background-mime' => "'".$this->config->getAppValue('theming', 'backgroundMime', '')."'"
 		];
 
 		$variables['image-logo'] = "'".$this->urlGenerator->getAbsoluteURL($this->getLogo())."'";
@@ -271,25 +271,25 @@ 
 	 * @return bool|string false if image should not replaced, otherwise the location of the image
 	 */
 	public function replaceImagePath($app, $image) {
-		if($app==='') {
+		if ($app === '') {
 			$app = 'core';
 		}
 		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
 
 		if ($image === 'favicon.ico' && $this->shouldReplaceIcons()) {
-			return $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]) . '?v=' . $cacheBusterValue;
+			return $this->urlGenerator->linkToRoute('theming.Icon.getFavicon', ['app' => $app]).'?v='.$cacheBusterValue;
 		}
 		if ($image === 'favicon-touch.png' && $this->shouldReplaceIcons()) {
-			return $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]) . '?v=' . $cacheBusterValue;
+			return $this->urlGenerator->linkToRoute('theming.Icon.getTouchIcon', ['app' => $app]).'?v='.$cacheBusterValue;
 		}
 		if ($image === 'manifest.json') {
 			try {
 				$appPath = $this->appManager->getAppPath($app);
-				if (file_exists($appPath . '/img/manifest.json')) {
+				if (file_exists($appPath.'/img/manifest.json')) {
 					return false;
 				}
 			} catch (AppPathNotFoundException $e) {}
-			return $this->urlGenerator->linkToRoute('theming.Theming.getManifest') . '?v=' . $cacheBusterValue;
+			return $this->urlGenerator->linkToRoute('theming.Theming.getManifest').'?v='.$cacheBusterValue;
 		}
 		return false;
 	}
@@ -302,11 +302,11 @@ 
 	 */
 	public function shouldReplaceIcons() {
 		$cache = $this->cacheFactory->create('theming');
-		if($value = $cache->get('shouldReplaceIcons')) {
-			return (bool)$value;
+		if ($value = $cache->get('shouldReplaceIcons')) {
+			return (bool) $value;
 		}
 		$value = false;
-		if(extension_loaded('imagick')) {
+		if (extension_loaded('imagick')) {
 			$checkImagick = new \Imagick();
 			if (count($checkImagick->queryFormats('SVG')) >= 1) {
 				$value = true;
@@ -322,7 +322,7 @@ 
 	 */
 	private function increaseCacheBuster() {
 		$cacheBusterKey = $this->config->getAppValue('theming', 'cachebuster', '0');
-		$this->config->setAppValue('theming', 'cachebuster', (int)$cacheBusterKey+1);
+		$this->config->setAppValue('theming', 'cachebuster', (int) $cacheBusterKey + 1);
 		$this->cacheFactory->create('theming')->clear('getScssVariables');
 	}
 

apps/workflowengine/templates/admin.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 	<h2 class="inlineblock"><?php p($_['heading']); ?></h2>
 	<?php if (!empty($_['docs'])): ?>
 		<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
-		   title="<?php p($l->t('Open documentation'));?>"
+		   title="<?php p($l->t('Open documentation')); ?>"
 		   href="<?php p(link_to_docs($_['docs'])); ?>">
 		</a>
 	<?php endif; ?>

apps/user_ldap/templates/part.settingcontrols.php

Spacing +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <div class="ldapSettingControls">
 	<button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection">
-		<?php p($l->t('Test Configuration'));?>
+		<?php p($l->t('Test Configuration')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer noopener">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<?php p($l->t('Help'));?>
+		<?php p($l->t('Help')); ?>
 	</a>
 </div>

apps/user_ldap/templates/part.wizardcontrols.php

Spacing +4 added lines, -4 removed lines

@@ -1,17 +1,17 @@
 <div class="ldapWizardControls">
-	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
+	<span class="ldap_saving hidden"><?php p($l->t('Saving')); ?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"
 			type="button">
-		<?php p($l->t('Back'));?>
+		<?php p($l->t('Back')); ?>
 	</button>
 	<button class="ldap_action_continue" name="ldap_action_continue" type="button">
-		<?php p($l->t('Continue'));?>
+		<?php p($l->t('Continue')); ?>
 	</button>
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
 		target="_blank" rel="noreferrer noopener">
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
 			style="height:1.75ex" />
-		<span class="ldap_grey"><?php p($l->t('Help'));?></span>
+		<span class="ldap_grey"><?php p($l->t('Help')); ?></span>
 	</a>
 </div>

core/templates/update.use-cli.php

Indentation +5 added lines, -5 removed lines

@@ -3,12 +3,12 @@
 		<h2 class="title"><?php p($l->t('Update needed')) ?></h2>
 		<div class="infogroup">
 			<?php if ($_['tooBig']) {
-				p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
-			} else {
-				p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
-			} ?><br><br>
+                p($l->t('Please use the command line updater because you have a big instance with more than 50 users.'));
+            } else {
+                p($l->t('Please use the command line updater because automatic updating is disabled in the config.php.'));
+            } ?><br><br>
 			<?php
-			print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
+            print_unescaped($l->t('For help, see the  <a target="_blank" rel="noreferrer noopener" href="%s">documentation</a>.', [link_to_docs('admin-cli-upgrade')])); ?><br><br>
 		</div>
 	</div>
 

core/templates/installation.php

Indentation +6 added lines, -6 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 script('core', [
-	'jquery-showpassword',
-	'installation'
+    'jquery-showpassword',
+    'installation'
 ]);
 ?>
 <input type='hidden' id='hasMySQL' value='<?php p($_['hasMySQL']) ?>'>
@@ -30,9 +30,9 @@ 
 		<legend><strong><?php p($l->t('Security warning'));?></strong></legend>
 		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
 		<?php print_unescaped($l->t(
-			'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.',
-			link_to_docs('admin-install')
-		)); ?></p>
+            'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.',
+            link_to_docs('admin-install')
+        )); ?></p>
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
@@ -76,7 +76,7 @@ 
 	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
 		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+            $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
 		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
 		<div id="selectDbType">
 		<?php foreach($_['databases'] as $type => $label): ?>

Spacing +45 added lines, -45 removed lines

@@ -10,12 +10,12 @@ 
 <input type='hidden' id='hasOracle' value='<?php p($_['hasOracle']) ?>'>
 <form action="index.php" method="post">
 <input type="hidden" name="install" value="true">
-	<?php if(count($_['errors']) > 0): ?>
+	<?php if (count($_['errors']) > 0): ?>
 	<fieldset class="warning">
-		<legend><strong><?php p($l->t('Error'));?></strong></legend>
-		<?php foreach($_['errors'] as $err): ?>
+		<legend><strong><?php p($l->t('Error')); ?></strong></legend>
+		<?php foreach ($_['errors'] as $err): ?>
 		<p>
-			<?php if(is_array($err)):?>
+			<?php if (is_array($err)):?>
 				<?php print_unescaped($err['error']); ?>
 				<span class='hint'><?php print_unescaped($err['hint']); ?></span>
 			<?php else: ?>
@@ -25,10 +25,10 @@ 
 		<?php endforeach; ?>
 	</fieldset>
 	<?php endif; ?>
-	<?php if(!$_['htaccessWorking']): ?>
+	<?php if (!$_['htaccessWorking']): ?>
 	<fieldset class="warning">
-		<legend><strong><?php p($l->t('Security warning'));?></strong></legend>
-		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br>
+		<legend><strong><?php p($l->t('Security warning')); ?></strong></legend>
+		<p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.')); ?><br>
 		<?php print_unescaped($l->t(
 			'For information how to properly configure your server, please see the <a href="%s" target="_blank" rel="noreferrer noopener">documentation</a>.',
 			link_to_docs('admin-install')
@@ -36,35 +36,35 @@ 
 	</fieldset>
 	<?php endif; ?>
 	<fieldset id="adminaccount">
-		<legend><?php print_unescaped($l->t( 'Create an <strong>admin account</strong>' )); ?></legend>
+		<legend><?php print_unescaped($l->t('Create an <strong>admin account</strong>')); ?></legend>
 		<p class="grouptop">
 			<input type="text" name="adminlogin" id="adminlogin"
-				placeholder="<?php p($l->t( 'Username' )); ?>"
+				placeholder="<?php p($l->t('Username')); ?>"
 				value="<?php p($_['adminlogin']); ?>"
 				autocomplete="off" autocapitalize="none" autocorrect="off" autofocus required>
-			<label for="adminlogin" class="infield"><?php p($l->t( 'Username' )); ?></label>
+			<label for="adminlogin" class="infield"><?php p($l->t('Username')); ?></label>
 		</p>
 		<p class="groupbottom">
 			<input type="password" name="adminpass" data-typetoggle="#show" id="adminpass"
-				placeholder="<?php p($l->t( 'Password' )); ?>"
+				placeholder="<?php p($l->t('Password')); ?>"
 				value="<?php p($_['adminpass']); ?>"
 				autocomplete="off" autocapitalize="none" autocorrect="off" required>
-			<label for="adminpass" class="infield"><?php p($l->t( 'Password' )); ?></label>
+			<label for="adminpass" class="infield"><?php p($l->t('Password')); ?></label>
 			<input type="checkbox" id="show" name="show">
 			<label for="show"></label>
 		</p>
 	</fieldset>
 
-	<?php if(!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?>
+	<?php if (!$_['directoryIsSet'] OR !$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id="advancedHeader">
-		<legend><a id="showAdvanced"><?php p($l->t( 'Storage & database' )); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
+		<legend><a id="showAdvanced"><?php p($l->t('Storage & database')); ?> <img src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" /></a></legend>
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['directoryIsSet'] OR count($_['errors']) > 0): ?>
+	<?php if (!$_['directoryIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id="datadirField">
 		<div id="datadirContent">
-			<label for="directory"><?php p($l->t( 'Data folder' )); ?></label>
+			<label for="directory"><?php p($l->t('Data folder')); ?></label>
 			<input type="text" name="directory" id="directory"
 				placeholder="<?php p(OC::$SERVERROOT.'/data'); ?>"
 				value="<?php p($_['directory']); ?>"
@@ -73,19 +73,19 @@ 
 	</fieldset>
 	<?php endif; ?>
 
-	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
+	<?php if (!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<fieldset id='databaseBackend'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
-			$hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
-		<legend><?php p($l->t( 'Configure the database' )); ?></legend>
+		<?php if ($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle'])
+			$hasOtherDB = true; else $hasOtherDB = false; //other than SQLite ?>
+		<legend><?php p($l->t('Configure the database')); ?></legend>
 		<div id="selectDbType">
-		<?php foreach($_['databases'] as $type => $label): ?>
-		<?php if(count($_['databases']) === 1): ?>
+		<?php foreach ($_['databases'] as $type => $label): ?>
+		<?php if (count($_['databases']) === 1): ?>
 		<p class="info">
-			<?php p($l->t( 'Only %s is available.', array($label) )); ?>
-			<?php p($l->t( 'Install and activate additional PHP modules to choose other database types.' )); ?><br>
+			<?php p($l->t('Only %s is available.', array($label))); ?>
+			<?php p($l->t('Install and activate additional PHP modules to choose other database types.')); ?><br>
 			<a href="<?php print_unescaped(link_to_docs('admin-source_install')); ?>" target="_blank" rel="noreferrer noopener">
-				<?php p($l->t( 'For more details check out the documentation.' )); ?> ↗</a>
+				<?php p($l->t('For more details check out the documentation.')); ?> ↗</a>
 		</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>">
 		<?php else: ?>
@@ -97,75 +97,75 @@ 
 		</div>
 	</fieldset>
 
-		<?php if($hasOtherDB): ?>
+		<?php if ($hasOtherDB): ?>
 		<fieldset id='databaseField'>
 		<div id="use_other_db">
 			<p class="grouptop">
-				<label for="dbuser" class="infield"><?php p($l->t( 'Database user' )); ?></label>
+				<label for="dbuser" class="infield"><?php p($l->t('Database user')); ?></label>
 				<input type="text" name="dbuser" id="dbuser"
-					placeholder="<?php p($l->t( 'Database user' )); ?>"
+					placeholder="<?php p($l->t('Database user')); ?>"
 					value="<?php p($_['dbuser']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
 			</p>
 			<p class="groupmiddle">
 				<input type="password" name="dbpass" id="dbpass" data-typetoggle="#dbpassword-toggle"
-					placeholder="<?php p($l->t( 'Database password' )); ?>"
+					placeholder="<?php p($l->t('Database password')); ?>"
 					value="<?php p($_['dbpass']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
-				<label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
+				<label for="dbpass" class="infield"><?php p($l->t('Database password')); ?></label>
 				<input type="checkbox" id="dbpassword-toggle" name="dbpassword-toggle">
 				<label for="dbpassword-toggle"></label>
 			</p>
 			<p class="groupmiddle">
-				<label for="dbname" class="infield"><?php p($l->t( 'Database name' )); ?></label>
+				<label for="dbname" class="infield"><?php p($l->t('Database name')); ?></label>
 				<input type="text" name="dbname" id="dbname"
-					placeholder="<?php p($l->t( 'Database name' )); ?>"
+					placeholder="<?php p($l->t('Database name')); ?>"
 					value="<?php p($_['dbname']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off"
 					pattern="[0-9a-zA-Z$_-]+">
 			</p>
-			<?php if($_['hasOracle']): ?>
+			<?php if ($_['hasOracle']): ?>
 			<div id="use_oracle_db">
 				<p class="groupmiddle">
-					<label for="dbtablespace" class="infield"><?php p($l->t( 'Database tablespace' )); ?></label>
+					<label for="dbtablespace" class="infield"><?php p($l->t('Database tablespace')); ?></label>
 					<input type="text" name="dbtablespace" id="dbtablespace"
-						placeholder="<?php p($l->t( 'Database tablespace' )); ?>"
+						placeholder="<?php p($l->t('Database tablespace')); ?>"
 						value="<?php p($_['dbtablespace']); ?>"
 						autocomplete="off" autocapitalize="none" autocorrect="off">
 				</p>
 			</div>
 			<?php endif; ?>
 			<p class="groupbottom">
-				<label for="dbhost" class="infield"><?php p($l->t( 'Database host' )); ?></label>
+				<label for="dbhost" class="infield"><?php p($l->t('Database host')); ?></label>
 				<input type="text" name="dbhost" id="dbhost"
-					placeholder="<?php p($l->t( 'Database host' )); ?>"
+					placeholder="<?php p($l->t('Database host')); ?>"
 					value="<?php p($_['dbhost']); ?>"
 					autocomplete="off" autocapitalize="none" autocorrect="off">
 			</p>
 			<p class="info">
-				<?php p($l->t( 'Please specify the port number along with the host name (e.g., localhost:5432).' )); ?>
+				<?php p($l->t('Please specify the port number along with the host name (e.g., localhost:5432).')); ?>
 			</p>
 		</div>
 		</fieldset>
 		<?php endif; ?>
 	<?php endif; ?>
 
-	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
+	<?php if (!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 		<fieldset id="sqliteInformation" class="warning">
-			<legend><?php p($l->t('Performance warning'));?></legend>
-			<p><?php p($l->t('SQLite will be used as database.'));?></p>
-			<p><?php p($l->t('For larger installations we recommend to choose a different database backend.'));?></p>
+			<legend><?php p($l->t('Performance warning')); ?></legend>
+			<p><?php p($l->t('SQLite will be used as database.')); ?></p>
+			<p><?php p($l->t('For larger installations we recommend to choose a different database backend.')); ?></p>
 			<p><?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?></p>
 		</fieldset>
 	<?php endif ?>
 
 	<div class="icon-loading-dark float-spinner">&nbsp;</div>
 
-	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>"></div>
+	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t('Finish setup')); ?>" data-finishing="<?php p($l->t('Finishing …')); ?>"></div>
 
 	<p class="info">
 		<span class="icon-info-white"></span>
-		<?php p($l->t('Need help?'));?>
-		<a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation'));?> ↗</a>
+		<?php p($l->t('Need help?')); ?>
+		<a target="_blank" rel="noreferrer noopener" href="<?php p(link_to_docs('admin-install')); ?>"><?php p($l->t('See the documentation')); ?> ↗</a>
 	</p>
 </form>

core/templates/layout.noscript.warning.php

Indentation +4 added lines, -4 removed lines

@@ -2,10 +2,10 @@
 	<div id="nojavascript">
 		<div>
 			<?php print_unescaped(str_replace(
-					['{linkstart}', '{linkend}'],
-					['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
-					$l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
-				)); ?>
+                    ['{linkstart}', '{linkend}'],
+                    ['<a href="https://www.enable-javascript.com/" target="_blank" rel="noreferrer noopener">', '</a>'],
+                    $l->t('This application requires JavaScript for correct operation. Please {linkstart}enable JavaScript{linkend} and reload the page.')
+                )); ?>
 		</div>
 	</div>
 </noscript>