silverstripe / multi-domain

code/MultiDomainDomain.php

Spacing +17 added lines, -18 removed lines

@@ -64,10 +64,10 @@ 
 		$this->hostname = $config['hostname'];
 		$this->url = isset($config['resolves_to']) ? $config['resolves_to'] : null;
 
-		$globalAllowed = (array) Config::inst()->get('MultiDomain','allow');
-		$globalForced = (array) Config::inst()->get('MultiDomain','force');
-		$myAllowed = isset($config['allow']) ? $config['allow'] : array ();
-		$myForced = isset($config['force']) ? $config['force'] : array ();
+		$globalAllowed = (array) Config::inst()->get('MultiDomain', 'allow');
+		$globalForced = (array) Config::inst()->get('MultiDomain', 'force');
+		$myAllowed = isset($config['allow']) ? $config['allow'] : array();
+		$myForced = isset($config['force']) ? $config['force'] : array();
 		$this->allowedPaths = array_merge($globalAllowed, $myAllowed);
 		$this->forcedPaths = array_merge($globalForced, $myForced);
 
@@ -95,7 +95,7 @@ 
 	 * @return boolean
 	 */
 	public function isActive() {
-		if($this->isAllowedPath($this->getRequestUri())) {
+		if ($this->isAllowedPath($this->getRequestUri())) {
 			return false;
 		}
 
@@ -108,8 +108,7 @@ 
 		$hostname = $this->getHostname();
 
 		return $allow_subdomains ?
-					(bool) preg_match('/(\.|^)'.$hostname.'$/', $currentHost) :
-					($currentHost == $hostname);
+					(bool) preg_match('/(\.|^)'.$hostname.'$/', $currentHost) : ($currentHost == $hostname);
 	}
 
 	/**
@@ -128,11 +127,11 @@ 
 	 * @return string
 	 */
 	public function getNativeURL($url) {
-		if($this->isPrimary()) {
+		if ($this->isPrimary()) {
 			throw new Exception("Cannot convert a native URL on the primary domain");
 		}
 
-		if($this->isAllowedPath($url) || $this->isForcedPath($url)) {
+		if ($this->isAllowedPath($url) || $this->isForcedPath($url)) {
 			return $url;
 		}
 
@@ -147,12 +146,12 @@ 
 	 * @return string
 	 */
 	public function getVanityURL($url) {
-		if($this->isPrimary() || $this->isAllowedPath($url)) {
+		if ($this->isPrimary() || $this->isAllowedPath($url)) {
 			return $url;
 		}
 
         $domainUrl = str_replace('/', '\/', $this->getURL());
-		return preg_replace('/^\/?' . $domainUrl . '\//', '', $url);
+		return preg_replace('/^\/?'.$domainUrl.'\//', '', $url);
 	}
 
 	/**
@@ -161,9 +160,9 @@ 
 	 * @return boolean
 	 */
 	public function hasURL($url) {
-		if($this->isForcedPath($url)) return true;
-		$domainBaseURL = trim($this->getURL(),'/');
-		if(preg_match('/^'.$domainBaseURL.'/', $url)) {
+		if ($this->isForcedPath($url)) return true;
+		$domainBaseURL = trim($this->getURL(), '/');
+		if (preg_match('/^'.$domainBaseURL.'/', $url)) {
 			return true;
 		}
 
@@ -249,13 +248,13 @@ 
 	 * @return boolean
 	 */
 	protected static function match_url($url, $patterns) {
-		if(!is_array($patterns)) return false;
+		if (!is_array($patterns)) return false;
 
 		$url = ltrim($url, '/');
-		if(substr($url, -1) !== '/') $url .= '/';
+		if (substr($url, -1) !== '/') $url .= '/';
 
-		foreach($patterns as $pattern) {
-			if(fnmatch($pattern, $url)) return true;
+		foreach ($patterns as $pattern) {
+			if (fnmatch($pattern, $url)) return true;
 		}
 
 		return false;

code/MultiDomain.php

Spacing +6 added lines, -6 removed lines

@@ -27,8 +27,8 @@ 
 	public static function domain_for_url($url) {
 		$url = trim($url, '/');
 
-		foreach(self::get_all_domains() as $domain) {
-			if($domain->hasURL($url)) {
+		foreach (self::get_all_domains() as $domain) {
+			if ($domain->hasURL($url)) {
 				return $domain;
 			}
 		}
@@ -43,10 +43,10 @@ 
 	 * @return array
 	 */
 	public static function get_all_domains($includePrimary = false) {
-		$domains = array ();
+		$domains = array();
 
-		foreach(self::config()->domains as $key => $config) {
-			if(!$includePrimary && $key === self::KEY_PRIMARY) continue;
+		foreach (self::config()->domains as $key => $config) {
+			if (!$includePrimary && $key === self::KEY_PRIMARY) continue;
 			$domains[] = MultiDomainDomain::create($key, $config);
 		}
 
@@ -67,7 +67,7 @@ 
 	 * @return MultiDomainDomain
 	 */
 	public static function get_domain($domain) {
-		if(isset(self::config()->domains[$domain])) {
+		if (isset(self::config()->domains[$domain])) {
 			return MultiDomainDomain::create(
 				$domain,
 				self::config()->domains[$domain]