From ef6dbc428f0a6687a6f2ae82769621af10b1c23d Mon Sep 17 00:00:00 2001 From: Nick Palmer Date: Sun, 9 Dec 2007 14:33:00 +0000 Subject: Make it possible to tweak the members list sql from outside Pigeonholes. --- Pigeonholes.php | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'Pigeonholes.php') diff --git a/Pigeonholes.php b/Pigeonholes.php index 4511e7f..1dc7e32 100644 --- a/Pigeonholes.php +++ b/Pigeonholes.php @@ -1,6 +1,6 @@ - * @version $Revision: 1.120 $ + * @version $Revision: 1.121 $ * @package pigeonholes */ @@ -143,7 +143,25 @@ class Pigeonholes extends LibertyAttachable { $bindVars[] = strtoupper( $pListHash['title'] ); } - $order = "ORDER BY lc.`content_type_guid`, lc.`title` ASC"; + if( !empty( $pListHash['order'] ) ) { + $order = "ORDER BY ".$pListHash['order']; + } + else { + $order = "ORDER BY lc.`content_type_guid`, lc.`title` ASC"; + } + + if( !empty( $pListHash['select'] ) ) { + $select .= $pListHash['select']; + } + + if( !empty( $pListHash['join'] ) ) { + $join .= $pListHash['join']; + } + + if( !empty( $pListHash['where'] ) ) { + $where .= empty( $where ) ? ' WHERE ' : ' AND '; + $where .= $pListHash['where']; + } $ret = array(); $query = " @@ -531,6 +549,10 @@ class Pigeonholes extends LibertyAttachable { 'list_page' => !empty( $pListHash['members_list_page'] ) ? $pListHash['members_list_page'] : NULL, 'sort_mode' => !empty( $pListHash['members_sort_mode'] ) ? $pListHash['members_sort_mode'] : NULL, 'find' => !empty( $pListHash['members_find'] ) ? $pListHash['members_find'] : NULL, + 'order' => !empty( $pListHash['members_order'] ) ? $pListHash['members_order'] : NULL, + 'select' => !empty( $pListHash['members_select'] ) ? $pListHash['members_select'] : NULL, + 'join' => !empty( $pListHash['members_join'] ) ? $pListHash['members_join'] : NULL, + 'where' => !empty( $pListHash['members_where'] ) ? $pListHash['members_where'] : NULL, ); $aux['members'] = $this->getMemberList( $memberListHash ); $aux['listInfo'] = $memberListHash['listInfo']; -- cgit v1.3