nextcloud / server

core/templates/mail.php

Spacing +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 <tr><td>
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
 <tr>
-<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
+<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
 <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 </td>
 </tr>
@@ -12,7 +12,7 @@ 
 <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
 <?php
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
-if ( isset($_['expiration']) ) {
+if (isset($_['expiration'])) {
 	p($l->t("The share will expire on %s.", array($_['expiration'])));
 	print_unescaped('<br><br>');
 }
@@ -27,7 +27,7 @@ 
 <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 <?php p($theme->getName()); ?> -
 <?php p($theme->getSlogan()); ?>
-<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 </td>
 </tr>
 <tr>

settings/templates/email.new_user.php

Spacing +2 added lines, -2 removed lines

@@ -2,7 +2,7 @@ 
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>" bordercolor="<?php p($theme->getColorPrimary());?>" border>
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>" bordercolor="<?php p($theme->getColorPrimary()); ?>" border>
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
@@ -24,7 +24,7 @@ 
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 						<?php p($theme->getName()); ?> -
 						<?php p($theme->getSlogan()); ?>
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 					</td>
 				</tr>
 				<tr>

themes/example/defaults.php

Indentation +130 added lines, -130 removed lines

@@ -20,135 +20,135 @@
 
 class OC_Theme {
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		return 'https://nextcloud.com';
-	}
-
-	/**
-	 * Returns the URL where the sync clients are listed
-	 * @return string URL
-	 */
-	public function getSyncClientUrl() {
-		return 'https://nextcloud.com/install/#install-clients';
-	}
-
-	/**
-	 * Returns the URL to the App Store for the iOS Client
-	 * @return string URL
-	 */
-	public function getiOSClientUrl() {
-		return 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
-	}
-
-	/**
-	 * Returns the AppId for the App Store for the iOS Client
-	 * @return string AppId
-	 */
-	public function getiTunesAppId() {
-		return '1125420102';
-	}
-
-	/**
-	 * Returns the URL to Google Play for the Android Client
-	 * @return string URL
-	 */
-	public function getAndroidClientUrl() {
-		return 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
-	}
-
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		return 'https://docs.nextcloud.com';
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		return 'Custom Cloud Co.';
-	}
-
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		return 'Your custom cloud, personalized for you!';
-	}
-
-	/**
-	 * Returns logo claim
-	 * @return string logo claim
-	 */
-	public function getLogoClaim() {
-		return '';
-	}
-
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		$footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		$footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/11/go.php?to=' . $key;
-	}
-
-
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return '#745bca';
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        return 'https://nextcloud.com';
+    }
+
+    /**
+     * Returns the URL where the sync clients are listed
+     * @return string URL
+     */
+    public function getSyncClientUrl() {
+        return 'https://nextcloud.com/install/#install-clients';
+    }
+
+    /**
+     * Returns the URL to the App Store for the iOS Client
+     * @return string URL
+     */
+    public function getiOSClientUrl() {
+        return 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
+    }
+
+    /**
+     * Returns the AppId for the App Store for the iOS Client
+     * @return string AppId
+     */
+    public function getiTunesAppId() {
+        return '1125420102';
+    }
+
+    /**
+     * Returns the URL to Google Play for the Android Client
+     * @return string URL
+     */
+    public function getAndroidClientUrl() {
+        return 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
+    }
+
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        return 'https://docs.nextcloud.com';
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        return 'Custom Cloud Co.';
+    }
+
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        return 'Your custom cloud, personalized for you!';
+    }
+
+    /**
+     * Returns logo claim
+     * @return string logo claim
+     */
+    public function getLogoClaim() {
+        return '';
+    }
+
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        $footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        $footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    public function buildDocLinkToKey($key) {
+        return $this->getDocBaseUrl() . '/server/11/go.php?to=' . $key;
+    }
+
+
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getColorPrimary() {
+        return '#745bca';
+    }
 
 }

apps/federatedfilesharing/settings-personal.php

Indentation +9 added lines, -9 removed lines

