refactor common code between searches and between search and settings

darcs-hash:20080709231031-84dde-929095ca3844ed6fe7ebd535fc9696678a5fcb0f.gz

2 files changed, 7 insertions, 93 deletions

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 7f645dbc2..870a195e0 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -23,57 +23,15 @@ define(NOTICES_PER_PAGE, 20);
 
 # XXX common parent for people and content search?
 
-class NoticesearchAction extends Action {
+class NoticesearchAction extends SearchAction {
 	
-	function handle($args) {
-		parent::handle($args);
-		$this->show_form();
-	}
-
 	function get_instructions() {
 		return _t('Search for notices on %%site.name%% by their contents. ' . 
 				  'Separate search terms by spaces; they must be 3 characters or more.');
 	}
 	
-	function show_top($error=NULL) {
-		if ($error) {
-			common_element('p', 'error', $error);
-		} else {
-			$instr = $this->get_instructions();
-			$output = common_markup_to_html($instr);
-			common_element_start('div', 'instructions');
-			common_raw($output);
-			common_element_end('div');
-		}
-	}
-	
-	function show_form($error=NULL) {
-		$q = $this->trimmed('q');
-		$page = $this->trimmed('page', 1);
-		
-		common_show_header(_t('Find notices'), NULL, $error, array($this, 'show_top'));
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'login',
-										   'action' => common_local_url('noticesearch')));
-		common_element_start('p');
-		common_element('input', array('name' => 'q',
-									  'id' => 'q',
-									  'type' => 'text',
-									  'class' => 'input_text',
-									  'value' => ($q) ? $q : ''));
-		common_text(' ');
-		common_element('input', array('type' => 'submit',
-									  'id' => 'search',
-									  'name' => 'search',
-									  'class' => 'submit',
-									  'value' => _t('Search')));
-					   
-		common_element_end('p');
-		common_element_end('form');
-		if ($q) {
-			$this->show_results($q, $page);
-		}
-		common_show_footer();
+	function get_title() {
+		return _t('Text search');
 	}
 	
 	function show_results($q, $page) {
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index 5d1014017..30d737b28 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -21,59 +21,15 @@ if (!defined('LACONICA')) { exit(1); }
 
 define(PROFILES_PER_PAGE, 10);
 
-# XXX common parent for people and content search?
-
-class PeoplesearchAction extends Action {
+class PeoplesearchAction extends SearchAction {
 	
-	function handle($args) {
-		parent::handle($args);
-		$this->show_form();
-	}
-
 	function get_instructions() {
 		return _t('Search for people on %%site.name%% by their name, location, or interests. ' . 
 				  'Separate the terms by spaces; they must be 3 characters or more.');
 	}
-	
-	function show_top($error=NULL) {
-		if ($error) {
-			common_element('p', 'error', $error);
-		} else {
-			$instr = $this->get_instructions();
-			$output = common_markup_to_html($instr);
-			common_element_start('div', 'instructions');
-			common_raw($output);
-			common_element_end('div');
-		}
-	}
-	
-	function show_form($error=NULL) {
-		$q = $this->trimmed('q');
-		$page = $this->trimmed('page', 1);
-		
-		common_show_header(_t('Find people'), NULL, $error, array($this, 'show_top'));
-		common_element_start('form', array('method' => 'post',
-										   'id' => 'login',
-										   'action' => common_local_url('peoplesearch')));
-		common_element_start('p');
-		common_element('input', array('name' => 'q',
-									  'id' => 'q',
-									  'type' => 'text',
-									  'class' => 'input_text',
-									  'value' => ($q) ? $q : ''));
-		common_text(' ');
-		common_element('input', array('type' => 'submit',
-									  'id' => 'search',
-									  'name' => 'search',
-									  'class' => 'submit',
-									  'value' => _t('Search')));
-					   
-		common_element_end('p');
-		common_element_end('form');
-		if ($q) {
-			$this->show_results($q, $page);
-		}
-		common_show_footer();
+
+	function get_title() {
+		return _t('People search');
 	}
 	
 	function show_results($q, $page) {