diff options
| -rw-r--r-- | admin/users.php | 10 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | templates/show_ip_history.inc.php | 10 | ||||
| -rw-r--r-- | templates/show_users.inc.php | 4 |
4 files changed, 15 insertions, 10 deletions
diff --git a/admin/users.php b/admin/users.php index 677c9510..dd073e65 100644 --- a/admin/users.php +++ b/admin/users.php @@ -169,12 +169,14 @@ switch ($_REQUEST['action']) { case 'show_ip_history': /* get the user and their history */ $working_user = new User($_REQUEST['user_id']); + if (!isset ($_REQUEST['all'])){ - $history = $working_user->get_ip_history('',1); - } else { - $history = $working_user->get_ip_history('',''); + $history = $working_user->get_ip_history('',1); + } + else { + $history = $working_user->get_ip_history('',''); } - require (conf('prefix') . '/templates/show_ip_history.inc.php'); + require Config::get('prefix') . '/templates/show_ip_history.inc.php'; break; case 'show_add_user': if (Config::get('demo_mode')) { break; } diff --git a/docs/CHANGELOG b/docs/CHANGELOG index 67fa1b42..4da2d1b2 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.4-Alpha1 + - Added support for Internet Radio Stations - Updated LastFM submission formating to account for changes on last.fm (Thx entropathy) - Fixed LastFM and increased timeout slightly in an attempt to diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index 0a204587..416e2991 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -1,13 +1,13 @@ <?php /* - Copyright (c) 2001 - 2006 Ampache.org + Copyright (c) 2001 - 2007 Ampache.org All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License - as published by the Free Software Foundation; either version 2 - of the License, or (at your option) any later version. + as published by the Free Software Foundation; version 2 + of the License. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -23,9 +23,9 @@ <?php show_box_top($working_user->fullname . ' ' . _('IP History')); ?> <div class="text-action"> <?php if (isset($_REQUEST['all'])){ ?> - <a href="<?php echo conf('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo _('Show Unique'); ?>...</a> + <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>"><?php echo _('Show Unique'); ?>...</a> <?php }else{ ?> - <a href="<?php echo conf('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo _('Show All'); ?>...</a> + <a href="<?php echo Config::get('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $working_user->id?>&all"><?php echo _('Show All'); ?>...</a> <?php }?> </div> <table border="0"> diff --git a/templates/show_users.inc.php b/templates/show_users.inc.php index 087aa85b..bc9dadb4 100644 --- a/templates/show_users.inc.php +++ b/templates/show_users.inc.php @@ -75,12 +75,14 @@ foreach ($object_ids as $user_id) { <td> <?php echo $client->f_useage; ?> </td> - <td> <?php if (Config::get('track_user_ip')) { ?> + <td> <a href="<?php echo $web_path; ?>/admin/users.php?action=show_ip_history&user_id=<?php echo $client->id; ?>"> <?php echo $client->ip_history; ?> </a> + </td> <?php } ?> + <td> <a href="<?php echo $web_path; ?>/admin/users.php?action=show_edit&user_id=<?php echo $client->id; ?>"> <?php echo get_user_icon('edit'); ?> </a> |