@@ -35,7 +35,7 @@ 
 $isIE8 = false;
 preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
 if (count($matches) > 0 && $matches[1] <= 9) {
-	$isIE8 = true;
+    $isIE8 = true;
 }
 
 $cloudID = \OC::$server->getUserSession()->getUser()->getCloudId();
@@ -45,15 +45,15 @@ 
 $color = $theme->getColorPrimary();
 $textColor = "#ffffff";
 if(\OC::$server->getAppManager()->isEnabledForUser("theming")) {
-	$logoPath = $theme->getLogo();
-	try {
-		$util = \OC::$server->query("\OCA\Theming\Util");
-		if($util->invertTextColor($color)) {
-			$textColor = "#000000";
-		}
-	} catch (OCP\AppFramework\QueryException $e) {
+    $logoPath = $theme->getLogo();
+    try {
+        $util = \OC::$server->query("\OCA\Theming\Util");
+        if($util->invertTextColor($color)) {
+            $textColor = "#000000";
+        }
+    } catch (OCP\AppFramework\QueryException $e) {
 		
-	}
+    }
 }
 
 

Spacing +3 added lines, -3 removed lines

@@ -39,16 +39,16 @@
 }
 
 $cloudID = \OC::$server->getUserSession()->getUser()->getCloudId();
-$url = 'https://nextcloud.com/federation#' . $cloudID;
+$url = 'https://nextcloud.com/federation#'.$cloudID;
 $logoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg');
 $theme = \OC::$server->getThemingDefaults();
 $color = $theme->getColorPrimary();
 $textColor = "#ffffff";
