Add auto-unlock, and check for lock permissions.

Turning on "lock solved topics" option now still requires that the
user either have "m_lock" permission or "f_user_lock" permission
before the topic will be automatically locked. Otherwise the topic
will only be marked as solved without locking.

Additionally, unsolving a topic will only unlock it if the user
is a moderator with "m_lock" permission, and will only do so
if the "lock solved topics" option is enabled.

Fixes #16, #17

Author: tierra

controller/main_controller.php

@@ -54,10 +54,14 @@ public function mark($solve, $post_id)
 
 		$this->check_solve_conditions($solve, $topic_data);
 
-		$lock_topic = (bool) $topic_data['forum_lock_solved'];
-		$solved_post_id = $solve == 'solved' ? $post_id : 0;
-		$this->topicsolved->update_topic_solved(
-			$topic_data['topic_id'], $solved_post_id, $lock_topic);
+		if ($solve == 'solved')
+		{
+			$this->topicsolved->mark_solved($topic_data, $post_id);
+		}
+		else
+		{
+			$this->topicsolved->mark_unsolved($topic_data);
+		}
 
 		$post_url = $this->topicsolved->get_link_to_post(
 			$topic_data['forum_id'], $topic_data['topic_id'], $post_id);

readme.md

@@ -22,7 +22,7 @@ This is an update of the phpBB 3.0.x Topic Solved MOD, written by Jari Kanerva.
 *   Custom text indicators can use custom colour.
 *   Only topic author or moderator can solve topics.
 *   Can be locked to only moderator access for solving topics.
-*   Solving topics may be set to automatically lock the topic.
+*   Solving topics may be set to automatically lock/unlock the topic.
 *   All settings can be customized per-forum.
 
 ## Translations

topicsolved.php

@@ -94,7 +94,7 @@ public function user_can_solve_post($solved, $topic_data)
 
 		if (($topic_data[$forum_permission[$solved]] == topicsolved::TOPIC_SOLVED_MOD ||
 			$topic_data[$forum_permission[$solved]] == topicsolved::TOPIC_SOLVED_YES) &&
-			$this->auth->acl_get('m_'))
+			$this->auth->acl_get('m_', $topic_data['forum_id']))
 		{
 			return true;
 		}
@@ -140,26 +140,15 @@ public function get_topic_data($post_id)
 	}
 
 	/**
-	 * Mark topic as solved with the given post.
+	 * Update topic with the given data.
 	 *
-	 * Post will only be locked if marking as solved, not when unsolving. This
-	 * method does not do any validation. Data should be validated first.
-	 *
-	 * @param int $topic_id Topic to be marked.
-	 * @param int $post_id Solved post or 0 for unsolved topic.
-	 * @param bool $lock Lock the topic after marking as solved.
+	 * @param int $topic_id Topic to update.
+	 * @param int $data Topic data to update.
 	 *
 	 * @return mixed true if successful
 	 */
-	public function update_topic_solved($topic_id, $post_id, $lock = false)
+	public function update_topic($topic_id, $data)
 	{
-		$data = array('topic_solved' => $post_id);
-
-		if ($lock)
-		{
-			$data['topic_status'] = ITEM_LOCKED;
-		}
-
 		$update_sql = $this->db->sql_build_array('UPDATE', $data);
 		$result = $this->db->sql_query('
 			UPDATE ' . TOPICS_TABLE . '
@@ -170,6 +159,73 @@ public function update_topic_solved($topic_id, $post_id, $lock = false)
 		return $result;
 	}
 
+	/**
+	 * Marks a topic as solved.
+	 *
+	 * @param array $topic_data Topic to be marked as solved.
+	 * @param int $post_id Post to mark as the solution.
+	 */
+	public function mark_solved($topic_data, $post_id)
+	{
+		// Database column values to set.
+		$column_data = array('topic_solved' => $post_id);
+
+		if ($topic_data['forum_lock_solved'] &&
+			$this->user_can_lock_post($topic_data['forum_id']))
+		{
+			$column_data['topic_status'] = ITEM_LOCKED;
+		}
+
+		$this->update_topic($topic_data['topic_id'], $column_data);
+	}
+
+	/**
+	 * Marks a topic as unsolved.
+	 *
+	 * @param array $topic_data Topic to be marked as unsolved.
+	 */
+	public function mark_unsolved($topic_data)
+	{
+		// Database column values to set.
+		$column_data = array('topic_solved' => 0);
+
+		if ($topic_data['forum_lock_solved'] &&
+			$this->auth->acl_get('m_lock', $topic_data['forum_id']))
+		{
+			$column_data['topic_status'] = ITEM_UNLOCKED;
+		}
+
+		$this->update_topic($topic_data['topic_id'], $column_data);
+	}
+
+	/**
+	 * Checks if the currently logged in user has permission to lock a post.
+	 *
+	 * Regular users won't have permission to solve any topics other than their
+	 * own, and moderator permissions are forum based, so we only need to know
+	 * the forum, not the post.
+	 *
+	 * @param int $forum_id Forum to check permissions on.
+	 *
+	 * @return bool true if user has permission to lock a post.
+	 */
+	public function user_can_lock_post($forum_id)
+	{
+		// Check if user is moderator with appropriate lock permission
+		if ($this->auth->acl_get('m_lock', $forum_id))
+		{
+			return true;
+		}
+
+		// Check if user has "lock own posts" permission
+		if ($this->auth->acl_get('f_user_lock', $forum_id))
+		{
+			return true;
+		}
+
+		return false;
+	}
+
 	/**
 	 * Generate markup for the given solved indicator image.
 	 *