Merge pull request #111 from VSEphpbb/voters

Show your vote on idea index

Author: DavidIQ

composer.json

@@ -3,7 +3,7 @@
 	"type": "phpbb-extension",
 	"description": "phpBB Ideas centre for phpBB 3.2.",
 	"homepage": "https://www.phpbb.com",
-	"version": "2.2.1",
+	"version": "2.2.2-dev",
 	"license": "GPL-2.0-only",
 	"authors": [
 		{
@@ -34,13 +34,13 @@
 		}
 	],
 	"require": {
-		"php": ">=5.4",
+		"php": ">=5.5",
 		"composer/installers": "~1.0"
 	},
 	"extra": {
 		"display-name": "phpBB Ideas",
 		"soft-require": {
-			"phpbb/phpbb": ">=3.2.1,<3.4"
+			"phpbb/phpbb": ">=3.2.1"
 		}
 	}
 }

controller/base.php

@@ -123,6 +123,7 @@ protected function assign_template_block_vars($block, $rows)
 				'READ'       => $row['read'],
 				'VOTES_UP'   => $row['idea_votes_up'],
 				'VOTES_DOWN' => $row['idea_votes_down'],
+				'USER_VOTED' => $row['u_voted'],
 				'POINTS'     => $row['idea_votes_up'] - $row['idea_votes_down'],
 				'STATUS'     => $row['idea_status'], // for status icons (not currently implemented)
 				'LOCKED'     => $row['topic_status'] == ITEM_LOCKED,

ext.php

@@ -25,13 +25,15 @@ class ext extends \phpbb\extension\base
 	 * The current phpBB version should meet or exceed
 	 * the minimum version required by this extension:
 	 *
-	 * Requires phpBB 3.2.1 due to use of $event->update_subarray();
+	 * Requires phpBB 3.2.1 due to use of $event->update_subarray()
+	 * 	and PHP 5.5.0 due to use of array_column()
 	 *
 	 * @return bool
 	 * @access public
 	 */
 	public function is_enableable()
 	{
-		return phpbb_version_compare(PHPBB_VERSION, '3.2.1', '>=');
+		return phpbb_version_compare(PHPBB_VERSION, '3.2.1', '>=')
+			&& phpbb_version_compare(PHP_VERSION, '5.5.0', '>=');
 	}
 }

factory/ideas.php

