Merge pull request #8 from rbonick/master

Adds reputation comments to the notifications themselves

Author: jbreu

controller/rating_controller.php

@@ -103,7 +103,7 @@ public function __construct(\phpbb\auth\auth $auth, \phpbb\config\config $config
 	/**
 	* Display the post rating page
 	*
-	* @param string $mode		Mode taken from the URL 
+	* @param string $mode		Mode taken from the URL
 	* @param int $post_id		Post ID taken from the URL
 	* @return Symfony\Component\HttpFoundation\Response A Symfony Response object
 	* @access public
@@ -434,7 +434,7 @@ public function post($mode, $post_id)
 		// Save vote
 		if ($submit)
 		{
-			// Prevent cheater to break the forum permissions to give negative points or give more points than they can 
+			// Prevent cheater to break the forum permissions to give negative points or give more points than they can
 			if (!$this->auth->acl_get('f_rs_rate_negative', $row['forum_id']) && $points < 0 || $points < 0 && $this->config['rs_min_rep_negative'] && ($this->user->data['user_reputation'] < $this->config['rs_min_rep_negative']) || $this->config['rs_enable_power'] && (($points > $max_voting_allowed) || ($points < -$max_voting_allowed)))
 			{
 				$submit = false;
@@ -483,6 +483,7 @@ public function post($mode, $post_id)
 				'user_id_from'		=> $this->user->data['user_id'],
 				'post_id'			=> $post_id,
 				'post_subject'		=> $row['post_subject'],
+				'comment' => $comment,
 			);
 
 			$notification_type = ($points > 0) ? 'pico.reputation.notification.type.rate_post_positive' : 'pico.reputation.notification.type.rate_post_negative';
@@ -825,7 +826,7 @@ public function user($uid)
 
 		if ($submit)
 		{
-			//Prevent cheater to break the forum permissions to give negative points or give more points than they can 
+			//Prevent cheater to break the forum permissions to give negative points or give more points than they can
 			if (!$this->auth->acl_get('u_rs_rate_negative') && $points < 0 || $points < 0 && $this->config['rs_min_rep_negative'] && ($this->user->data['user_reputation'] < $this->config['rs_min_rep_negative']) || $this->config['rs_enable_power'] && (($points > $max_voting_allowed) || ($points < -$max_voting_allowed)))
 			{
 				$submit = false;
@@ -898,4 +899,4 @@ public function user($uid)
 
 		return $this->helper->render('rateuser.html', $this->user->lang('RS_USER_RATING'));
 	}
-}
+}

language/en/reputation_common.php

@@ -53,7 +53,7 @@
 	'RS_VIEW_DETAILS'		=> 'View details',
 
 	'NOTIFICATION_TYPE_REPUTATION'		=> 'Someone gives you reputation point',
-	'NOTIFICATION_RATE_POST_POSITIVE'	=> '<strong>Rated positively</strong> by %s for post',
-	'NOTIFICATION_RATE_POST_NEGATIVE'	=> '<strong>Rated negatively</strong> by %s for post',
+	'NOTIFICATION_RATE_POST_POSITIVE'	=> '<strong>Rated positively</strong> by %s for post %s',
+	'NOTIFICATION_RATE_POST_NEGATIVE'	=> '<strong>Rated negatively</strong> by %s for post %s',
 	'NOTIFICATION_RATE_USER'			=> '<strong>Rated</strong> by %s',
 ));

notification/type/rate_post_positive.php

@@ -228,6 +228,7 @@ public function get_title()
 		return $this->user->lang(
 			$this->language_key,
 			phpbb_generate_string_list($usernames, $this->user),
+			censor_text($this->get_data('post_subject')),
 			$trimmed_voting_users_cnt
 		);
 	}
@@ -239,9 +240,12 @@ public function get_title()
 	*/
 	public function get_reference()
 	{
+		if (empty($this->get_data('comment'))) {
+			return null;
+		}
 		return $this->user->lang(
 			'NOTIFICATION_REFERENCE',
-			censor_text($this->get_data('post_subject'))
+			censor_text($this->get_data('comment'))
 		);
 	}
 
@@ -305,6 +309,7 @@ public function create_insert_array($data, $pre_create_data = array())
 		$this->set_data('user_id_from', $data['user_id_from']);
 		$this->set_data('post_id', $data['post_id']);
 		$this->set_data('post_subject', $data['post_subject']);
+		$this->set_data('comment', $data['comment']);
 
 		parent::create_insert_array($data, $pre_create_data);
 	}