gordonbanderson / silverstripe-comments

code/model/Comment.php

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