@@ -168,7 +168,7 @@ public function get_ideas($number = 10, $sort = 'date', $sort_direction = 'DESC'
 		{
 			$sql = 'SELECT COUNT(i.idea_id) as num_ideas
 				FROM ' . $this->table_ideas . ' i
-       			INNER JOIN ' . $this->table_topics . " t 
+       			INNER JOIN ' . $this->table_topics . " t
        				ON i.topic_id = t.topic_id
 				WHERE $where";
 			$result = $this->db->sql_query($sql);
@@ -183,7 +183,7 @@ public function get_ideas($number = 10, $sort = 'date', $sort_direction = 'DESC'
 		{
 			$sql = 'SELECT t.topic_last_post_time, t.topic_status, t.topic_visibility, i.*
 				FROM ' . $this->table_ideas . ' i
-				INNER JOIN ' . $this->table_topics . " t 
+				INNER JOIN ' . $this->table_topics . " t
 					ON i.topic_id = t.topic_id
 				WHERE $where
 				ORDER BY " . $this->db->sql_escape($sortby);
@@ -196,12 +196,12 @@ public function get_ideas($number = 10, $sort = 'date', $sort_direction = 'DESC'
 				((i.idea_votes_up + 1.9208) / (i.idea_votes_up + i.idea_votes_down) -
 	            1.96 * SQRT((i.idea_votes_up * i.idea_votes_down) / (i.idea_votes_up + i.idea_votes_down) + 0.9604) /
 	            (i.idea_votes_up + i.idea_votes_down)) / (1 + 3.8416 / (i.idea_votes_up + i.idea_votes_down))
-	            AS ci_lower_bound
-       				FROM ' . $this->table_ideas . ' i
-       				INNER JOIN ' . $this->table_topics . " t 
-       					ON i.topic_id = t.topic_id
-       				WHERE $where
-       			ORDER BY ci_lower_bound " . $this->db->sql_escape($sort_direction);
+				AS ci_lower_bound
+					FROM ' . $this->table_ideas . ' i
+					INNER JOIN ' . $this->table_topics . " t
+						ON i.topic_id = t.topic_id
+					WHERE $where
+				ORDER BY ci_lower_bound " . $this->db->sql_escape($sort_direction);
 		}
 
 		$result = $this->db->sql_query_limit($sql, $number, $start);
@@ -210,16 +210,18 @@ public function get_ideas($number = 10, $sort = 'date', $sort_direction = 'DESC'
 
 		if (count($rows))
 		{
-			$topic_ids = array_map(function($row) {
-				return $row['topic_id'];
-			}, $rows);
+			$topic_ids = array_column($rows, 'topic_id');
+			$idea_ids = array_column($rows, 'idea_id');
 
 			$topic_tracking_info = get_complete_topic_tracking((int) $this->config['ideas_forum_id'], $topic_ids);
+			$user_voting_info = $this->get_users_votes($this->user->id, $idea_ids);
 
 			foreach ($rows as &$row)
 			{
 				$row['read'] = !(isset($topic_tracking_info[$row['topic_id']]) && $row['topic_last_post_time'] > $topic_tracking_info[$row['topic_id']]);
+				$row['u_voted'] = isset($user_voting_info[$row['idea_id']]) ? (string) $user_voting_info[$row['idea_id']] : '';
 			}
+			unset ($row);
 		}
 
 		return $rows;
@@ -721,7 +723,7 @@ public function delete_orphans()
 	{
 		// Find any orphans
 		$sql = 'SELECT idea_id FROM ' . $this->table_ideas . '
- 			WHERE topic_id NOT IN (SELECT t.topic_id 
+ 			WHERE topic_id NOT IN (SELECT t.topic_id
  			FROM ' . $this->table_topics . ' t
  				WHERE t.forum_id = ' . (int) $this->config['ideas_forum_id'] . ')';
 		$result = $this->db->sql_query($sql);
@@ -827,4 +829,31 @@ protected function profile_url()
 
 		return $this->profile_url;
 	}
+
+	/**
+	 * Get a user's votes from a group of ideas
+	 *
+	 * @param int $user_id The user's id
+	 * @param array $ids An array of idea ids
+	 * @return array An array of ideas the user voted on and their vote result, or empty otherwise.
+	 *               example: [idea_id => vote_result]
+	 *                         1 => 1, idea 1, voted up by the user
+	 *                         2 => 0, idea 2, voted down by the user
+	 */
+	protected function get_users_votes($user_id, $ids = [])
+	{
+		$results = [];
+		$sql = 'SELECT idea_id, vote_value
+			FROM ' . $this->table_votes . '
+			WHERE user_id = ' . (int) $user_id . '
+			AND ' . $this->db->sql_in_set('idea_id', $ids, false, true);
+		$result = $this->db->sql_query($sql);
+		while ($row = $this->db->sql_fetchrow($result))
+		{
+			$results[$row['idea_id']] = $row['vote_value'];
+		}
+		$this->db->sql_freeresult($result);
+
+		return $results;
+	}
 }

styles/prosilver/template/index_list.html

@@ -17,8 +17,8 @@
 				</dt>
 
 				<dd class="topics">
-					<div class="minivoteup"><span>{{ idea.VOTES_UP }}</span></div>
-					<div class="minivotedown"><span>{{ idea.VOTES_DOWN }}</span></div>
+					<div class="minivoteup{% if idea.USER_VOTED == '1' %} voted{% endif %}"><span>{{ idea.VOTES_UP }}</span></div>
+					<div class="minivotedown{% if idea.USER_VOTED == '0' %} voted{% endif %}"><span>{{ idea.VOTES_DOWN }}</span></div>
 				</dd>
 			</dl>
 		</li>

styles/prosilver/theme/ideas.css

@@ -66,6 +66,10 @@ dd.topics {
 	background-position: -65px 0;
 }
 
+.voted {
+	color: orange !important;
+}
+
 /* Ideas Lists Styles */
 .view-all {
 	color: #536482;