summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-23 07:38:26 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2007-07-23 07:38:26 +0000
commit233ed809a6e22baa798666ac66c7373f500d4060 (patch)
tree70b33c8faab707fc4162b89ce03dc449c395da8a /templates
parent4ad67656eb63a6c23b0e6caed619f463e0c14aec (diff)
downloadampache-233ed809a6e22baa798666ac66c7373f500d4060.tar.gz
ampache-233ed809a6e22baa798666ac66c7373f500d4060.tar.bz2
ampache-233ed809a6e22baa798666ac66c7373f500d4060.zip
fixed ip history display
Diffstat (limited to 'templates')
-rw-r--r--templates/show_ip_history.inc.php10
-rw-r--r--templates/show_users.inc.php4
2 files changed, 8 insertions, 6 deletions
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&amp;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&amp;user_id=<?php echo $client->id; ?>">
<?php echo get_user_icon('edit'); ?>
</a>