silverstripe / cwp-core

code/CwpSolrConfigStore.php

Indentation +24 added lines, -24 removed lines

@@ -6,33 +6,33 @@
  * Uploads configuration to Solr via the PHP proxy CWP uses to filter requests
  */
 class CwpSolrConfigStore implements SolrConfigStore {
-       function __construct($config) {
-               $options = Solr::solr_options();
+	   function __construct($config) {
+			   $options = Solr::solr_options();
 
-               $this->url = implode('', array(
-                       'http://',
-                       isset($config['auth']) ? $config['auth'].'@' : '',
-                       $options['host'] . ':' . $options['port'],
-                       $config['path']
-               ));
-               $this->remote = $config['remotepath'];
-       }
+			   $this->url = implode('', array(
+					   'http://',
+					   isset($config['auth']) ? $config['auth'].'@' : '',
+					   $options['host'] . ':' . $options['port'],
+					   $config['path']
+			   ));
+			   $this->remote = $config['remotepath'];
+	   }
 
-       function uploadFile($index, $file) {
-               $this->uploadString($index, basename($file), file_get_contents($file));
-       }
+	   function uploadFile($index, $file) {
+			   $this->uploadString($index, basename($file), file_get_contents($file));
+	   }
 
-       function uploadString($index, $filename, $string) {
-               $targetDir = "{$this->url}/config/$index";
+	   function uploadString($index, $filename, $string) {
+			   $targetDir = "{$this->url}/config/$index";
 
-               file_get_contents($targetDir.'/'.$filename, false, stream_context_create(array('http' => array(
-                       'method' => 'POST',
-                       'header' => 'Content-type: application/octet-stream',
-                       'content' => (string)$string
-               ))));
-       }
+			   file_get_contents($targetDir.'/'.$filename, false, stream_context_create(array('http' => array(
+					   'method' => 'POST',
+					   'header' => 'Content-type: application/octet-stream',
+					   'content' => (string)$string
+			   ))));
+	   }
 
-       function instanceDir($index) {
-               return $this->remote ? "{$this->remote}/$index" : $index;
-       }
+	   function instanceDir($index) {
+			   return $this->remote ? "{$this->remote}/$index" : $index;
+	   }
 }

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
                $this->url = implode('', array(
                        'http://',
-                       isset($config['auth']) ? $config['auth'].'@' : '',
+                       isset($config['auth']) ? $config['auth'] . '@' : '',
                        $options['host'] . ':' . $options['port'],
                        $config['path']
                ));
