Merge pull request #124 from VSEphpbb/myideas

View Your Ideas Quick Link

Author: DavidIQ

controller/base.php

@@ -133,16 +133,18 @@ protected function assign_template_block_vars($block, $rows)
 	}
 
 	/**
-	 * Assign template variables for a search ideas field
+	 * Assign common template variables for Ideas pages
 	 *
 	 * @return void
 	 */
-	protected function display_search_ideas()
+	protected function display_common_vars()
 	{
-		$this->template->assign_vars(array(
+		$this->template->assign_vars([
 			'S_DISPLAY_SEARCHBOX'	=> (bool) $this->auth->acl_get('u_search') && $this->auth->acl_get('f_search', $this->config['ideas_forum_id']) && $this->config['load_search'],
 			'S_SEARCHBOX_ACTION'	=> append_sid("{$this->root_path}search.{$this->php_ext}"),
-			'S_SEARCH_IDEAS_HIDDEN_FIELDS'	=> build_hidden_fields(array('fid' => array($this->config['ideas_forum_id']))),
-		));
+			'S_SEARCH_IDEAS_HIDDEN_FIELDS'	=> build_hidden_fields(['fid' => [$this->config['ideas_forum_id']]]),
+
+			'U_SEARCH_MY_IDEAS' 	=> $this->helper->route('phpbb_ideas_list_controller', ['sort' => ideas::SORT_MYIDEAS, 'status' => '-1']),
+		]);
 	}
 }

controller/idea_controller.php

@@ -12,6 +12,7 @@
 
 use phpbb\exception\http_exception;
 use phpbb\ideas\factory\ideas;
+use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 
 class idea_controller extends base
@@ -24,7 +25,7 @@ class idea_controller extends base
 	 *
 	 * @param $idea_id int The ID of the requested idea, maybe?
 	 * @throws http_exception
-	 * @return \Symfony\Component\HttpFoundation\Response A Symfony Response object
+	 * @return JsonResponse|RedirectResponse
 	 */
 	public function idea($idea_id)
 	{
@@ -44,7 +45,7 @@ public function idea($idea_id)
 		{
 			$result = $this->$mode();
 
-			return new \Symfony\Component\HttpFoundation\JsonResponse($result);
+			return new JsonResponse($result);
 		}
 
 		$params = array(

controller/index_controller.php

@@ -43,9 +43,9 @@ public function index()
 		$this->assign_template_block_vars('implemented_ideas', $ideas);
 
 		$this->template->assign_vars(array(
-			'U_VIEW_TOP'		=> $this->link_helper->get_list_link(ideas::SORT_TOP),
-			'U_VIEW_LATEST'		=> $this->link_helper->get_list_link(ideas::SORT_NEW),
-			'U_VIEW_IMPLEMENTED'=> $this->link_helper->get_list_link(ideas::SORT_IMPLEMENTED),
+			'U_VIEW_TOP'		=> $this->helper->route('phpbb_ideas_list_controller', ['sort' => ideas::SORT_TOP]),
+			'U_VIEW_LATEST'		=> $this->helper->route('phpbb_ideas_list_controller', ['sort' => ideas::SORT_NEW]),
+			'U_VIEW_IMPLEMENTED'=> $this->helper->route('phpbb_ideas_list_controller', ['sort' => ideas::SORT_DATE, 'status' => ideas::$statuses['IMPLEMENTED']]),
 			'U_POST_ACTION'		=> $this->helper->route('phpbb_ideas_post_controller'),
 			'U_MCP' 			=> ($this->auth->acl_get('m_', $this->config['ideas_forum_id'])) ? append_sid("{$this->root_path}mcp.{$this->php_ext}", "f={$this->config['ideas_forum_id']}&i=main&mode=forum_view", true, $this->user->session_id) : '',
 
@@ -57,8 +57,8 @@ public function index()
 			'FORUM_NAME'		=> $this->language->lang('IDEAS'),
 		));
 
-		// Display the search ideas field
-		$this->display_search_ideas();
+		// Display common ideas template vars
+		$this->display_common_vars();
 
 		return $this->helper->render('index_body.html', $this->language->lang('IDEAS_TITLE'));
 	}

controller/list_controller.php

@@ -52,22 +52,16 @@ public function ideas_list($sort)
 			$sort = ideas::SORT_DATE;
 		}
 
-		// if sort by "implemented", sort ideas with status implemented by date
-		if ($sort === ideas::SORT_IMPLEMENTED)
-		{
-			$status = ideas::$statuses['IMPLEMENTED'];
-			$sort = ideas::SORT_DATE;
-		}
-
-		// Set the status name for displaying in the template
-		$status_name = (!$status && $sort === ideas::SORT_TOP) ? $this->language->lang('TOP_IDEAS') : $this->ideas->get_status_from_id($status);
+		// Set the name for displaying in the template
+		$status_name = 'LIST_' . strtoupper($status > 0 ? array_search($status, ideas::$statuses) : $sort);
+		$status_name = $this->language->is_set($status_name) ? $this->language->lang($status_name) : '';
 
 		// For special case where we want to request ALL ideas,
 		// including the statuses normally hidden from lists.
 		if ($status === -1)
 		{
 			$status = ideas::$statuses;
-			$status_name = $this->language->lang('ALL_IDEAS');
+			$status_name = $status_name ?: $this->language->lang('ALL_IDEAS');
 		}
 
 		// Generate ideas
@@ -118,8 +112,8 @@ public function ideas_list($sort)
 			$start
 		);
 
-		// Display the search ideas field
-		$this->display_search_ideas();
+		// Display common ideas template vars
+		$this->display_common_vars();
 
 		return $this->helper->render('list_body.html', $this->language->lang('IDEA_LIST'));
 	}

event/listener.php

@@ -223,7 +223,8 @@ public function show_idea($event)
 			'U_REMOVE_VOTE'		=> $this->link_helper->get_idea_link($idea['idea_id'], 'removevote', true),
 			'U_IDEA_VOTE'		=> $this->link_helper->get_idea_link($idea['idea_id'], 'vote', true),
 			'U_IDEA_DUPLICATE'	=> $this->link_helper->get_idea_link($idea['duplicate_id']),
-			'U_IDEA_STATUS_LINK'=> $this->helper->route('phpbb_ideas_list_controller', array('status' => $idea['idea_status'])),
+			'U_IDEA_STATUS_LINK'=> $this->helper->route('phpbb_ideas_list_controller', ['status' => $idea['idea_status']]),
+			'U_SEARCH_MY_IDEAS' => $this->helper->route('phpbb_ideas_list_controller', ['sort' => ideas::SORT_MYIDEAS, 'status' => '-1']),
 			'U_TITLE_LIVESEARCH'=> $this->helper->route('phpbb_ideas_livesearch_controller'),
 		));