silverstripe / multi-domain

code/MultiDomainDomain.php

Spacing +16 added lines, -17 removed lines

@@ -50,10 +50,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);
 
@@ -81,7 +81,7 @@ 
 	 * @return boolean
 	 */
 	public function isActive() {		
-		if($this->isAllowedPath($_SERVER['REQUEST_URI'])) {
+		if ($this->isAllowedPath($_SERVER['REQUEST_URI'])) {
 			return false;
 		}
 
@@ -90,8 +90,7 @@ 
 		$hostname = $this->getHostname();
 
 		return $allow_subdomains ? 
-					preg_match('/(\.|^)'.$hostname.'$/', $current_host) : 
-					($current_host == $hostname);
+					preg_match('/(\.|^)'.$hostname.'$/', $current_host) : ($current_host == $hostname);
 	}
 
 	/**
@@ -110,11 +109,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;
 		}
 
@@ -129,7 +128,7 @@ 
 	 * @return string
 	 */
 	public function getVanityURL($url) {
-		if($this->isPrimary() || $this->isAllowedPath($url)) {
+		if ($this->isPrimary() || $this->isAllowedPath($url)) {
 			return $url;
 		}		
 		
@@ -142,9 +141,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;
 		}
 
@@ -176,13 +175,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;		

Braces +12 added lines, -4 removed lines

@@ -142,7 +142,9 @@ 
 	 * @return boolean
 	 */
 	public function hasURL($url) {
-		if($this->isForcedPath($url)) return true;
+		if($this->isForcedPath($url)) {
+			return true;
+		}
 		$domainBaseURL = trim($this->getURL(),'/');
 		if(preg_match('/^'.$domainBaseURL.'/', $url)) {
 			return true;
@@ -176,13 +178,19 @@ 
 	 * @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;
+			if(fnmatch($pattern, $url)) {
+				return true;
+			}
 		}
 
 		return false;		

code/MultiDomainRequestFilter.php

Spacing +4 added lines, -4 removed lines

@@ -18,17 +18,17 @@
 	 */
 	public function preRequest(SS_HTTPRequest $request, Session $session, DataModel $model) {				
 
-		if(Director::is_cli()) {
+		if (Director::is_cli()) {
 			return;
 		}
 		
 		// Not the best place for validation, but _config.php is too early.
-		if(!MultiDomain::get_primary_domain()) {
+		if (!MultiDomain::get_primary_domain()) {
 			throw new Exception('MultiDomain must define a "'.MultiDomain::KEY_PRIMARY.'" domain in the config, under "domains"');
 		}
 					
-		foreach(MultiDomain::get_all_domains() as $domain) {			
-			if(!$domain->isActive()) continue;
+		foreach (MultiDomain::get_all_domains() as $domain) {			
+			if (!$domain->isActive()) continue;
 			
 			$url = $this->createNativeURLForDomain($domain);
 			$parts = explode('?', $url);					

Braces +3 added lines, -1 removed lines

@@ -28,7 +28,9 @@
 		}
 					
 		foreach(MultiDomain::get_all_domains() as $domain) {			
-			if(!$domain->isActive()) continue;
+			if(!$domain->isActive()) {
+				continue;
+			}
 			
 			$url = $this->createNativeURLForDomain($domain);
 			$parts = explode('?', $url);					

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]

Braces +3 added lines, -1 removed lines

@@ -46,7 +46,9 @@
 		$domains = array ();
 		
 		foreach(self::config()->domains as $key => $config) {
-			if(!$includePrimary && $key === self::KEY_PRIMARY) continue;
+			if(!$includePrimary && $key === self::KEY_PRIMARY) {
+				continue;
+			}
 			$domains[] = MultiDomainDomain::create($key, $config);
 		}