gordonbanderson / silverstripe-comments

code/admin/CommentAdmin.php

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
 	 * @return Form
 	 */
 	public function getEditForm($id = null, $fields = null) {
-		if(!$id) $id = $this->currentPageID();
+		if(!$id) {
+			$id = $this->currentPageID();
+		}
 
 		$form = parent::getEditForm($id);
 		$record = $this->getRecord($id);

code/admin/CommentsGridFieldAction.php

Braces +3 added lines, -1 removed lines

@@ -37,7 +37,9 @@
 	 * {@inheritdoc}
 	 */
 	public function getColumnContent($gridField, $record, $columnName) {
-		if(!$record->canEdit()) return;
+		if(!$record->canEdit()) {
+			return;
+		}
 
 		$field = "";
 

code/controllers/CommentingController.php

Braces +33 added lines, -11 removed lines

@@ -218,11 +218,15 @@ 
 	 */
 	public function delete() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
+		if(!$comment) {
+			return $this->httpError(404);
+		}
 		if(!$comment->canDelete()) {
 			return Security::permissionFailure($this, 'You do not have permission to delete this comment');
 		}
-		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
+		if(!$comment->getSecurityToken()->checkRequest($this->request)) {
+			return $this->httpError(400);
+		}
 
 		$comment->delete();
 
@@ -236,11 +240,15 @@ 
 	 */
 	public function spam() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
+		if(!$comment) {
+			return $this->httpError(404);
+		}
 		if(!$comment->canEdit()) {
 			return Security::permissionFailure($this, 'You do not have permission to edit this comment');
 		}
-		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
+		if(!$comment->getSecurityToken()->checkRequest($this->request)) {
+			return $this->httpError(400);
+		}
 		
 		$comment->markSpam();
 
@@ -254,11 +262,15 @@ 
 	 */
 	public function ham() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
+		if(!$comment) {
+			return $this->httpError(404);
+		}
 		if(!$comment->canEdit()) {
 			return Security::permissionFailure($this, 'You do not have permission to edit this comment');
 		}
-		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
+		if(!$comment->getSecurityToken()->checkRequest($this->request)) {
+			return $this->httpError(400);
+		}
 
 		$comment->markApproved();
 
@@ -272,11 +284,15 @@ 
 	 */
 	public function approve() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
+		if(!$comment) {
+			return $this->httpError(404);
+		}
 		if(!$comment->canEdit()) {
 			return Security::permissionFailure($this, 'You do not have permission to approve this comment');
 		}
-		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
+		if(!$comment->getSecurityToken()->checkRequest($this->request)) {
+			return $this->httpError(400);
+		}
 
 		$comment->markApproved();
 
@@ -491,7 +507,9 @@ 
 		if(isset($data['ParentID']) && ($class = $this->getBaseClass())) {
 			$this->setOwnerRecord($class::get()->byID($data['ParentID']));
 		}
-		if(!$this->getOwnerRecord()) return $this->httpError(404);
+		if(!$this->getOwnerRecord()) {
+			return $this->httpError(404);
+		}
 		
 		// cache users data
 		Cookie::set("CommentsForm_UserData", Convert::raw2json($data));
@@ -606,8 +624,12 @@ 
 			}
 		}
 
