gordonbanderson / silverstripe-comments

code/Commenting.php

Doc Comments +1 added lines, -1 removed lines

@@ -116,7 +116,7 @@
 	 * @param string $class
 	 * @param string $key
 	 * @param string $value Expected value
-	 * @return boolean
+	 * @return boolean|null
 	 */
 	public static function config_value_equals($class, $key, $value) {
 		$check = self::get_config_value($class, $key);

Spacing +8 added lines, -8 removed lines

@@ -31,8 +31,8 @@ 
 		Config::inst()->update($class, 'extensions', array('CommentsExtension'));
 
 		// Check if settings must be customised
-		if($settings === false) return;
-		if(!is_array($settings)) {
+		if ($settings === false) return;
+		if (!is_array($settings)) {
 			throw new InvalidArgumentException('$settings needs to be an array or null');
 		}
 		Config::inst()->update($class, 'comments', $settings);
@@ -76,7 +76,7 @@ 
 	 */
 	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));
 	}
 
@@ -99,9 +99,9 @@ 
 		);
 
 		// Get settings
-		if(!$class) {
+		if (!$class) {
 			$class = 'CommentsExtension';
-		} elseif(!$class::has_extension('CommentsExtension')) {
+		} elseif (!$class::has_extension('CommentsExtension')) {
 			throw new InvalidArgumentException("$class does not have commenting enabled");
 		}
 		return singleton($class)->getCommentsOption($key);
@@ -120,7 +120,7 @@ 
 	 */
 	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;
 	}
 
 	/**
@@ -132,12 +132,12 @@ 
 	 * @return boolean true
 	 */
 	public static function can_member_post($class) {
-		Deprecation::notice('2.0',  'Use $instance->canPostComment() directly instead');
+		Deprecation::notice('2.0', 'Use $instance->canPostComment() directly instead');
 		$member = Member::currentUser();
 
 		// 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');

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/admin/CommentsGridFieldBulkAction.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 	public function spam(SS_HTTPRequest $request) {
 		$ids = array();
 
-		foreach($this->getRecords() as $record) {
+		foreach ($this->getRecords() as $record) {
 			array_push($ids, $record->ID);
 			$record->markSpam();
 		}
@@ -47,7 +47,7 @@ 
 	public function approve(SS_HTTPRequest $request) {
 		$ids = array();
 
-		foreach($this->getRecords() as $record) {
+		foreach ($this->getRecords() as $record) {
 			array_push($ids, $record->ID);
 			$record->markApproved();
 		}

code/admin/CommentsGridField.php

Spacing +2 added lines, -2 removed lines

@@ -5,11 +5,11 @@
 	 * {@inheritdoc}
 	 */
 	protected function newRow($total, $index, $record, $attributes, $content) {
-		if(!isset($attributes['class'])) {
+		if (!isset($attributes['class'])) {
 			$attributes['class'] = '';
 		}
 
-		if($record->IsSpam) {
+		if ($record->IsSpam) {
 			$attributes['class'] .= ' spam';
 		}
 

code/admin/CommentAdmin.php

Spacing +3 added lines, -3 removed lines

@@ -37,12 +37,12 @@ 
 	 * @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);
 
-		if($record && !$record->canView()) {
+		if ($record && !$record->canView()) {
 			return Security::permissionFailure($this);
 		}
 
@@ -106,7 +106,7 @@ 
 		$form->addExtraClass('cms-edit-form');
 		$form->setTemplate($this->getTemplatesWithSuffix('_EditForm'));
 
-		if($form->Fields()->hasTabset()) {
+		if ($form->Fields()->hasTabset()) {
 			$form->Fields()->findOrMakeTab('Root')->setTemplate('CMSTabSet');
 			$form->addExtraClass('center ss-tabset cms-tabset ' . $this->BaseCSSClasses());
 		}

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

Spacing +7 added lines, -7 removed lines

@@ -5,7 +5,7 @@ 
 	 * {@inheritdoc}
 	 */
 	public function augmentColumns($gridField, &$columns) {
-		if(!in_array('Actions', $columns)) {
+		if (!in_array('Actions', $columns)) {
 			$columns[] = 'Actions';
 		}
 	}
@@ -21,7 +21,7 @@ 
 	 * {@inheritdoc}
 	 */
 	public function getColumnMetadata($gridField, $columnName) {
-		if($columnName == 'Actions') {
+		if ($columnName == 'Actions') {
 			return array('title' => '');
 		}
 	}
@@ -37,11 +37,11 @@ 
 	 * {@inheritdoc}
 	 */
 	public function getColumnContent($gridField, $record, $columnName) {
-		if(!$record->canEdit()) return;
+		if (!$record->canEdit()) return;
 
 		$field = "";
 
-		if(!$record->IsSpam || !$record->Moderated) {
+		if (!$record->IsSpam || !$record->Moderated) {
 			$field .= GridField_FormAction::create(
 				$gridField,
 				'CustomAction' . $record->ID . 'Spam',
@@ -51,7 +51,7 @@ 
 			)->Field();
 		}
 
-		if($record->IsSpam || !$record->Moderated) {
+		if ($record->IsSpam || !$record->Moderated) {
 			$field .= GridField_FormAction::create(
 				$gridField,
 				'CustomAction' . $record->ID . 'Approve',
@@ -75,7 +75,7 @@ 
 	 * {@inheritdoc}
 	 */
 	public function handleAction(GridField $gridField, $actionName, $arguments, $data) {
-		if($actionName == 'spam') {
+		if ($actionName == 'spam') {
 			$comment = Comment::get()->byID($arguments["RecordID"]);
 			$comment->markSpam();
 
@@ -86,7 +86,7 @@ 
 			);
 		}
 
-		if($actionName == 'approve') {
+		if ($actionName == 'approve') {
 			$comment = Comment::get()->byID($arguments["RecordID"]);
 			$comment->markApproved();
 

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)) {

Doc Comments +2 added lines, -1 removed lines

@@ -120,7 +120,7 @@ 
 	 * Get the commenting option for the current state
 	 *
 	 * @param string $key
-	 * @return mixed Result if the setting is available, or null otherwise
+	 * @return integer Result if the setting is available, or null otherwise
 	 */
 	public function getOption($key) {
 		// If possible use the current record
@@ -280,6 +280,7 @@ 
      * Redirect back to referer if available, ensuring that only site URLs
      * are allowed to avoid phishing.  If it's an AJAX request render the
      * comment in it's new state
+     * @param DataObject $comment
      */
     private function renderChangedCommentState($comment) {
         $referer = $this->request->getHeader('Referer');

Indentation +30 added lines, -30 removed lines

@@ -243,7 +243,7 @@ 
 		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
 
 		$comment->markSpam();
-        return $this->renderChangedCommentState($comment);
+		return $this->renderChangedCommentState($comment);
 	}
 
 	/**
@@ -258,7 +258,7 @@ 
 		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
 
 		$comment->markApproved();
-        return $this->renderChangedCommentState($comment);
+		return $this->renderChangedCommentState($comment);
 	}
 
 	/**
@@ -273,36 +273,36 @@ 
 		if(!$comment->getSecurityToken()->checkRequest($this->request)) return $this->httpError(400);
 
 		$comment->markApproved();
-        return $this->renderChangedCommentState($comment);
+		return $this->renderChangedCommentState($comment);
 	}
 
-    /**
-     * Redirect back to referer if available, ensuring that only site URLs
-     * are allowed to avoid phishing.  If it's an AJAX request render the
-     * comment in it's new state
-     */
-    private function renderChangedCommentState($comment) {
-        $referer = $this->request->getHeader('Referer');
-
-        // Render comment using AJAX
-        if ($this->request->isAjax()) {
-            return $comment->renderWith('CommentsInterface_singlecomment');
-        } else {
-            // Redirect to either the comment or start of the page
-            if (empty($referer)) {
-                return $this->redirectBack();
-            } else {
-                // Redirect to the comment, but check for phishing
-                $url = $referer . '#comment-' . $comment->ID;
-                // absolute redirection URLs not located on this site may cause phishing
-                if(Director::is_site_url($url)) {
-                    return $this->redirect($url);
-                } else {
-                    return false;
-                }
-            }
-        }
-    }
+	/**
+	 * Redirect back to referer if available, ensuring that only site URLs
+	 * are allowed to avoid phishing.  If it's an AJAX request render the
+	 * comment in it's new state
+	 */
+	private function renderChangedCommentState($comment) {
+		$referer = $this->request->getHeader('Referer');
+
+		// Render comment using AJAX
+		if ($this->request->isAjax()) {
+			return $comment->renderWith('CommentsInterface_singlecomment');
+		} else {
+			// Redirect to either the comment or start of the page
+			if (empty($referer)) {
+				return $this->redirectBack();
+			} else {
+				// Redirect to the comment, but check for phishing
+				$url = $referer . '#comment-' . $comment->ID;
+				// absolute redirection URLs not located on this site may cause phishing
+				if(Director::is_site_url($url)) {
+					return $this->redirect($url);
+				} else {
+					return false;
+				}
+			}
+		}
+	}
 
 	/**
 	 * Returns the comment referenced in the URL (by ID). Permission checking

Spacing +50 added lines, -50 removed lines

@@ -124,12 +124,12 @@ 
 	 */
 	public function getOption($key) {
 		// If possible use the current record
-		if($record = $this->getOwnerRecord()) {
+		if ($record = $this->getOwnerRecord()) {
 			return $record->getCommentsOption($key);
 		}
 
 		// Otherwise a singleton of that record
-		if($class = $this->getBaseClass()) {
+		if ($class = $this->getBaseClass()) {
 			return singleton($class)->getCommentsOption($key);
 		}
 
@@ -143,7 +143,7 @@ 
 	 * @return string
 	 */
 	public function Link($action = '', $id = '', $other = '') {
-		return Controller::join_links(Director::baseURL(), __CLASS__ , $action, $id, $other);
+		return Controller::join_links(Director::baseURL(), __CLASS__, $action, $id, $other);
 	}
 
 	/**
@@ -173,7 +173,7 @@ 
 		$id = $request->param('OtherID');
 
 		// Support old pageid param
-		if(!$id && !$class && ($id = $request->getVar('pageid'))) {
+		if (!$id && !$class && ($id = $request->getVar('pageid'))) {
 			$class = 'SiteTree';
 		}
 
@@ -183,8 +183,8 @@ 
 		));
 
 		// Check if class filter
-		if($class) {
-			if(!is_subclass_of($class, 'DataObject') || !$class::has_extension('CommentsExtension')) {
+		if ($class) {
+			if (!is_subclass_of($class, 'DataObject') || !$class::has_extension('CommentsExtension')) {
 				return $this->httpError(404);
 			}
 			$this->setBaseClass($class);
@@ -192,7 +192,7 @@ 
 			$link = Controller::join_links($link, $class);
 
 			// Check if id filter
-			if($id) {
+			if ($id) {
 				$comments = $comments->filter('ParentID', $id);
 				$link = Controller::join_links($link, $id);
 				$this->setOwnerRecord(DataObject::get_by_id($class, $id));
@@ -218,11 +218,11 @@ 
 	 */
 	public function delete() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
-		if(!$comment->canDelete()) {
+		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 +236,11 @@ 
 	 */
 	public function spam() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
-		if(!$comment->canEdit()) {
+		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();
         return $this->renderChangedCommentState($comment);
@@ -251,11 +251,11 @@ 
 	 */
 	public function ham() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
-		if(!$comment->canEdit()) {
+		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();
         return $this->renderChangedCommentState($comment);
@@ -266,11 +266,11 @@ 
 	 */
 	public function approve() {
 		$comment = $this->getComment();
-		if(!$comment) return $this->httpError(404);
-		if(!$comment->canEdit()) {
+		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();
         return $this->renderChangedCommentState($comment);
@@ -295,7 +295,7 @@ 
                 // Redirect to the comment, but check for phishing
                 $url = $referer . '#comment-' . $comment->ID;
                 // absolute redirection URLs not located on this site may cause phishing
-                if(Director::is_site_url($url)) {
+                if (Director::is_site_url($url)) {
                     return $this->redirect($url);
                 } else {
                     return false;
@@ -313,10 +313,10 @@ 
 	public function getComment() {
 		$id = isset($this->urlParams['ID']) ? $this->urlParams['ID'] : false;
 
-		if($id) {
+		if ($id) {
 			$comment = DataObject::get_by_id('Comment', $id);
 
-			if($comment) {
+			if ($comment) {
 				$this->fallbackReturnURL = $comment->Link();
 				return $comment;
 			}
@@ -333,7 +333,7 @@ 
 	public function ReplyForm($comment) {
 		// Enables multiple forms with different names to use the same handler
 		$form = $this->CommentsForm();
-		$form->setName('ReplyForm_'.$comment->ID);
+		$form->setName('ReplyForm_' . $comment->ID);
 		$form->addExtraClass('reply-form');
 
 		// Load parent into reply form
@@ -357,9 +357,9 @@ 
 	 */
 	public function reply(SS_HTTPRequest $request) {
 		// Extract parent comment from reply and build this way
-		if($parentID = $request->param('ParentCommentID')) {
+		if ($parentID = $request->param('ParentCommentID')) {
 			$comment = DataObject::get_by_id('Comment', $parentID, true);
-			if($comment) {
+			if ($comment) {
 				return $this->ReplyForm($comment);
 			}
 		}
@@ -415,7 +415,7 @@ 
 
 		// Preview formatted comment. Makes most sense when shortcodes or
 		// limited HTML is allowed. Populated by JS/Ajax.
-		if($usePreview) {
+		if ($usePreview) {
 			$fields->insertAfter(
 				ReadonlyField::create('PreviewComment', _t('CommentInterface.PREVIEWLABEL', 'Preview'))
 					->setAttribute('style', 'display: none'), // enable through JS
@@ -429,7 +429,7 @@ 
 		$actions = new FieldList(
 			new FormAction("doPostComment", _t('CommentInterface.POST', 'Post'))
 		);
-		if($usePreview) {
+		if ($usePreview) {
 			$actions->push(
 				FormAction::create('doPreviewComment', _t('CommentInterface.PREVIEW', 'Preview'))
 					->addExtraClass('action-minor')
@@ -444,11 +444,11 @@ 
 		$form = new Form($this, 'CommentsForm', $fields, $actions, $required);
 
 		// if the record exists load the extra required data
-		if($record = $this->getOwnerRecord()) {
+		if ($record = $this->getOwnerRecord()) {
 
 			// Load member data
 			$member = Member::currentUser();
-			if(($record->CommentsRequireLogin || $record->PostingRequiredPermission) && $member) {
+			if (($record->CommentsRequireLogin || $record->PostingRequiredPermission) && $member) {
 				$fields = $form->Fields();
 
 				$fields->removeByName('Name');
@@ -471,7 +471,7 @@ 
 		$form->setRedirectToFormOnValidationError(true);
 
 		// load any data from the cookies
-		if($data = Cookie::get('CommentsForm_UserData')) {
+		if ($data = Cookie::get('CommentsForm_UserData')) {
 			$data = Convert::json2array($data);
 
 			$form->loadDataFrom(array(
@@ -481,12 +481,12 @@ 
 			));
 			// allow previous value to fill if comment not stored in cookie (i.e. validation error)
 			$prevComment = Cookie::get('CommentsForm_Comment');
-			if($prevComment && $prevComment != ''){
+			if ($prevComment && $prevComment != '') {
 				$form->loadDataFrom(array("Comment" => $prevComment));
 			}
 		}
 
-		if(!empty($member)) {
+		if (!empty($member)) {
 			$form->loadDataFrom($member);
 		}
 
@@ -504,13 +504,13 @@ 
 	 */
 	public function doPostComment($data, $form) {
 		// Load class and parent from data
-		if(isset($data['BaseClass'])) {
+		if (isset($data['BaseClass'])) {
 			$this->setBaseClass($data['BaseClass']);
 		}
-		if(isset($data['ParentID']) && ($class = $this->getBaseClass())) {
+		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));
@@ -520,7 +520,7 @@ 
 		$this->extend('onBeforePostComment', $form);
 
 		// If commenting can only be done by logged in users, make sure the user is logged in
-		if(!$this->getOwnerRecord()->canPostComment()) {
+		if (!$this->getOwnerRecord()->canPostComment()) {
 			return Security::permissionFailure(
 				$this,
 				_t(
@@ -531,12 +531,12 @@ 
 			);
 		}
 
-		if($member = Member::currentUser()) {
+		if ($member = Member::currentUser()) {
 			$form->Fields()->push(new HiddenField("AuthorID", "Author ID", $member->ID));
 		}
 
 		// What kind of moderation is required?
-		switch($this->getOwnerRecord()->ModerationRequired) {
+		switch ($this->getOwnerRecord()->ModerationRequired) {
 			case 'Required':
 				$requireModeration = true;
 				break;
@@ -558,7 +558,7 @@ 
 		// Save into DB, or call pre-save hooks to give accurate preview
 		$usePreview = $this->getOption('use_preview');
 		$isPreview = $usePreview && !empty($data['IsPreview']);
-		if($isPreview) {
+		if ($isPreview) {
 			$comment->extend('onBeforeWrite');
 		} else {
 			$comment->write();
@@ -576,19 +576,19 @@ 
 		Cookie::set('CommentsForm_Comment', false);
 
 		// Find parent link
-		if(!empty($data['ReturnURL'])) {
+		if (!empty($data['ReturnURL'])) {
 			$url = $data['ReturnURL'];
-		} elseif($parent = $comment->getParent()) {
+		} elseif ($parent = $comment->getParent()) {
 			$url = $parent->Link();
 		} else {
 			return $this->redirectBack();
 		}
 
 		// Given a redirect page exists, attempt to link to the correct anchor
-		if($comment->IsSpam) {
+		if ($comment->IsSpam) {
 			// Link to the form with the error message contained
 			$hash = $form->FormName();
-		} else if(!$comment->Moderated) {
+		} else if (!$comment->Moderated) {
 			// Display the "awaiting moderation" text
 			$holder = $this->getOption('comments_holder_id');
 			$hash = "{$holder}_PostCommentForm_error";
@@ -615,21 +615,21 @@ 
 		// In edge-cases, this will be called outside of a handleRequest() context; in that case,
 		// redirect to the homepage - don't break into the global state at this stage because we'll
 		// be calling from a test context or something else where the global state is inappropraite
-		if($this->request) {
-			if($this->request->requestVar('BackURL')) {
+		if ($this->request) {
+			if ($this->request->requestVar('BackURL')) {
 				$url = $this->request->requestVar('BackURL');
-			} else if($this->request->isAjax() && $this->request->getHeader('X-Backurl')) {
+			} else if ($this->request->isAjax() && $this->request->getHeader('X-Backurl')) {
 				$url = $this->request->getHeader('X-Backurl');
-			} else if($this->request->getHeader('Referer')) {
+			} else if ($this->request->getHeader('Referer')) {
 				$url = $this->request->getHeader('Referer');
 			}
 		}
 
-		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)) {
+		if (Director::is_site_url($url)) {
 			return $this->redirect($url);
 		} else {
 			return false;

code/extensions/CommentsExtension.php

Spacing +31 added lines, -31 removed lines

@@ -82,25 +82,25 @@ 
 		$defaults = $this->owner->config()->defaults;
 		
 		// Set if comments should be enabled by default
-		if(isset($defaults['ProvideComments'])) {
+		if (isset($defaults['ProvideComments'])) {
 			$this->owner->ProvideComments = $defaults['ProvideComments'];
 		} else {
 			$this->owner->ProvideComments = $this->owner->getCommentsOption('enabled') ? 1 : 0;
 		}
 
 		// If moderation options should be configurable via the CMS then
-		if(isset($defaults['ModerationRequired'])) {
+		if (isset($defaults['ModerationRequired'])) {
 			$this->owner->ModerationRequired = $defaults['ModerationRequired'];
-		} elseif($this->owner->getCommentsOption('require_moderation')) {
+		} elseif ($this->owner->getCommentsOption('require_moderation')) {
 			$this->owner->ModerationRequired = 'Required';
-		} elseif($this->owner->getCommentsOption('require_moderation_nonmembers')) {
+		} elseif ($this->owner->getCommentsOption('require_moderation_nonmembers')) {
 			$this->owner->ModerationRequired = 'NonMembersOnly';
 		} else {
 			$this->owner->ModerationRequired = 'None';
 		}
 
 		// Set login required
-		if(isset($defaults['CommentsRequireLogin'])) {
+		if (isset($defaults['CommentsRequireLogin'])) {
 			$this->owner->CommentsRequireLogin = $defaults['CommentsRequireLogin'];
 		} else {
 			$this->owner->CommentsRequireLogin = $this->owner->getCommentsOption('require_login') ? 1 : 0;
@@ -122,12 +122,12 @@ 
 		$options = FieldGroup::create()->setTitle(_t('CommentsExtension.COMMENTOPTIONS', 'Comments'));
 
 		// Check if enabled setting should be cms configurable
-		if($this->owner->getCommentsOption('enabled_cms')) {
+		if ($this->owner->getCommentsOption('enabled_cms')) {
 			$options->push(new CheckboxField('ProvideComments', _t('Comment.ALLOWCOMMENTS', 'Allow Comments')));
 		}
 
 		// Check if we should require users to login to comment
-		if($this->owner->getCommentsOption('require_login_cms')) {
+		if ($this->owner->getCommentsOption('require_login_cms')) {
 			$options->push(
 				new CheckboxField(
 					'CommentsRequireLogin',
@@ -136,8 +136,8 @@ 
 			);
 		}
 
-		if($options->FieldList()->count()) {
-			if($fields->hasTabSet()) {
+		if ($options->FieldList()->count()) {
+			if ($fields->hasTabSet()) {
 				$fields->addFieldsToTab('Root.Settings', $options);
 			} else {
 				$fields->push($options);
@@ -145,7 +145,7 @@ 
 		}
 
 		// Check if moderation should be enabled via cms configurable
-		if($this->owner->getCommentsOption('require_moderation_cms')) {
+		if ($this->owner->getCommentsOption('require_moderation_cms')) {
 			$moderationField = new DropdownField('ModerationRequired', 'Comment Moderation', array(
 				'None' => _t('CommentsExtension.MODERATIONREQUIRED_NONE', 'No moderation required'),
 				'Required' => _t('CommentsExtension.MODERATIONREQUIRED_REQUIRED', 'Moderate all comments'),
@@ -154,7 +154,7 @@ 
 					'Only moderate non-members'
 				),
 			));
-			if($fields->hasTabSet()) {
+			if ($fields->hasTabSet()) {
 				$fields->addFieldsToTab('Root.Settings', $moderationField);
 			} else {
 				$fields->push($moderationField);
@@ -172,11 +172,11 @@ 
 	 * @return string
 	 */
 	public function getModerationRequired() {
-		if($this->owner->getCommentsOption('require_moderation_cms')) {
+		if ($this->owner->getCommentsOption('require_moderation_cms')) {
 			return $this->owner->getField('ModerationRequired');
-		} elseif($this->owner->getCommentsOption('require_moderation')) {
+		} elseif ($this->owner->getCommentsOption('require_moderation')) {
 			return 'Required';
-		} elseif($this->owner->getCommentsOption('require_moderation_nonmembers')) {
+		} elseif ($this->owner->getCommentsOption('require_moderation_nonmembers')) {
 			return 'NonMembersOnly';
 		} else {
 			return 'None';
@@ -189,7 +189,7 @@ 
 	 * @return boolean
 	 */
 	public function getCommentsRequireLogin() {
-		if($this->owner->getCommentsOption('require_login_cms')) {
+		if ($this->owner->getCommentsOption('require_login_cms')) {
 			return (bool) $this->owner->getField('CommentsRequireLogin');
 		} else {
 			return (bool) $this->owner->getCommentsOption('require_login');
@@ -221,14 +221,14 @@ 
 
 		// Filter spam comments for non-administrators if configured
 		$showSpam = $this->owner->getCommentsOption('frontend_spam') && $this->owner->canModerateComments();
-		if(!$showSpam) {
+		if (!$showSpam) {
 			$list = $list->filter('IsSpam', 0);
 		}
 
 		// Filter un-moderated comments for non-administrators if moderation is enabled
 		$showUnmoderated = ($this->owner->ModerationRequired === 'None')
 			|| ($this->owner->getCommentsOption('frontend_moderation') && $this->owner->canModerateComments());
-		if(!$showUnmoderated) {
+		if (!$showUnmoderated) {
 			$list = $list->filter('Moderated', 1);
 		}
 
@@ -245,7 +245,7 @@ 
 		$list = $this->AllVisibleComments();
 
 		// If nesting comments, only show root level
-		if($this->owner->getCommentsOption('nested_comments')) {
+		if ($this->owner->getCommentsOption('nested_comments')) {
 			$list = $list->filter('ParentCommentID', 0);
 		}
 
@@ -291,10 +291,10 @@ 
 	 */
 	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')) {
+		if ($this->owner->getCommentsOption('enabled_cms')) {
 			return $this->owner->ProvideComments;
 		} else {
 			return $this->owner->getCommentsOption('enabled');
@@ -341,19 +341,19 @@ 
 	 */
 	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 +367,7 @@ 
 	 */
 	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);
@@ -417,7 +417,7 @@ 
 	public function CommentsForm() {
 		// Check if enabled
 		$enabled = $this->getCommentsEnabled();
-		if($enabled && $this->owner->getCommentsOption('include_js')) {
+		if ($enabled && $this->owner->getCommentsOption('include_js')) {
 			Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
 			Requirements::javascript(THIRDPARTY_DIR . '/jquery-entwine/dist/jquery.entwine-dist.js');
 			Requirements::javascript(THIRDPARTY_DIR . '/jquery-validate/lib/jquery.form.js');
@@ -480,10 +480,10 @@ 
 			? $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;
 	}
 
@@ -526,7 +526,7 @@ 
 		$approvedCount = '(' . count($approvedComments) . ')';
 		$spamCount = '(' . count($spamComments) . ')';
 
-		if($fields->hasTabSet()) {
+		if ($fields->hasTabSet()) {
 			$tabs = new TabSet(
 				'Comments',
 				new Tab('CommentsNewCommentsTab', _t('CommentAdmin.NewComments', 'New') . ' ' . $newCount,
@@ -549,12 +549,12 @@ 
 
 	public function updateCMSFields(FieldList $fields) {
 		// Disable moderation if not permitted
-		if($this->owner->canModerateComments()) {
+		if ($this->owner->canModerateComments()) {
 			$this->updateModerationFields($fields);
 		}
 
 		// If this isn't a page we should merge the settings into the CMS fields
-		if(!$this->attachedToSiteTree()) {
+		if (!$this->attachedToSiteTree()) {
 			$this->updateSettingsFields($fields);
 		}
 	}

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/Comment.php

Spacing +48 added lines, -48 removed lines

@@ -93,7 +93,7 @@ 
 		parent::onBeforeWrite();
 
 		// Sanitize HTML, because its expected to be passed to the template unescaped later
-		if($this->AllowHtml) {
+		if ($this->AllowHtml) {
 			$this->Comment = $this->purifyHtml($this->Comment);
 		}
 
@@ -105,7 +105,7 @@ 
 		parent::onBeforeDelete();
 
 		// Delete all children
-		foreach($this->ChildComments() as $comment) {
+		foreach ($this->ChildComments() as $comment) {
 			$comment->delete();
 		}
 	}
@@ -123,11 +123,11 @@ 
 	public function requireDefaultRecords() {
 		parent::requireDefaultRecords();
 
-		if(DB::getConn()->hasTable('PageComment')) {
+		if (DB::getConn()->hasTable('PageComment')) {
 			$comments = DB::query('SELECT * FROM "PageComment"');
 
-			if($comments) {
-				while($pageComment = $comments->nextRecord()) {
+			if ($comments) {
+				while ($pageComment = $comments->nextRecord()) {
 					// create a new comment from the older page comment
 					$comment = new Comment();
 					$comment->update($pageComment);
@@ -135,7 +135,7 @@ 
 					// 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();
 				}
@@ -154,7 +154,7 @@ 
 	 * @return string link to this comment.
 	 */
 	public function Link($action = '') {
-		if($parent = $this->getParent()) {
+		if ($parent = $this->getParent()) {
 			return $parent->Link($action) . '#' . $this->Permalink();
 		}
 	}
@@ -203,11 +203,11 @@ 
 		// If possible use the current record
 		$record = $this->getParent();
 		
-		if(!$record && $this->BaseClass) {
+		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');
 		}
@@ -233,7 +233,7 @@ 
 	 * @return string
 	 */
 	public function getParentTitle() {
-		if($parent = $this->getParent()) {
+		if ($parent = $this->getParent()) {
 			return $parent->Title ?: ($parent->ClassName . ' #' . $parent->ID);
 		}
 	}
@@ -249,7 +249,7 @@ 
 
 	public function castingHelper($field) {
 		// Safely escape the comment
-		if($field === 'EscapedComment') {
+		if ($field === 'EscapedComment') {
 			return $this->AllowHtml ? 'HTMLText' : 'Text';
 		}
 		return parent::castingHelper($field);
@@ -296,15 +296,15 @@ 
 		$member = $this->getMember($member);
 
 		$extended = $this->extendedCan('canView', $member);
-		if($extended !== null) {
+		if ($extended !== null) {
 			return $extended;
 		}
 
-		if(Permission::checkMember($member, 'CMS_ACCESS_CommentAdmin')) {
+		if (Permission::checkMember($member, 'CMS_ACCESS_CommentAdmin')) {
 			return true;
 		}
 
-		if($parent = $this->getParent()) {
+		if ($parent = $this->getParent()) {
 			return $parent->canView($member)
 				&& $parent->has_extension('CommentsExtension')
 				&& $parent->CommentsEnabled;
@@ -323,20 +323,20 @@ 
 	public function canEdit($member = null) {
 		$member = $this->getMember($member);
 
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
 		$extended = $this->extendedCan('canEdit', $member);
-		if($extended !== null) {
+		if ($extended !== null) {
 			return $extended;
 		}
 
-		if(Permission::checkMember($member, 'CMS_ACCESS_CommentAdmin')) {
+		if (Permission::checkMember($member, 'CMS_ACCESS_CommentAdmin')) {
 			return true;
 		}
 
-		if($parent = $this->getParent()) {
+		if ($parent = $this->getParent()) {
 			return $parent->canEdit($member);
 		}
 
@@ -353,12 +353,12 @@ 
 	public function canDelete($member = null) {
 		$member = $this->getMember($member);
 
-		if(!$member) {
+		if (!$member) {
 			return false;
 		}
 
 		$extended = $this->extendedCan('canDelete', $member);
-		if($extended !== null) {
+		if ($extended !== null) {
 			return $extended;
 		}
 
@@ -372,11 +372,11 @@ 
 	 * @return Member|null
 	 */
 	protected function getMember($member = null) {
-		if(!$member) {
+		if (!$member) {
 			$member = Member::currentUser();
 		}
 
-		if(is_numeric($member)) {
+		if (is_numeric($member)) {
 			$member = DataObject::get_by_id('Member', $member, true);
 		}
 
@@ -389,9 +389,9 @@ 
 	 * @return string
 	 */
 	public function getAuthorName() {
-		if($this->Name) {
+		if ($this->Name) {
 			return $this->Name;
-		} else if($author = $this->Author()) {
+		} else if ($author = $this->Author()) {
 			return $author->getName();
 		}
 	}
@@ -405,8 +405,8 @@ 
 	 * @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(),
@@ -428,7 +428,7 @@ 
 	 * @return string
 	 */
 	public function DeleteLink($member = null) {
-		if($this->canDelete($member)) {
+		if ($this->canDelete($member)) {
 			return $this->actionLink('delete', $member);
 		}
 	}
@@ -441,7 +441,7 @@ 
 	 * @return string
 	 */
 	public function SpamLink($member = null) {
-		if($this->canEdit($member) && !$this->IsSpam) {
+		if ($this->canEdit($member) && !$this->IsSpam) {
 			return $this->actionLink('spam', $member);
 		}
 	}
@@ -454,7 +454,7 @@ 
 	 * @return string
 	 */
 	public function HamLink($member = null) {
-		if($this->canEdit($member) && $this->IsSpam) {
+		if ($this->canEdit($member) && $this->IsSpam) {
 			return $this->actionLink('ham', $member);
 		}
 	}
@@ -467,7 +467,7 @@ 
 	 * @return string
 	 */
 	public function ApproveLink($member = null) {
-		if($this->canEdit($member) && !$this->Moderated) {
+		if ($this->canEdit($member) && !$this->Moderated) {
 			return $this->actionLink('approve', $member);
 		}
 	}
@@ -505,9 +505,9 @@ 
 	 * @return string
 	 */
 	public function SpamClass() {
-		if($this->IsSpam) {
+		if ($this->IsSpam) {
 			return 'spam';
-		} else if(!$this->Moderated) {
+		} else if (!$this->Moderated) {
 			return 'unmoderated';
 		} else {
 			return 'notspam';
@@ -520,8 +520,8 @@ 
 	public function getTitle() {
 		$title = sprintf(_t('Comment.COMMENTBY', 'Comment by %s', 'Name'), $this->getAuthorName());
 
-		if($parent = $this->getParent()) {
-			if($parent->Title) {
+		if ($parent = $this->getParent()) {
+			if ($parent->Title) {
 				$title .= sprintf(' %s %s', _t('Comment.ON', 'on'), $parent->Title);
 			}
 		}
@@ -555,7 +555,7 @@ 
 		);
 
 		// Show member name if given
-		if(($author = $this->Author()) && $author->exists()) {
+		if (($author = $this->Author()) && $author->exists()) {
 			$fields->insertAfter(
 				TextField::create('AuthorMember', $this->fieldLabel('Author'), $author->Title)
 					->performReadonlyTransformation(),
@@ -564,7 +564,7 @@ 
 		}
 
 		// Show parent comment if given
-		if(($parent = $this->ParentComment()) && $parent->exists()) {
+		if (($parent = $this->ParentComment()) && $parent->exists()) {
 			$fields->push(new HeaderField(
 				'ParentComment_Title',
 				_t('Comment.ParentComment_Title', 'This comment is a reply to the below')
@@ -635,7 +635,7 @@ 
 	public function Gravatar() {
 		$gravatar = '';
 		$use_gravatar = $this->getOption('use_gravatar');
-		if($use_gravatar) {
+		if ($use_gravatar) {
 			$gravatar = 'http://www.gravatar.com/avatar/' . md5(strtolower(trim($this->Email)));
 			$gravatarsize = $this->getOption('gravatar_size');
 			$gravatardefault = $this->getOption('gravatar_default');
@@ -653,7 +653,7 @@ 
 	 */
 	public function getRepliesEnabled() {
 		// Check reply option
-		if(!$this->getOption('nested_comments')) {
+		if (!$this->getOption('nested_comments')) {
 			return false;
 		}
 
@@ -669,7 +669,7 @@ 
 	 */
 	public function AllReplies() {
 		// No replies if disabled
-		if(!$this->getRepliesEnabled()) {
+		if (!$this->getRepliesEnabled()) {
 			return new ArrayList();
 		}
 		
@@ -691,7 +691,7 @@ 
 	 */
 	public function Replies() {
 		// No replies if disabled
-		if(!$this->getRepliesEnabled()) {
+		if (!$this->getRepliesEnabled()) {
 			return new ArrayList();
 		}
 		$list = $this->AllReplies();
@@ -699,7 +699,7 @@ 
 		// Filter spam comments for non-administrators if configured
 		$parent = $this->getParent();
 		$showSpam = $this->getOption('frontend_spam') && $parent && $parent->canModerateComments();
-		if(!$showSpam) {
+		if (!$showSpam) {
 			$list = $list->filter('IsSpam', 0);
 		}
 
@@ -726,7 +726,7 @@ 
 
 		// Add pagination
 		$list = new PaginatedList($list, Controller::curr()->getRequest());
-		$list->setPaginationGetVar('repliesstart'.$this->ID);
+		$list->setPaginationGetVar('repliesstart' . $this->ID);
 		$list->setPageLength($this->getOption('comments_per_page'));
 
 		$this->extend('updatePagedReplies', $list);
@@ -740,13 +740,13 @@ 
 	 */
 	public function ReplyForm() {
 		// Ensure replies are enabled
-		if(!$this->getRepliesEnabled()) {
+		if (!$this->getRepliesEnabled()) {
 			return null;
 		}
 
 		// Check parent is available
 		$parent = $this->getParent();
-		if(!$parent || !$parent->exists()) {
+		if (!$parent || !$parent->exists()) {
 			return null;
 		}
 
@@ -764,7 +764,7 @@ 
 	 */
 	public function updateDepth() {
 		$parent = $this->ParentComment();
-		if($parent && $parent->exists()) {
+		if ($parent && $parent->exists()) {
 			$parent->updateDepth();
 			$this->Depth = $parent->Depth + 1;
 		} else {
@@ -785,7 +785,7 @@ 
 	 * @param Comment $comment Comment to generate this token for
 	 */
 	public function __construct($comment) {
-		if(!$comment->SecretToken) {
+		if (!$comment->SecretToken) {
 			$comment->SecretToken = $this->generate();
 			$comment->write();
 		}
@@ -848,7 +848,7 @@ 
 	 */
 	public function checkRequest($request) {
 		$member = Member::currentUser();
-		if(!$member) return false;
+		if (!$member) return false;
 
 		$salt = $request->getVar('s');
 		$memberSalt = $this->memberSalt($salt, $member);
@@ -869,7 +869,7 @@ 
 	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;
 	}
 }

Doc Comments +3 added lines, -3 removed lines

@@ -316,7 +316,7 @@ 
 	/**
 	 * Checks if the comment can be edited.
 	 *
-	 * @param null|int|Member $member
+	 * @param DataObject|null $member
 	 *
 	 * @return Boolean
 	 */
@@ -346,7 +346,7 @@ 
 	/**
 	 * Checks if the comment can be deleted.
 	 *
-	 * @param null|int|Member $member
+	 * @param Member|null $member
 	 *
 	 * @return Boolean
 	 */
@@ -369,7 +369,7 @@ 
 	 * Resolves Member object.
 	 *
 	 * @param Member|int|null $member
-	 * @return Member|null
+	 * @return DataObject|null
 	 */
 	protected function getMember($member = null) {
 		if(!$member) {

Indentation +16 added lines, -16 removed lines

@@ -570,15 +570,15 @@ 
 				_t('Comment.ParentComment_Title', 'This comment is a reply to the below')
 			));
 			// Created date
-            // FIXME - the method setName in DatetimeField is not chainable, hence
-            // the lack of chaining here
-            $createdField = $parent
-                    ->obj('Created')
-                    ->scaffoldFormField($parent->fieldLabel('Created'));
-            $createdField->setName('ParentComment_Created');
-            $createdField->setValue($parent->Created);
-            $createdField->performReadonlyTransformation();
-            $fields->push($createdField);
+			// FIXME - the method setName in DatetimeField is not chainable, hence
+			// the lack of chaining here
+			$createdField = $parent
+					->obj('Created')
+					->scaffoldFormField($parent->fieldLabel('Created'));
+			$createdField->setName('ParentComment_Created');
+			$createdField->setValue($parent->Created);
+			$createdField->performReadonlyTransformation();
+			$fields->push($createdField);
 
 			// Name (could be member or string value)
 			$fields->push(
@@ -620,13 +620,13 @@ 
 	 */
 	public function getHtmlPurifierService() {
 		$config = HTMLPurifier_Config::createDefault();
-        $allowedElements = $this->getOption('html_allowed_elements');
-        $config->set('HTML.AllowedElements', $allowedElements);
+		$allowedElements = $this->getOption('html_allowed_elements');
+		$config->set('HTML.AllowedElements', $allowedElements);
 
-        // This injector cannot be set unless the 'p' element is allowed
-        if (in_array('p', $allowedElements)) {
-            $config->set('AutoFormat.AutoParagraph', true);
-        }
+		// This injector cannot be set unless the 'p' element is allowed
+		if (in_array('p', $allowedElements)) {
+			$config->set('AutoFormat.AutoParagraph', true);
+		}
 
 		$config->set('AutoFormat.Linkify', true);
 		$config->set('URI.DisableExternalResources', true);
@@ -716,7 +716,7 @@ 
 			|| ($this->getOption('frontend_moderation') && $parent->canModerateComments())
 		);
 		if (!$showUnmoderated) {
-		    $list = $list->filter('Moderated', 1);
+			$list = $list->filter('Moderated', 1);
 		}
 
 		$this->extend('updateReplies', $list);

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;
 	}
 }

code/model/CommentList.php

Spacing +7 added lines, -7 removed lines

@@ -40,16 +40,16 @@ 
 	 */
 	public function add($item) {
 		// Check item given
-		if(is_numeric($item)) {
+		if (is_numeric($item)) {
 			$item = Comment::get()->byID($item);
 		}
-		if(!($item instanceof Comment)) {
+		if (!($item instanceof Comment)) {
 			throw new InvalidArgumentException("CommentList::add() expecting a Comment object, or ID value");
 		}
 		
 		// Validate foreignID
 		$foreignID = $this->getForeignID();
-		if(!$foreignID || is_array($foreignID)) {
+		if (!$foreignID || is_array($foreignID)) {
 			throw new InvalidArgumentException("CommentList::add() can't be called until a single foreign ID is set");
 		}
 
@@ -64,10 +64,10 @@ 
 	 */
 	public function remove($item) {
 		// Check item given
-		if(is_numeric($item)) {
+		if (is_numeric($item)) {
 			$item = Comment::get()->byID($item);
 		}
-		if(!($item instanceof Comment)) {
+		if (!($item instanceof Comment)) {
 			throw new InvalidArgumentException("CommentList::remove() expecting a Comment object, or ID",
 				E_USER_ERROR);
 		}
@@ -75,11 +75,11 @@ 
 		// 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();
-		if(	empty($foreignID)
+		if (empty($foreignID)
 			|| (is_array($foreignID) && in_array($item->ParentID, $foreignID))
 			|| $foreignID == $item->ParentID
 		) {

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();