diff options
| -rw-r--r-- | admin/users.php | 1 | ||||
| -rw-r--r-- | lib/class/browse.class.php | 23 | ||||
| -rw-r--r-- | templates/show_embed_xspf.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_users.inc.php | 12 |
4 files changed, 30 insertions, 10 deletions
diff --git a/admin/users.php b/admin/users.php index c6768549..a986bba6 100644 --- a/admin/users.php +++ b/admin/users.php @@ -197,6 +197,7 @@ switch ($_REQUEST['action']) { require_once Config::get('prefix') . '/templates/show_user_preferences.inc.php'; break; default: + Browse::reset_filters(); Browse::set_type('user'); Browse::set_simple_browse(1); Browse::set_sort('name','ASC'); diff --git a/lib/class/browse.class.php b/lib/class/browse.class.php index 03ce742d..2b04db39 100644 --- a/lib/class/browse.class.php +++ b/lib/class/browse.class.php @@ -224,6 +224,9 @@ class Browse { case 'live_stream': $valid_array = array('name','call_sign','frequency'); break; + case 'user': + $valid_array = array('fullname','username','last_seen','create_date'); + break; } // end switch // If it's not in our list, smeg off! @@ -528,7 +531,7 @@ class Browse { break; } // end filter } // end playlist - + return $filter_sql; } // sql_filter @@ -626,7 +629,23 @@ class Browse { $sql = "`genre`.`name`"; break; } // end switch - break; + break; + case 'user': + switch ($field) { + case 'username': + $sql = "`user`.`username`"; + break; + case 'fullname': + $sql = "`user`.`fullname`"; + break; + case 'last_seen': + $sql = "`user`.`last_seen`"; + break; + case 'create_date': + $sql = "`user`.`create_date`"; + break; + } // end switch + break; default: // Rien a faire break; diff --git a/templates/show_embed_xspf.inc.php b/templates/show_embed_xspf.inc.php index 250dc154..afcd560c 100644 --- a/templates/show_embed_xspf.inc.php +++ b/templates/show_embed_xspf.inc.php @@ -24,10 +24,10 @@ show_box_top(_('XSPF Player')); ?> <div id="mp3player"> -<script type="text/javascript" src="<?php echo conf('web_path'); ?>/modules/flash/swfobject.js"></script> +<script type="text/javascript" src="<?php Config::get('web_path'); ?>/modules/flash/swfobject.js"></script> <script type="text/javascript"> <!-- -var flashObj = new SWFObject ("<?php echo conf('web_path'); ?>/modules/flash/XSPF_RadioV.swf?action=play&playlist=<?php echo conf('web_path'); ?>/modules/flash/xspf_player.php?tmp_id=<?php echo $_REQUEST['play_info']; ?>&folder=<?php echo conf('web_path'); ?>/modules/flash/&textcolor=033066&color=E6E6E6&loop=playlist&lma=yes&viewinfo=true&vol=30&display=1@. - @2@ - @", "FMP3", "270", "190", 7, "#FFFFFF", true); +var flashObj = new SWFObject ("<?php Config::get('web_path'); ?>/modules/flash/XSPF_RadioV.swf?action=play&playlist=<?php Config::get('web_path'); ?>/modules/flash/xspf_player.php?tmp_id=<?php echo $_REQUEST['play_info']; ?>&folder=<?php Config::get('web_path'); ?>/modules/flash/&textcolor=033066&color=E6E6E6&loop=playlist&lma=yes&viewinfo=true&vol=30&display=1@. - @2@ - @", "FMP3", "270", "190", 7, "#FFFFFF", true); flashObj.write ("mp3player"); // --> </script> diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index 797c0b16..9a2b276c 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -36,9 +36,9 @@ $web_path = Config::get('web_path'); <col id="col_online" /> </colgroup> <tr class="th-top"> - <th class="cel_username"><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th> - <th class="cel_lastseen"><?php echo _('Last Seen'); ?></th> - <th class="cel_registrationdate"><?php echo _('Registration Date'); ?></th> + <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&sort=fullname',_('Fullname'),'users_sort_fullname'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&sort=username',_('Username'),'users_sort_username');?>)</th> + <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&sort=last_seen',_('Last Seen'),'users_sort_lastseen'); ?></th> + <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&sort=create_date',_('Registration Date'),'users_sort_createdate'); ?></th> <th class="cel_activity"><?php echo _('Activity'); ?></th> <?php if (Config::get('track_user_ip')) { ?> <th class="cel_lastip"><?php echo _('Last Ip'); ?></th> @@ -101,9 +101,9 @@ foreach ($object_ids as $user_id) { </tr> <?php } //end foreach users ?> <tr class="th-bottom"> - <th class="cel_username"><?php echo _('Fullname'); ?>(<?php echo _('Username'); ?>)</th> - <th class="cel_lastseen"><?php echo _('Last Seen'); ?></th> - <th class="cel_registrationdate"><?php echo _('Registration Date'); ?></th> + <th class="cel_username"><?php echo Ajax::text('?page=browse&action=set_sort&sort=fullname',_('Fullname'),'users_sort_fullname'); ?>( <?php echo Ajax::text('?page=browse&action=set_sort&sort=username',_('Username'),'users_sort_username');?>)</th> + <th class="cel_lastseen"><?php echo Ajax::text('?page=browse&action=set_sort&sort=last_seen',_('Last Seen'),'users_sort_lastseen'); ?></th> + <th class="cel_registrationdate"><?php echo Ajax::text('?page=browse&action=set_sort&sort=create_date',_('Registration Date'),'users_sort_createdate'); ?></th> <th class="cel_activity"><?php echo _('Activity'); ?></th> <?php if (Config::get('track_user_ip')) { ?> <th class="cel_lastip"><?php echo _('Last Ip'); ?></th> |