-		if(!$url) $url = $this->fallbackReturnURL;
-		if(!$url) $url = Director::baseURL();
+		if(!$url) {
+			$url = $this->fallbackReturnURL;
+		}
+		if(!$url) {
+			$url = Director::baseURL();
+		}
 
 		// absolute redirection URLs not located on this site may cause phishing
 		if(Director::is_site_url($url)) {

code/Commenting.php

Braces +12 added lines, -4 removed lines

@@ -31,7 +31,9 @@ 
 		Config::inst()->update($class, 'extensions', array('CommentsExtension'));
 
 		// Check if settings must be customised
-		if($settings === false) return;
+		if($settings === false) {
+			return;
+		}
 		if(!is_array($settings)) {
 			throw new InvalidArgumentException('$settings needs to be an array or null');
 		}
@@ -76,7 +78,9 @@ 
 	 */
 	public static function set_config_value($class, $key, $value = false) {
 		Deprecation::notice('2.0', 'Commenting::set_config_value is deprecated. Use the config api instead');
-		if($class === "all") $class = 'CommentsExtension';
+		if($class === "all") {
+			$class = 'CommentsExtension';
+		}
 		Config::inst()->update($class, 'comments', array($key => $value));
 	}
 
@@ -120,7 +124,9 @@ 
 	 */
 	public static function config_value_equals($class, $key, $value) {
 		$check = self::get_config_value($class, $key);
-		if($check && ($check == $value)) return true;
+		if($check && ($check == $value)) {
+			return true;
+		}
 	}
 
 	/**
@@ -137,7 +143,9 @@ 
 
 		// Check permission
 		$permission = self::get_config_value($class, 'required_permission');
-		if($permission && !Permission::check($permission)) return false;
+		if($permission && !Permission::check($permission)) {
+			return false;
+		}
 
 		// Check login required
 		$requireLogin = self::get_config_value($class, 'require_login');

code/extensions/CommentsExtension.php

Braces +24 added lines, -8 removed lines

@@ -291,7 +291,9 @@ 
 	 */
 	public function getCommentsEnabled() {
 		// Don't display comments form for pseudo-pages (such as the login form)
-		if(!$this->owner->exists()) return false;
+		if(!$this->owner->exists()) {
+			return false;
+		}
 		
 		// Determine which flag should be used to determine if this is enabled
 		if($this->owner->getCommentsOption('enabled_cms')) {
@@ -341,19 +343,27 @@ 
 	 */
 	public function canPostComment($member = null) {
 		// Deny if not enabled for this object
-		if(!$this->owner->CommentsEnabled) return false;
+		if(!$this->owner->CommentsEnabled) {
+			return false;
+		}
 
 		// Check if member is required
 		$requireLogin = $this->owner->CommentsRequireLogin;
-		if(!$requireLogin) return true;
+		if(!$requireLogin) {
+			return true;
+		}
 
 		// Check member is logged in
 		$member = $member ?: Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			return false;
+		}
 
 		// If member required check permissions
 		$requiredPermission = $this->owner->PostingRequiredPermission;
-		if($requiredPermission && !Permission::checkMember($member, $requiredPermission)) return false;
+		if($requiredPermission && !Permission::checkMember($member, $requiredPermission)) {
+			return false;
+		}
 
 		return true;
 	}
@@ -367,7 +377,9 @@ 
 	 */
 	public function canModerateComments($member = null) {
 		// Deny if not enabled for this object
-		if(!$this->owner->CommentsEnabled) return false;
+		if(!$this->owner->CommentsEnabled) {
+			return false;
+		}
 
 		// Fallback to can-edit
 		return $this->owner->canEdit($member);
@@ -480,10 +492,14 @@ 
 			? $this->owner->config()->comments
 			: Config::inst()->get(__CLASS__, 'comments');
 		$value = null;
-		if(isset($settings[$key])) $value = $settings[$key];
+		if(isset($settings[$key])) {
+			$value = $settings[$key];
+		}
 
 		// To allow other extensions to customise this option
-		if($this->owner) $this->owner->extend('updateCommentsOption', $key, $value);
+		if($this->owner) {
+			$this->owner->extend('updateCommentsOption', $key, $value);
+		}
 		return $value;
 	}
 

code/model/CommentList.php

Braces +3 added lines, -1 removed lines

@@ -75,7 +75,9 @@
 		// Don't remove item with unrelated class key
 		$foreignClass = $this->getForeignClass();
 		$classNames = ClassInfo::subclassesFor($foreignClass);
-		if(!in_array($item->BaseClass, $classNames)) return;
+		if(!in_array($item->BaseClass, $classNames)) {
+			return;
+		}
 		
 		// Don't remove item which doesn't belong to this list
 		$foreignID = $this->getForeignID();

code/model/Comment.php

Braces +16 added lines, -7 removed lines

@@ -135,7 +135,9 @@ 
 					// set the variables which have changed
 					$comment->BaseClass = 'SiteTree';
 					$comment->URL = (isset($pageComment['CommenterURL'])) ? $pageComment['CommenterURL'] : '';
-					if((int) $pageComment['NeedsModeration'] == 0) $comment->Moderated = true;
+					if((int) $pageComment['NeedsModeration'] == 0) {
+						$comment->Moderated = true;
+					}
 
 					$comment->write();
 				}
@@ -206,8 +208,7 @@ 
 		if(!$record && $this->BaseClass) {
 			// Otherwise a singleton of that record
 			$record = singleton($this->BaseClass);
-		}
-		else if(!$record) {
+		} else if(!$record) {
 			// Otherwise just use the default options
 			$record = singleton('CommentsExtension');
 		}
@@ -405,8 +406,12 @@ 
 	 * @return string
 	 */
 	protected function actionLink($action, $member = null) {
-		if(!$member) $member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			$member = Member::currentUser();
+		}
+		if(!$member) {
+			return false;
+		}
 
 		$url = Controller::join_links(
 			Director::baseURL(),
@@ -855,7 +860,9 @@ 
 	 */
 	public function checkRequest($request) {
 		$member = Member::currentUser();
-		if(!$member) return false;
+		if(!$member) {
+			return false;
+		}
 
 		$salt = $request->getVar('s');
 		$memberSalt = $this->memberSalt($salt, $member);
@@ -876,7 +883,9 @@ 
 	protected function generate($length = null) {
 		$generator = new RandomGenerator();
 		$result = $generator->randomToken('sha256');
-		if($length !== null) return substr($result, 0, $length);
+		if($length !== null) {
+			return substr($result, 0, $length);
+		}
 		return $result;
 	}
 }