@@ -25,7 +25,7 @@ 
        function uploadString($index, $filename, $string) {
                $targetDir = "{$this->url}/config/$index";
 
-               file_get_contents($targetDir.'/'.$filename, false, stream_context_create(array('http' => array(
+               file_get_contents($targetDir . '/' . $filename, false, stream_context_create(array('http' => array(
                        'method' => 'POST',
                        'header' => 'Content-type: application/octet-stream',
                        'content' => (string)$string

code/model/CwpSearchIndex.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
 
 	public function init() {
 		// Add optional boost
-		if(SiteTree::has_extension('CwpSearchBoostExtension')) {
+		if (SiteTree::has_extension('CwpSearchBoostExtension')) {
 			$this->setFieldBoosting('SiteTree_SearchBoost', SiteTree::config()->search_boost);
 		}
 	}
@@ -47,7 +47,7 @@ 
 
 		// Upload configured synonyms {@see SynonymsSiteConfig}
 		$siteConfig = SiteConfig::current_site_config();
-		if($siteConfig->SearchSynonyms) {
+		if ($siteConfig->SearchSynonyms) {
 			$store->uploadString(
 				$this->getIndexName(),
 				'synonyms.txt',
@@ -65,7 +65,7 @@ 
 
 	public function search(SearchQuery $query, $offset = -1, $limit = -1, $params = array()) {
 		// Override dictionary if given
-		if($dictionary = $this->config()->dictionary) {
+		if ($dictionary = $this->config()->dictionary) {
 			$params["spellcheck.dictionary"] = $dictionary;
 		}
 		

code/extensions/CwpSecurity.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 		// This step is necessary in cases such as automatic redirection where a user is authenticated
 		// upon landing on an SSL secured site and is automatically logged in, or some other case
 		// where the user has permissions to continue but is not given the option.
-		if($this->owner->getRequest()->requestVar('BackURL')
+		if ($this->owner->getRequest()->requestVar('BackURL')
 			&& !Session::get('Security.Message.message')
 			&& ($member = Member::currentUser())
 			&& $member->exists()

code/extensions/LoginAttemptNotifications.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 
 		// Exclude default admin.
 		$member = Member::currentUser();
-		if (!$member || !$member->ID) return;
+		if (!$member || !$member->ID) {
+			return;
+		}
 
 		$message = null;
 

code/extensions/RichLinksExtension.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		preg_match_all('/<a.*href="\[file_link,id=([0-9]+)\].*".*>.*<\/a>/U', $content, $matches);
 
 		// Attach the file type and size to each of the links.
-		for ($i = 0; $i < count($matches[0]); $i++){
+		for ($i = 0; $i < count($matches[0]); $i++) {
 			$file = DataObject::get_by_id('File', $matches[1][$i]);
 			if ($file) {
 				$size = $file->getSize();

code/extensions/CwpControllerExtension.php

Spacing +5 added lines, -5 removed lines

@@ -99,14 +99,14 @@ 
 
 			$relativeURL = Director::makeRelative(Director::absoluteURL($_SERVER['REQUEST_URI']));
 
-			foreach($allowed as $pattern) {
+			foreach ($allowed as $pattern) {
 				$allowWithoutAuth = $allowWithoutAuth || preg_match($pattern, $relativeURL);
 			}
 		}
 
 		// Finally if they weren't allowed to bypass Basic Auth, trigger it
 		if (!$allowWithoutAuth) {
-			$this->callWithSubsitesDisabled(function(){
+			$this->callWithSubsitesDisabled(function() {
 				BasicAuth::requireLogin(
 					_t('Cwp.LoginPrompt', "Please log in with your CMS credentials"), 
 					'ACCESS_UAT_SERVER', 
@@ -122,7 +122,7 @@ 
 
 		if (Config::inst()->get('CwpControllerExtension', 'ssl_redirection_enabled')) {
 			// redirect some vulnerable areas to the secure domain
-			if(!$director::is_https()) {
+			if (!$director::is_https()) {
 				$forceDomain = Config::inst()->get('CwpControllerExtension', 'ssl_redirection_force_domain');
 
 				if ($forceDomain) {
@@ -135,12 +135,12 @@ 
 
 		if (Config::inst()->get('CwpControllerExtension', 'test_basicauth_enabled')) {
 			// Turn on Basic Auth in testing mode
-			if($director::isTest()) $this->triggerBasicAuthProtection();
+			if ($director::isTest()) $this->triggerBasicAuthProtection();
 		}
 
 		if (Config::inst()->get('CwpControllerExtension', 'live_basicauth_enabled')) {
 			// Turn on Basic Auth in live mode
-			if($director::isLive()) $this->triggerBasicAuthProtection();
+			if ($director::isLive()) $this->triggerBasicAuthProtection();
 		}
 	}
 

Braces +21 added lines, -12 removed lines

@@ -43,15 +43,20 @@ 
 		$rv = null;
 
 		try {
-			if (class_exists('Subsite')) Subsite::disable_subsite_filter(true);
+			if (class_exists('Subsite')) {
+				Subsite::disable_subsite_filter(true);
+			}
 			$rv = call_user_func($callback);
-		}
-		catch (Exception $e) {
-			if (class_exists('Subsite')) Subsite::disable_subsite_filter(false);
+		} catch (Exception $e) {
+			if (class_exists('Subsite')) {
+				Subsite::disable_subsite_filter(false);
+			}
 			throw $e;
 		}
 
-		if (class_exists('Subsite')) Subsite::disable_subsite_filter(false);
+		if (class_exists('Subsite')) {
+			Subsite::disable_subsite_filter(false);
+		}
 		return $rv;
 	}
 
@@ -77,12 +82,12 @@ 
 		// First, see if we can get a member to act on, either from a changepassword token or the session
 		if (isset($_REQUEST['m']) && isset($_REQUEST['t'])) {
 			$member = Member::get()->filter('ID', (int)$_REQUEST['m'])->First();
-			if (!$member->validateAutoLoginToken($_REQUEST['t'])) $member = null;
-		}
-		else if (Session::get('AutoLoginHash')) {
+			if (!$member->validateAutoLoginToken($_REQUEST['t'])) {
+				$member = null;
+			}
+		} else if (Session::get('AutoLoginHash')) {
 			$member = Member::member_from_autologinhash(Session::get('AutoLoginHash'));
-		}
-		else {
+		} else {
 			$member = Member::currentUser();
 		}
 
@@ -135,12 +140,16 @@ 
 
 		if (Config::inst()->get('CwpControllerExtension', 'test_basicauth_enabled')) {
 			// Turn on Basic Auth in testing mode
-			if($director::isTest()) $this->triggerBasicAuthProtection();
+			if($director::isTest()) {
+				$this->triggerBasicAuthProtection();
+			}
 		}
 
 		if (Config::inst()->get('CwpControllerExtension', 'live_basicauth_enabled')) {
 			// Turn on Basic Auth in live mode
-			if($director::isLive()) $this->triggerBasicAuthProtection();
+			if($director::isLive()) {
+				$this->triggerBasicAuthProtection();
+			}
 		}
 	}
 

code/CwpSolr.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@ 
 	 * * 'local-4': this can be use for development using silverstripe-localsolr package, 4.x branch
 	 */
 	static function configure() {
-		if(!class_exists('Solr')) return;
+		if (!class_exists('Solr')) return;
 
 		// get options from configuration
 		$options = Config::inst()->get('CwpSolr', 'options');
 
 		// get version specific options
-		switch($options['version']) {
+		switch ($options['version']) {
 			case 'cwp-4':
 				$solrOptions = self::options_for_cwp($options);
 				break;
@@ -45,8 +45,8 @@ 
 		// CAUTION: CWP does not permit usage of customised solrconfig.xml.
 		if (isset($options['extraspath']) && file_exists($options['extraspath'])) {
 			$solrOptions['extraspath'] = $options['extraspath'];
-		} elseif (file_exists(BASE_PATH.'/mysite/conf/extras')) {
-			$solrOptions['extraspath'] = BASE_PATH.'/mysite/conf/extras';
+		} elseif (file_exists(BASE_PATH . '/mysite/conf/extras')) {
+			$solrOptions['extraspath'] = BASE_PATH . '/mysite/conf/extras';
 		}
 
 		Solr::configure_server($solrOptions);

Braces +3 added lines, -1 removed lines

@@ -18,7 +18,9 @@
 	 * * 'local-4': this can be use for development using silverstripe-localsolr package, 4.x branch
 	 */
 	static function configure() {
-		if(!class_exists('Solr')) return;
+		if(!class_exists('Solr')) {
+			return;
+		}
 
 		// get options from configuration
 		$options = Config::inst()->get('CwpSolr', 'options');

code/CwpInitialisationFilter.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 
 		if (Config::inst()->get('CwpInitialisationFilter', 'egress_proxy_default_enabled')) {
 
-			if(defined('SS_OUTBOUND_PROXY') && defined('SS_OUTBOUND_PROXY_PORT')) {
+			if (defined('SS_OUTBOUND_PROXY') && defined('SS_OUTBOUND_PROXY_PORT')) {
 				putenv('http_proxy=' . SS_OUTBOUND_PROXY . ':' . SS_OUTBOUND_PROXY_PORT);
 				putenv('https_proxy=' . SS_OUTBOUND_PROXY . ':' . SS_OUTBOUND_PROXY_PORT);
 			}

Braces +3 added lines, -1 removed lines

@@ -35,7 +35,9 @@
 
 		$noProxy = Config::inst()->get('CwpInitialisationFilter', 'egress_proxy_exclude_domains');
 		if (!empty($noProxy)) {
-			if (!is_array($noProxy)) $noProxy = array($noProxy);
+			if (!is_array($noProxy)) {
+				$noProxy = array($noProxy);
+			}
 
 			// Merge with exsiting if needed.
 			if (getenv('NO_PROXY')) {

code/CwpStatsReport.php

Spacing +2 added lines, -2 removed lines

@@ -38,7 +38,7 @@ 
 				'Versioned.stage' => 'Live'
 			);
 
-			if(class_exists('Translatable')) {
+			if (class_exists('Translatable')) {
 				$params[Translatable::QUERY_LOCALE_FILTER_ENABLED] = false;
 			}
 
@@ -55,7 +55,7 @@ 
 				->count()
 		);
 
-		if(class_exists('Subsite')) {
+		if (class_exists('Subsite')) {
 			// Main site.
 			$records[] = array(
 				'Name' => _t('CwpStatsReport.PagesForMainSite', '- in the main site'),