Version 5.0.6
This commit is contained in:
1 parent
a3a4a9ccbd
commit
b89858b2ff
1214 files changed
+92828
-14859
No files matched your search
@@ -23,6 +23,7 @@ use IPS\GeoLocation;
|
||||
use IPS\Helpers\Form;
|
||||
use IPS\Helpers\Form\CheckboxSet;
|
||||
use IPS\Helpers\Form\Radio;
|
||||
use IPS\Helpers\Form\Text;
|
||||
use IPS\Http\Url;
|
||||
use IPS\Member;
|
||||
use IPS\Member\Club;
|
||||
@@ -127,7 +128,12 @@ class directory extends Controller
|
||||
/* All Clubs: Filters */
|
||||
$filters = array();
|
||||
$mineOnly = FALSE;
|
||||
$extraWhere = NULL;
|
||||
$extraWhere = [];
|
||||
if ( ! empty( Request::i()->name ) )
|
||||
{
|
||||
$baseUrl = $baseUrl->setQueryString( 'name', Request::i()->name );
|
||||
$extraWhere[] = Db::i()->like( 'name', Request::i()->name, true, true, true );
|
||||
}
|
||||
if ( isset( Request::i()->filter ) and Request::i()->filter === 'mine' AND Member::loggedIn()->member_id )
|
||||
{
|
||||
$mineOnly = TRUE;
|
||||
@@ -289,7 +295,9 @@ class directory extends Controller
|
||||
$fields = CustomField::roots();
|
||||
|
||||
$form = new Form('filter', 'filter');
|
||||
|
||||
|
||||
$form->add( new Text( 'club_filter_name', isset( Request::i()->name ) ? Request::i()->name : '' ) );
|
||||
|
||||
if ( Member::loggedIn()->member_id )
|
||||
{
|
||||
$form->add( new Radio( 'club_filter_type', isset( Request::i()->filter ) ? Request::i()->filter : 'all', TRUE, array( 'options' => array(
|
||||
@@ -339,7 +347,12 @@ class directory extends Controller
|
||||
if ( $values = $form->values() )
|
||||
{
|
||||
$url = Url::internal( 'app=core&module=clubs&controller=directory', 'front', 'clubs_list' );
|
||||
|
||||
|
||||
if ( ! empty ( $values['club_filter_name'] ) )
|
||||
{
|
||||
$url = $url->setQueryString( 'name', $values['club_filter_name'] );
|
||||
}
|
||||
|
||||
if ( Member::loggedIn()->member_id and $values['club_filter_type'] === 'mine' )
|
||||
{
|
||||
$url = $url->setQueryString( 'filter', 'mine' );
|
||||
|
||||
Reference in new issue
Block a user