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;
 		}
 
@@ -94,8 +94,7 @@ 
 		$hostname = $this->getHostname();
 
 		return $allow_subdomains ?
-					preg_match('/(\.|^)'.$hostname.'$/', $currentHost) :
-					($currentHost == $hostname);
+					preg_match('/(\.|^)'.$hostname.'$/', $currentHost) : ($currentHost == $hostname);
 	}
 
 	/**
@@ -114,11 +113,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;
 		}
 
@@ -133,7 +132,7 @@ 
 	 * @return string
 	 */
 	public function getVanityURL($url) {
-		if($this->isPrimary() || $this->isAllowedPath($url)) {
+		if ($this->isPrimary() || $this->isAllowedPath($url)) {
 			return $url;
 		}
 
@@ -146,9 +145,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;
 		}
 
@@ -180,13 +179,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;