gordonbanderson / silverstripe-comments

code/model/Comment.php

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

code/controllers/CommentingController.php

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