summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--actions/noticesearch.php48
-rw-r--r--actions/peoplesearch.php52
-rw-r--r--lib/action.php12
-rw-r--r--lib/searchaction.php86
-rw-r--r--lib/settingsaction.php41
5 files changed, 121 insertions, 118 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) {
diff --git a/lib/action.php b/lib/action.php
index 45d696442..79c924b5e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -75,4 +75,16 @@ class Action { // lawsuit
unset($args['action']);
return common_local_url($action, $args);
}
+
+ function nav_menu($menu) {
+ $action = $this->trimmed('action');
+ common_element_start('ul', array('id' => 'nav_views'));
+ foreach ($menu as $menuaction => $menudesc) {
+ common_menu_item(common_local_url($menuaction),
+ _t($menudesc[0]),
+ _t($menudesc[1]),
+ $action == $menuaction);
+ }
+ common_element_end('ul');
+ }
}
diff --git a/lib/searchaction.php b/lib/searchaction.php
new file mode 100644
index 000000000..bf598ea93
--- /dev/null
+++ b/lib/searchaction.php
@@ -0,0 +1,86 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class SearchAction extends Action {
+
+ function handle($args) {
+ parent::handle($args);
+ $this->show_form();
+ }
+
+ 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');
+ }
+ $this->search_menu();
+ }
+
+ function get_title() {
+ return NULL;
+ }
+
+ function show_form($error=NULL) {
+ $q = $this->trimmed('q');
+ $page = $this->trimmed('page', 1);
+
+ common_show_header($this->get_title(), NULL, $error, array($this, 'show_top'));
+ common_element_start('form', array('method' => 'post',
+ 'id' => 'login',
+ 'action' => common_local_url($this->trimmed('action'))));
+ 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 search_menu() {
+ # action => array('prompt', 'title')
+ static $menu =
+ array('peoplesearch' =>
+ array('People',
+ 'Find people on this site'),
+ 'noticesearch' =>
+ array('Text',
+ 'Find content of notices'));
+ $this->nav_menu($menu);
+ }
+}
diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 0cdbbbeb2..1fbf88ecb 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -80,30 +80,21 @@ class SettingsAction extends Action {
function settings_menu() {
# action => array('prompt', 'title')
static $menu =
- array('profilesettings' =>
- array('Profile',
- 'Change your profile settings'),
- 'avatar' =>
- array('Avatar',
- 'Upload a new profile image'),
- 'password' =>
- array('Password',
- 'Change your password'),
- 'openidsettings' =>
- array('OpenID',
- 'Add or remove OpenIDs'),
- 'imsettings' =>
- array('IM',
- 'Updates by instant messenger (IM)'));
-
- $action = $this->trimmed('action');
- common_element_start('ul', array('id' => 'nav_views'));
- foreach ($menu as $menuaction => $menudesc) {
- common_menu_item(common_local_url($menuaction),
- _t($menudesc[0]),
- _t($menudesc[1]),
- $action == $menuaction);
- }
- common_element_end('ul');
+ array('profilesettings' =>
+ array('Profile',
+ 'Change your profile settings'),
+ 'avatar' =>
+ array('Avatar',
+ 'Upload a new profile image'),
+ 'password' =>
+ array('Password',
+ 'Change your password'),
+ 'openidsettings' =>
+ array('OpenID',
+ 'Add or remove OpenIDs'),
+ 'imsettings' =>
+ array('IM',
+ 'Updates by instant messenger (IM)'));
+ $this->nav_menu($menu);
}
}
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-12-26 19:40:54 +0000