silverstripe / silverstripe-siteconfig

code/controller/SiteConfigLeftAndMain.php

Doc Comments +1 added lines, -1 removed lines

@@ -86,7 +86,7 @@
 	/**
 	 * Used for preview controls, mainly links which switch between different states of the page.
 	 *
-	 * @return ArrayData
+	 * @return HTMLText
 	 */
 	public function getSilverStripeNavigator() {
 		return $this->renderWith('CMSSettingsController_SilverStripeNavigator');

Spacing +3 added lines, -3 removed lines

@@ -69,14 +69,14 @@ 
 		$form->addExtraClass('cms-content center cms-edit-form');
 		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 
-		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		if ($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
 		$form->setHTMLID('Form_EditForm');
 		$form->loadDataFrom($siteConfig);
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
 
 		// Use <button> to allow full jQuery UI styling
 		$actions = $actions->dataFields();
-		if($actions) foreach($actions as $action) $action->setUseButtonTag(true);
+		if ($actions) foreach ($actions as $action) $action->setUseButtonTag(true);
 
 		$this->extend('updateEditForm', $form);
 
@@ -105,7 +105,7 @@ 
 		
 		try {
 			$siteConfig->write();
-		} catch(ValidationException $ex) {
+		} catch (ValidationException $ex) {
 			$form->sessionMessage($ex->getResult()->message(), 'bad');
 			return $this->getResponseNegotiator()->respond($this->request);
 		}

Braces +6 added lines, -2 removed lines

@@ -69,14 +69,18 @@
 		$form->addExtraClass('cms-content center cms-edit-form');
 		$form->setAttribute('data-pjax-fragment', 'CurrentForm');
 
-		if($form->Fields()->hasTabset()) $form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		if($form->Fields()->hasTabset()) {
+			$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
+		}
 		$form->setHTMLID('Form_EditForm');
 		$form->loadDataFrom($siteConfig);
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
 
 		// Use <button> to allow full jQuery UI styling
 		$actions = $actions->dataFields();
-		if($actions) foreach($actions as $action) $action->setUseButtonTag(true);
+		if($actions) {
+			foreach($actions as $action) $action->setUseButtonTag(true);
+		}
 
 		$this->extend('updateEditForm', $form);
 

code/model/SiteConfig.php

Spacing +29 added lines, -29 removed lines

@@ -73,7 +73,7 @@ 
 	public function getCMSFields() {
 		$groupsMap = array();
 
-		foreach(Group::get() as $group) {
+		foreach (Group::get() as $group) {
 			// Listboxfield values are escaped, use ASCII char instead of »
 			$groupsMap[$group->ID] = $group->getBreadcrumbs(' > ');
 		}
@@ -142,7 +142,7 @@ 
 			$fields->makeFieldReadonly($titleField);
 		}
 
-		if(file_exists(BASE_PATH . '/install.php')) {
+		if (file_exists(BASE_PATH . '/install.php')) {
 			$fields->addFieldToTab("Root.Main", new LiteralField("InstallWarningHeader", 
 				"<p class=\"message warning\">" . _t("SiteTree.REMOVE_INSTALL_WARNING", 
 				"Warning: You should remove install.php from this SilverStripe install for security reasons.")
@@ -165,10 +165,10 @@ 
 	 */
 	public function getAvailableThemes($baseDir = null) {
 		$themes = SSViewer::get_themes($baseDir);
-		$disabled = (array)$this->config()->disabled_themes;
+		$disabled = (array) $this->config()->disabled_themes;
 	
-		foreach($disabled as $theme) {
-			if(isset($themes[$theme])) unset($themes[$theme]);
+		foreach ($disabled as $theme) {
+			if (isset($themes[$theme])) unset($themes[$theme]);
 		}
 	
 		return $themes;
@@ -184,7 +184,7 @@ 
 	public function getCMSActions() {
 		if (Permission::check('ADMIN') || Permission::check('EDIT_SITECONFIG')) {
 			$actions = new FieldList(
-				FormAction::create('save_siteconfig', _t('CMSMain.SAVE','Save'))
+				FormAction::create('save_siteconfig', _t('CMSMain.SAVE', 'Save'))
 					->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept')
 			);
 		} else {
@@ -223,10 +223,10 @@ 
 
 		$config = DataObject::get_one('SiteConfig');
 		
-		if(!$config) {
+		if (!$config) {
 			self::make_site_config();
 
-			DB::alteration_message("Added default site config","created");
+			DB::alteration_message("Added default site config", "created");
 		}
 	}
 	
@@ -249,11 +249,11 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) $member = Member::currentUserID();
- 		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if (!$member) $member = Member::currentUserID();
+ 		if ($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
 
 		$extended = $this->extendedCan('canView', $member);
-		if($extended !== null) return $extended;
+		if ($extended !== null) return $extended;
 
 		// Assuming all that can edit this object can also view it
 		return $this->canEdit($member);
@@ -268,21 +268,21 @@ 
 	 * @return boolean
 	 */
 	public function canViewPages($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if (!$member) $member = Member::currentUserID();
+		if ($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
 
 		if ($member && Permission::checkMember($member, "ADMIN")) return true;
 
 		$extended = $this->extendedCan('canViewPages', $member);
-		if($extended !== null) return $extended;
+		if ($extended !== null) return $extended;
 
 		if (!$this->CanViewType || $this->CanViewType == 'Anyone') return true;
 
 		// check for any logged-in users
-		if($this->CanViewType === 'LoggedInUsers' && $member) return true;
+		if ($this->CanViewType === 'LoggedInUsers' && $member) return true;
 
 		// check for specific groups
-		if($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) return true;
+		if ($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) return true;
 
 		return false;
 	}
@@ -296,23 +296,23 @@ 
 	 * @return boolean
 	 */
 	public function canEditPages($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if (!$member) $member = Member::currentUserID();
+		if ($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
 
 		if ($member && Permission::checkMember($member, "ADMIN")) return true;
 
 		$extended = $this->extendedCan('canEditPages', $member);
-		if($extended !== null) return $extended;
+		if ($extended !== null) return $extended;
 
 		// check for any logged-in users with CMS access
-		if( $this->CanEditType === 'LoggedInUsers'
+		if ($this->CanEditType === 'LoggedInUsers'
 			&& Permission::checkMember($member, $this->config()->required_permission)
 		) {
 			return true;
 		}
 
 		// check for specific groups
-		if($this->CanEditType === 'OnlyTheseUsers' && $member && $member->inGroups($this->EditorGroups())) {
+		if ($this->CanEditType === 'OnlyTheseUsers' && $member && $member->inGroups($this->EditorGroups())) {
 			return true;
 		}
 
@@ -320,11 +320,11 @@ 
 	}
 
 	public function canEdit($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if (!$member) $member = Member::currentUserID();
+		if ($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
 
 		$extended = $this->extendedCan('canEdit', $member);
-		if($extended !== null) return $extended;
+		if ($extended !== null) return $extended;
 
 		return Permission::checkMember($member, "EDIT_SITECONFIG");
 	}
@@ -350,23 +350,23 @@ 
 	 * @return boolean
 	 */
 	public function canCreateTopLevel($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if (!$member) $member = Member::currentUserID();
+		if ($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
 
 		if ($member && Permission::checkMember($member, "ADMIN")) return true;
 
 		$extended = $this->extendedCan('canCreateTopLevel', $member);
-		if($extended !== null) return $extended;
+		if ($extended !== null) return $extended;
 
 		// check for any logged-in users with CMS permission
-		if( $this->CanCreateTopLevelType === 'LoggedInUsers'
+		if ($this->CanCreateTopLevelType === 'LoggedInUsers'
 			&& Permission::checkMember($member, $this->config()->required_permission)
 		) {
 			return true;
 		}
 
 		// check for specific groups
-		if( $this->CanCreateTopLevelType === 'OnlyTheseUsers'
+		if ($this->CanCreateTopLevelType === 'OnlyTheseUsers'
 			&& $member
 			&& $member->inGroups($this->CreateTopLevelGroups())
 		) {

Braces +69 added lines, -23 removed lines

@@ -168,7 +168,9 @@ 
 		$disabled = (array)$this->config()->disabled_themes;
 	
 		foreach($disabled as $theme) {
-			if(isset($themes[$theme])) unset($themes[$theme]);
+			if(isset($themes[$theme])) {
+				unset($themes[$theme]);
+			}
 		}
 	
 		return $themes;
@@ -210,7 +212,9 @@ 
 	 * @return SiteConfig
 	 */
 	public static function current_site_config() {
-		if ($siteConfig = DataObject::get_one('SiteConfig')) return $siteConfig;
+		if ($siteConfig = DataObject::get_one('SiteConfig')) {
+			return $siteConfig;
+		}
 		
 		return self::make_site_config();
 	}
@@ -249,11 +253,17 @@ 
 	 * @return boolean
 	 */
 	public function canView($member = null) {
-		if(!$member) $member = Member::currentUserID();
- 		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if(!$member) {
+			$member = Member::currentUserID();
+		}
+ 		if($member && is_numeric($member)) {
+ 			$member = DataObject::get_by_id('Member', $member);
+ 		}
 
 		$extended = $this->extendedCan('canView', $member);
-		if($extended !== null) return $extended;
+		if($extended !== null) {
+			return $extended;
+		}
 
 		// Assuming all that can edit this object can also view it
 		return $this->canEdit($member);
@@ -268,21 +278,35 @@ 
 	 * @return boolean
 	 */
 	public function canViewPages($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if(!$member) {
+			$member = Member::currentUserID();
+		}
+		if($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
 
-		if ($member && Permission::checkMember($member, "ADMIN")) return true;
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
 
 		$extended = $this->extendedCan('canViewPages', $member);
-		if($extended !== null) return $extended;
+		if($extended !== null) {
+			return $extended;
+		}
 
-		if (!$this->CanViewType || $this->CanViewType == 'Anyone') return true;
+		if (!$this->CanViewType || $this->CanViewType == 'Anyone') {
+			return true;
+		}
 
 		// check for any logged-in users
-		if($this->CanViewType === 'LoggedInUsers' && $member) return true;
+		if($this->CanViewType === 'LoggedInUsers' && $member) {
+			return true;
+		}
 
 		// check for specific groups
-		if($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) return true;
+		if($this->CanViewType === 'OnlyTheseUsers' && $member && $member->inGroups($this->ViewerGroups())) {
+			return true;
+		}
 
 		return false;
 	}
@@ -296,13 +320,21 @@ 
 	 * @return boolean
 	 */
 	public function canEditPages($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if(!$member) {
+			$member = Member::currentUserID();
+		}
+		if($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
 
-		if ($member && Permission::checkMember($member, "ADMIN")) return true;
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
 
 		$extended = $this->extendedCan('canEditPages', $member);
-		if($extended !== null) return $extended;
+		if($extended !== null) {
+			return $extended;
+		}
 
 		// check for any logged-in users with CMS access
 		if( $this->CanEditType === 'LoggedInUsers'
@@ -320,11 +352,17 @@ 
 	}
 
 	public function canEdit($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if(!$member) {
+			$member = Member::currentUserID();
+		}
+		if($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
 
 		$extended = $this->extendedCan('canEdit', $member);
-		if($extended !== null) return $extended;
+		if($extended !== null) {
+			return $extended;
+		}
 
 		return Permission::checkMember($member, "EDIT_SITECONFIG");
 	}
@@ -350,13 +388,21 @@ 
 	 * @return boolean
 	 */
 	public function canCreateTopLevel($member = null) {
-		if(!$member) $member = Member::currentUserID();
-		if($member && is_numeric($member)) $member = DataObject::get_by_id('Member', $member);
+		if(!$member) {
+			$member = Member::currentUserID();
+		}
+		if($member && is_numeric($member)) {
+			$member = DataObject::get_by_id('Member', $member);
+		}
 
-		if ($member && Permission::checkMember($member, "ADMIN")) return true;
+		if ($member && Permission::checkMember($member, "ADMIN")) {
+			return true;
+		}
 
 		$extended = $this->extendedCan('canCreateTopLevel', $member);
-		if($extended !== null) return $extended;
+		if($extended !== null) {
+			return $extended;
+		}
 
 		// check for any logged-in users with CMS permission
 		if( $this->CanCreateTopLevelType === 'LoggedInUsers'