-if(\OC::$server->getAppManager()->isEnabledForUser("theming")) {
+if (\OC::$server->getAppManager()->isEnabledForUser("theming")) {
 	$logoPath = $theme->getLogo();
 	try {
 		$util = \OC::$server->query("\OCA\Theming\Util");
-		if($util->invertTextColor($color)) {
+		if ($util->invertTextColor($color)) {
 			$textColor = "#000000";
 		}
 	} catch (OCP\AppFramework\QueryException $e) {

apps/sharebymail/templates/mail.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	<tr><td>
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
 				<tr>
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
 					</td>
 				</tr>
@@ -52,7 +52,7 @@ 
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
 						<?php p($theme->getName()); ?> -
 						<?php p($theme->getSlogan()); ?>
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
 					</td>
 				</tr>
 				<tr>

apps/theming/lib/Settings/Admin.php

Indentation +60 added lines, -60 removed lines

@@ -31,72 +31,72 @@
 use OCP\Settings\ISettings;
 
 class Admin implements ISettings {
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var ThemingDefaults */
-	private $themingDefaults;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IConfig */
+    private $config;
+    /** @var IL10N */
+    private $l;
+    /** @var ThemingDefaults */
+    private $themingDefaults;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IConfig $config,
-								IL10N $l,
-								ThemingDefaults $themingDefaults,
-								IURLGenerator $urlGenerator) {
-		$this->config = $config;
-		$this->l = $l;
-		$this->themingDefaults = $themingDefaults;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(IConfig $config,
+                                IL10N $l,
+                                ThemingDefaults $themingDefaults,
+                                IURLGenerator $urlGenerator) {
+        $this->config = $config;
+        $this->l = $l;
+        $this->themingDefaults = $themingDefaults;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * @return TemplateResponse
-	 */
-	public function getForm() {
-		$path = $this->urlGenerator->linkToRoute('theming.Theming.updateLogo');
+    /**
+     * @return TemplateResponse
+     */
+    public function getForm() {
+        $path = $this->urlGenerator->linkToRoute('theming.Theming.updateLogo');
 
-		$themable = true;
-		$errorMessage = '';
-		$theme = $this->config->getSystemValue('theme', '');
-		if ($theme !== '') {
-			$themable = false;
-			$errorMessage = $this->l->t('You are already using a custom theme');
-		}
+        $themable = true;
+        $errorMessage = '';
+        $theme = $this->config->getSystemValue('theme', '');
+        if ($theme !== '') {
+            $themable = false;
+            $errorMessage = $this->l->t('You are already using a custom theme');
+        }
 
-		$parameters = [
-			'themable'        => $themable,
-			'errorMessage'    => $errorMessage,
-			'name'            => $this->themingDefaults->getEntity(),
-			'url'             => $this->themingDefaults->getBaseUrl(),
-			'slogan'          => $this->themingDefaults->getSlogan(),
-			'color'           => $this->themingDefaults->getColorPrimary(),
-			'logo'            => $this->themingDefaults->getLogo(),
-			'logoMime'        => $this->config->getAppValue('theming', 'logoMime', ''),
-			'background'      => $this->themingDefaults->getBackground(),
-			'backgroundMime'  => $this->config->getAppValue('theming', 'backgroundMime', ''),
-			'uploadLogoRoute' => $path,
-		];
+        $parameters = [
+            'themable'        => $themable,
+            'errorMessage'    => $errorMessage,
+            'name'            => $this->themingDefaults->getEntity(),
+            'url'             => $this->themingDefaults->getBaseUrl(),
+            'slogan'          => $this->themingDefaults->getSlogan(),
+            'color'           => $this->themingDefaults->getColorPrimary(),
+            'logo'            => $this->themingDefaults->getLogo(),
+            'logoMime'        => $this->config->getAppValue('theming', 'logoMime', ''),
+            'background'      => $this->themingDefaults->getBackground(),
+            'backgroundMime'  => $this->config->getAppValue('theming', 'backgroundMime', ''),
+            'uploadLogoRoute' => $path,
+        ];
 
-		return new TemplateResponse('theming', 'settings-admin', $parameters, '');
-	}
+        return new TemplateResponse('theming', 'settings-admin', $parameters, '');
+    }
 
-	/**
-	 * @return string the section ID, e.g. 'sharing'
-	 */
-	public function getSection() {
-		return 'theming';
-	}
+    /**
+     * @return string the section ID, e.g. 'sharing'
+     */
+    public function getSection() {
+        return 'theming';
+    }
 
-	/**
-	 * @return int whether the form should be rather on the top or bottom of
-	 * the admin section. The forms are arranged in ascending order of the
-	 * priority values. It is required to return a value between 0 and 100.
-	 *
-	 * E.g.: 70
-	 */
-	public function getPriority() {
-		return 5;
-	}
+    /**
+     * @return int whether the form should be rather on the top or bottom of
+     * the admin section. The forms are arranged in ascending order of the
+     * priority values. It is required to return a value between 0 and 100.
+     *
+     * E.g.: 70
+     */
+    public function getPriority() {
+        return 5;
+    }
 
 }

apps/theming/lib/Controller/ThemingController.php

Spacing +77 added lines, -77 removed lines

@@ -191,16 +191,16 @@ 
 			$folder = $this->appData->newFolder('images');
 		}
 
-		if(!empty($newLogo)) {
+		if (!empty($newLogo)) {
 			$target = $folder->newFile('logo');
 			$target->putContent(file_get_contents($newLogo['tmp_name'], 'r'));
 			$this->template->set('logoMime', $newLogo['type']);
 			$name = $newLogo['name'];
 		}
-		if(!empty($newBackgroundLogo)) {
+		if (!empty($newBackgroundLogo)) {
 			$target = $folder->newFile('background');
 			$image = @imagecreatefromstring(file_get_contents($newBackgroundLogo['tmp_name'], 'r'));
-			if($image === false) {
+			if ($image === false) {
 				return new DataResponse(
 					[
 						'data' => [
@@ -215,10 +215,10 @@ 
 			// Optimize the image since some people may upload images that will be
 			// either to big or are not progressive rendering.
 			$tmpFile = $this->tempManager->getTemporaryFile();
-			if(function_exists('imagescale')) {
+			if (function_exists('imagescale')) {
 				// FIXME: Once PHP 5.5.0 is a requirement the above check can be removed
 				// Workaround for https://bugs.php.net/bug.php?id=65171
-				$newHeight = imagesy($image)/(imagesx($image)/1920);
+				$newHeight = imagesy($image) / (imagesx($image) / 1920);
 				$image = imagescale($image, 1920, $newHeight);
 			}
 			imageinterlace($image, 1);
@@ -324,112 +324,112 @@ 
 		$color = $this->config->getAppValue($this->appName, 'color');
 		$elementColor = $this->util->elementColor($color);
 
-		if($this->util->invertTextColor($color)) {
+		if ($this->util->invertTextColor($color)) {
 			$textColor = '#000000';
 		} else {
 			$textColor = '#ffffff';
 		}
 
-		if($color !== '') {
+		if ($color !== '') {
 			$responseCss .= sprintf(
-				'#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}' . "\n",
+				'#body-user #header,#body-settings #header,#body-public #header,#body-login,.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid {background-color: %s}'."\n",
 				$color
 			);
-			$responseCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {' .
-				'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');' .
-				'background-color: %s; background-position: center center; background-size:contain;' .
-				'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;' .
+			$responseCss .= sprintf('input[type="checkbox"].checkbox:checked:enabled:not(.checkbox--white) + label:before {'.
+				'background-image:url(\'%s/core/img/actions/checkmark-white.svg\');'.
+				'background-color: %s; background-position: center center; background-size:contain;'.
+				'width:12px; height:12px; padding:0; margin:2px 6px 6px 2px; border-radius:1px;'.
 				"}\n",
 				\OC::$WEBROOT,
 				$elementColor
 			);
-			$responseCss .= 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {' .
-				'background-image: url(\'data:image/svg+xml;base64,'.$this->util->generateRadioButton($elementColor).'\');' .
+			$responseCss .= 'input[type="radio"].radio:checked:not(.radio--white):not(:disabled) + label:before {'.
+				'background-image: url(\'data:image/svg+xml;base64,'.$this->util->generateRadioButton($elementColor).'\');'.
 				"}\n";
-			$responseCss .= '.primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary,' .
-				'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {' .
+			$responseCss .= '.primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary,'.
+				'.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {'.
 				'border: 1px solid '.$elementColor.';'.
 				'background-color: '.$elementColor.';'.
-				'color: ' . $textColor . ';'.
-				"}\n" .
-				'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,' .
-				'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {' .
+				'color: '.$textColor.';'.
+				"}\n".
+				'.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,'.
+				'.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {'.
 				'border: 1px solid '.$elementColor.';'.
 				'background-color: '.$elementColor.';'.
-				'color: ' . $textColor . ';'.
-				"}\n" .
-				'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,' .
-				'.primary:disabled:hover, input[type="submit"].primary:disabled:hover, input[type="button"].primary:disabled:hover, button.primary:disabled:hover, .button.primary:disabled:hover,' .
-				'.primary:disabled:focus, input[type="submit"].primary:disabled:focus, input[type="button"].primary:disabled:focus, button.primary:disabled:focus, .button.primary:disabled:focus {' .
+				'color: '.$textColor.';'.
+				"}\n".
+				'.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,'.
+				'.primary:disabled:hover, input[type="submit"].primary:disabled:hover, input[type="button"].primary:disabled:hover, button.primary:disabled:hover, .button.primary:disabled:hover,'.
+				'.primary:disabled:focus, input[type="submit"].primary:disabled:focus, input[type="button"].primary:disabled:focus, button.primary:disabled:focus, .button.primary:disabled:focus {'.
 				'border: 1px solid '.$elementColor.';'.
 				'background-color: '.$elementColor.';'.
-				'opacity: 0.4;' .
+				'opacity: 0.4;'.
 				'color: '.$textColor.';'.
 				"}\n";
-			$responseCss .= '.ui-widget-header { border: 1px solid ' . $color . '; background: '. $color . '; color: #ffffff;' . "}\n";
-			$responseCss .= '.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {' .
-				'border: 1px solid ' . $color . ';' .
-				'color: ' . $elementColor . ';' .
+			$responseCss .= '.ui-widget-header { border: 1px solid '.$color.'; background: '.$color.'; color: #ffffff;'."}\n";
+			$responseCss .= '.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active {'.
+				'border: 1px solid '.$color.';'.
+				'color: '.$elementColor.';'.
 				"}\n";
-			$responseCss .= '.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {' .
-				'color: ' . $elementColor . ';' .
+			$responseCss .= '.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited {'.
+				'color: '.$elementColor.';'.
 				"}\n";
 			$responseCss .= '
 				#firstrunwizard .firstrunwizard-header {
-					background-color: ' . $color . ';
+					background-color: ' . $color.';
 				}
 				#firstrunwizard p a {
-					color: ' . $color . ';
+					color: ' . $color.';
 				}
 				';
-			$responseCss .= sprintf('.nc-theming-main-background {background-color: %s}' . "\n", $color);
-			$responseCss .= sprintf('.nc-theming-main-text {color: %s}' . "\n", $color);
-			$responseCss .= sprintf('#app-navigation li:hover > a, #app-navigation li:focus > a, #app-navigation a:focus, #app-navigation .selected, #app-navigation .selected a, #app-navigation .active, #app-navigation .active a {box-shadow: inset 2px 0 %s}' . "\n", $color);
+			$responseCss .= sprintf('.nc-theming-main-background {background-color: %s}'."\n", $color);
+			$responseCss .= sprintf('.nc-theming-main-text {color: %s}'."\n", $color);
+			$responseCss .= sprintf('#app-navigation li:hover > a, #app-navigation li:focus > a, #app-navigation a:focus, #app-navigation .selected, #app-navigation .selected a, #app-navigation .active, #app-navigation .active a {box-shadow: inset 2px 0 %s}'."\n", $color);
 
 		}
 		$logo = $this->config->getAppValue($this->appName, 'logoMime');
-		if($logo !== '') {
+		if ($logo !== '') {
 			$responseCss .= sprintf(
-				'#header .logo {' .
-				'background-image: url(\'./logo?v='.$cacheBusterValue.'\');' .
-				'background-size: contain;' .
-				'}' . "\n" .
-				'#header .logo-icon {' .
-				'background-image: url(\'./logo?v='.$cacheBusterValue.'\');' .
-				'background-size: contain;' .
-				'}' . "\n" .
-				'#firstrunwizard .firstrunwizard-header .logo {' .
-				'background-image: url(\'./logo?v='.$cacheBusterValue.'\');' .
-				'background-size: contain;' .
-				'}' . "\n"
+				'#header .logo {'.
+				'background-image: url(\'./logo?v='.$cacheBusterValue.'\');'.
+				'background-size: contain;'.
+				'}'."\n".
+				'#header .logo-icon {'.
+				'background-image: url(\'./logo?v='.$cacheBusterValue.'\');'.
+				'background-size: contain;'.
+				'}'."\n".
+				'#firstrunwizard .firstrunwizard-header .logo {'.
+				'background-image: url(\'./logo?v='.$cacheBusterValue.'\');'.
+				'background-size: contain;'.
+				'}'."\n"
 			);
 		}
 		$backgroundLogo = $this->config->getAppValue($this->appName, 'backgroundMime');
-		if($backgroundLogo !== '') {
-			$responseCss .= '#body-login {background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\');}' . "\n";
-			$responseCss .= '#firstrunwizard .firstrunwizard-header {' .
-				'background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\');' .
-			'}' . "\n";
+		if ($backgroundLogo !== '') {
+			$responseCss .= '#body-login {background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\');}'."\n";
+			$responseCss .= '#firstrunwizard .firstrunwizard-header {'.
+				'background-image: url(\'./loginbackground?v='.$cacheBusterValue.'\');'.
+			'}'."\n";
 		}
-		if($this->util->invertTextColor($color)) {
-			$responseCss .= '#header .header-appname, #expandDisplayName { color: #000000; }' . "\n";
-			$responseCss .= '#header .icon-caret { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/caret-dark.svg\'); }' . "\n";
-			$responseCss .= '.searchbox input[type="search"] { background: transparent url(\'' . \OC::$WEBROOT . '/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }' . "\n";
-			$responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }' . "\n";
-			$responseCss .= '#body-login input.login { background-image: url(\'' . \OC::$WEBROOT . '/core/img/actions/confirm.svg?v=2\'); }' . "\n";
-			$responseCss .= '.nc-theming-contrast {color: #000000}' . "\n";
-			$responseCss .= '.ui-widget-header { color: #000000; }' . "\n";
+		if ($this->util->invertTextColor($color)) {
+			$responseCss .= '#header .header-appname, #expandDisplayName { color: #000000; }'."\n";
+			$responseCss .= '#header .icon-caret { background-image: url(\''.\OC::$WEBROOT.'/core/img/actions/caret-dark.svg\'); }'."\n";
+			$responseCss .= '.searchbox input[type="search"] { background: transparent url(\''.\OC::$WEBROOT.'/core/img/actions/search.svg\') no-repeat 6px center; color: #000; }'."\n";
+			$responseCss .= '.searchbox input[type="search"]:focus,.searchbox input[type="search"]:active,.searchbox input[type="search"]:valid { color: #000; border: 1px solid rgba(0, 0, 0, .5); }'."\n";
+			$responseCss .= '#body-login input.login { background-image: url(\''.\OC::$WEBROOT.'/core/img/actions/confirm.svg?v=2\'); }'."\n";
+			$responseCss .= '.nc-theming-contrast {color: #000000}'."\n";
+			$responseCss .= '.ui-widget-header { color: #000000; }'."\n";
 		} else {
-			$responseCss .= '.nc-theming-contrast {color: #ffffff}' . "\n";
+			$responseCss .= '.nc-theming-contrast {color: #ffffff}'."\n";
 		}
 
-		if($logo !== '' or $color !== '') {
-			$responseCss .= '.icon-file,.icon-filetype-text {' .
-				'background-image: url(\'./img/core/filetypes/text.svg?v='.$cacheBusterValue.'\');' . "}\n" .
-				'.icon-folder, .icon-filetype-folder {' .
-				'background-image: url(\'./img/core/filetypes/folder.svg?v='.$cacheBusterValue.'\');' . "}\n" .
-				'.icon-filetype-folder-drag-accept {' .
-				'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v='.$cacheBusterValue.'\')!important;' . "}\n";
+		if ($logo !== '' or $color !== '') {
+			$responseCss .= '.icon-file,.icon-filetype-text {'.
+				'background-image: url(\'./img/core/filetypes/text.svg?v='.$cacheBusterValue.'\');'."}\n".
+				'.icon-folder, .icon-filetype-folder {'.
+				'background-image: url(\'./img/core/filetypes/folder.svg?v='.$cacheBusterValue.'\');'."}\n".
+				'.icon-filetype-folder-drag-accept {'.
+				'background-image: url(\'./img/core/filetypes/folder-drag-accept.svg?v='.$cacheBusterValue.'\')!important;'."}\n";
 		}
 
 		$response = new DataDownloadResponse($responseCss, 'style', 'text/css');
@@ -448,12 +448,12 @@ 
 		$cacheBusterValue = $this->config->getAppValue('theming', 'cachebuster', '0');
 		$responseJS = '(function() {
 	OCA.Theming = {
-		name: ' . json_encode($this->template->getName()) . ',
-		url: ' . json_encode($this->template->getBaseUrl()) . ',
-		slogan: ' . json_encode($this->template->getSlogan()) . ',
-		color: ' . json_encode($this->template->getColorPrimary()) . ',
-		inverted: ' . json_encode($this->util->invertTextColor($this->template->getColorPrimary())) . ',
-		cacheBuster: ' . json_encode($cacheBusterValue). '
+		name: ' . json_encode($this->template->getName()).',
+		url: ' . json_encode($this->template->getBaseUrl()).',
+		slogan: ' . json_encode($this->template->getSlogan()).',
+		color: ' . json_encode($this->template->getColorPrimary()).',
+		inverted: ' . json_encode($this->util->invertTextColor($this->template->getColorPrimary())).',
+		cacheBuster: ' . json_encode($cacheBusterValue).'
 	};
 })();';
 		$response = new DataDownloadResponse($responseJS, 'javascript', 'text/javascript');

apps/theming/lib/ThemingDefaults.php

Indentation +191 added lines, -191 removed lines

@@ -32,196 +32,196 @@
 
 class ThemingDefaults extends \OC_Defaults {
 
-	/** @var IConfig */
-	private $config;
-	/** @var IL10N */
-	private $l;
-	/** @var IURLGenerator */
-	private $urlGenerator;
-	/** @var IRootFolder */
-	private $rootFolder;
-	/** @var ICacheFactory */
-	private $cacheFactory;
-	/** @var string */
-	private $name;
-	/** @var string */
-	private $url;
-	/** @var string */
-	private $slogan;
-	/** @var string */
-	private $color;
-
-	/**
-	 * ThemingDefaults constructor.
-	 *
-	 * @param IConfig $config
-	 * @param IL10N $l
-	 * @param IURLGenerator $urlGenerator
-	 * @param \OC_Defaults $defaults
-	 * @param IRootFolder $rootFolder
-	 * @param ICacheFactory $cacheFactory
-	 */
-	public function __construct(IConfig $config,
-								IL10N $l,
-								IURLGenerator $urlGenerator,
-								\OC_Defaults $defaults,
-								IRootFolder $rootFolder,
-								ICacheFactory $cacheFactory
-	) {
-		parent::__construct();
-		$this->config = $config;
-		$this->l = $l;
-		$this->urlGenerator = $urlGenerator;
-		$this->rootFolder = $rootFolder;
-		$this->cacheFactory = $cacheFactory;
-
-		$this->name = $defaults->getName();
-		$this->url = $defaults->getBaseUrl();
-		$this->slogan = $defaults->getSlogan();
-		$this->color = $defaults->getColorPrimary();
-	}
-
-	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 $this->getName();
-	}
-
-	public function getEntity() {
-		return $this->getName();
-	}
-
-	public function getBaseUrl() {
-		return $this->config->getAppValue('theming', 'url', $this->url);
-	}
-
-	public function getSlogan() {
-		return Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
-	}
-
-	public function getShortFooter() {
-		$slogan = $this->getSlogan();
-		$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
-			' rel="noreferrer">' .$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
-	 *
-	 * @return string
-	 */
-	public function getLogo() {
-		$logo = $this->config->getAppValue('theming', 'logoMime');
-		if(!$logo || !$this->rootFolder->nodeExists('/themedinstancelogo')) {
-			return $this->urlGenerator->imagePath('core','logo.svg');
-		} else {
-			return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
-		}
-	}
-
-	/**
-	 * Themed background image url
-	 *
-	 * @return string
-	 */
-	public function getBackground() {
-		$backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime');
-		if(!$backgroundLogo || !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
-			return $this->urlGenerator->imagePath('core','background.jpg');
-		} else {
-			return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
-		}
-	}
-
-	/**
-	 * 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);
-	}
-
-	/**
-	 * 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 IRootFolder */
+    private $rootFolder;
+    /** @var ICacheFactory */
+    private $cacheFactory;
+    /** @var string */
+    private $name;
+    /** @var string */
+    private $url;
+    /** @var string */
+    private $slogan;
+    /** @var string */
+    private $color;
+
+    /**
+     * ThemingDefaults constructor.
+     *
+     * @param IConfig $config
+     * @param IL10N $l
+     * @param IURLGenerator $urlGenerator
+     * @param \OC_Defaults $defaults
+     * @param IRootFolder $rootFolder
+     * @param ICacheFactory $cacheFactory
+     */
+    public function __construct(IConfig $config,
+                                IL10N $l,
+                                IURLGenerator $urlGenerator,
+                                \OC_Defaults $defaults,
+                                IRootFolder $rootFolder,
+                                ICacheFactory $cacheFactory
+    ) {
+        parent::__construct();
+        $this->config = $config;
+        $this->l = $l;
+        $this->urlGenerator = $urlGenerator;
+        $this->rootFolder = $rootFolder;
+        $this->cacheFactory = $cacheFactory;
+
+        $this->name = $defaults->getName();
+        $this->url = $defaults->getBaseUrl();
+        $this->slogan = $defaults->getSlogan();
+        $this->color = $defaults->getColorPrimary();
+    }
+
+    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 $this->getName();
+    }
+
+    public function getEntity() {
+        return $this->getName();
+    }
+
+    public function getBaseUrl() {
+        return $this->config->getAppValue('theming', 'url', $this->url);
+    }
+
+    public function getSlogan() {
+        return Util::sanitizeHTML($this->config->getAppValue('theming', 'slogan', $this->slogan));
+    }
+
+    public function getShortFooter() {
+        $slogan = $this->getSlogan();
+        $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
+            ' rel="noreferrer">' .$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
+     *
+     * @return string
+     */
+    public function getLogo() {
+        $logo = $this->config->getAppValue('theming', 'logoMime');
+        if(!$logo || !$this->rootFolder->nodeExists('/themedinstancelogo')) {
+            return $this->urlGenerator->imagePath('core','logo.svg');
+        } else {
+            return $this->urlGenerator->linkToRoute('theming.Theming.getLogo');
+        }
+    }
+
+    /**
+     * Themed background image url
+     *
+     * @return string
+     */
+    public function getBackground() {
+        $backgroundLogo = $this->config->getAppValue('theming', 'backgroundMime');
+        if(!$backgroundLogo || !$this->rootFolder->nodeExists('/themedbackgroundlogo')) {
+            return $this->urlGenerator->imagePath('core','background.jpg');
+        } else {
+            return $this->urlGenerator->linkToRoute('theming.Theming.getLoginBackground');
+        }
+    }
+
+    /**
+     * 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);
+    }
+
+    /**
+     * 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;
+    }
 
 }

apps/theming/lib/Capabilities.php

Indentation +29 added lines, -29 removed lines

@@ -33,37 +33,37 @@
  */
 class Capabilities implements ICapability {
 
-	/** @var ThemingDefaults */
-	protected $theming;
+    /** @var ThemingDefaults */
+    protected $theming;
 
 
-	/** @var IURLGenerator */
-	protected $url;
+    /** @var IURLGenerator */
+    protected $url;
 
-	/**
-	 * @param ThemingDefaults $theming
-	 * @param IURLGenerator $url
-	 */
-	public function __construct(ThemingDefaults $theming, IURLGenerator $url) {
-		$this->theming = $theming;
-		$this->url = $url;
-	}
+    /**
+     * @param ThemingDefaults $theming
+     * @param IURLGenerator $url
+     */
+    public function __construct(ThemingDefaults $theming, IURLGenerator $url) {
+        $this->theming = $theming;
+        $this->url = $url;
+    }
 
-	/**
-	 * Return this classes capabilities
-	 *
-	 * @return array
-	 */
-	public function getCapabilities() {
-		return [
-			'theming' => [
-				'name' => $this->theming->getName(),
-				'url' => $this->theming->getBaseUrl(),
-				'slogan' => $this->theming->getSlogan(),
-				'color' => $this->theming->getColorPrimary(),
-				'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
-				'background' => $this->url->getAbsoluteURL($this->theming->getBackground()),
-			],
-		];
-	}
+    /**
+     * Return this classes capabilities
+     *
+     * @return array
+     */
+    public function getCapabilities() {
+        return [
+            'theming' => [
+                'name' => $this->theming->getName(),
+                'url' => $this->theming->getBaseUrl(),
+                'slogan' => $this->theming->getSlogan(),
+                'color' => $this->theming->getColorPrimary(),
+                'logo' => $this->url->getAbsoluteURL($this->theming->getLogo()),
+                'background' => $this->url->getAbsoluteURL($this->theming->getBackground()),
+            ],
+        ];
+    }
 }