diff options
| author | pb1dft <pb1dft@ampache> | 2006-11-04 01:28:06 +0000 |
|---|---|---|
| committer | pb1dft <pb1dft@ampache> | 2006-11-04 01:28:06 +0000 |
| commit | d7996a68590933cbccbcf1011e8cf6e92c1510b7 (patch) | |
| tree | d541a31d8117acbeaa23390a9eca53139ad83c4d | |
| parent | 7e7827bde92aebc015e5eb2bfd854416eaf446ed (diff) | |
| download | ampache-d7996a68590933cbccbcf1011e8cf6e92c1510b7.tar.gz ampache-d7996a68590933cbccbcf1011e8cf6e92c1510b7.tar.bz2 ampache-d7996a68590933cbccbcf1011e8cf6e92c1510b7.zip | |
Some minor mods
| -rw-r--r-- | admin/users.php | 5 | ||||
| -rw-r--r-- | lib/class/stream.class.php | 2 | ||||
| -rw-r--r-- | templates/show_ip_history.inc.php | 3 | ||||
| -rw-r--r-- | templates/show_preferences.inc | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/admin/users.php b/admin/users.php index 9f13e9cd..962d2add 100644 --- a/admin/users.php +++ b/admin/users.php @@ -154,8 +154,11 @@ switch ($action) { case 'show_ip_history': /* get the user and their history */ $temp_user = new User($_REQUEST['user_id']); + if (!isset ($_REQUEST['all'])){ $history = $temp_user->get_ip_history('',1); - + } else { + $history = $temp_user->get_ip_history('',''); + } require (conf('prefix') . '/templates/show_ip_history.inc.php'); break; case 'show_add_user': diff --git a/lib/class/stream.class.php b/lib/class/stream.class.php index 7d0566bb..cbdd6edd 100644 --- a/lib/class/stream.class.php +++ b/lib/class/stream.class.php @@ -246,7 +246,7 @@ class Stream { echo "<script language=\"javascript\" type=\"text/javascript\">\n"; echo "<!-- begin\n"; echo "function PlayerPopUp(URL) {\n"; - echo "window.open(URL, 'XSPF_player', 'width=400,height=168,scrollbars=0,toolbar=0,location=0,directories=0,status=1,resizable=0');\n"; + echo "window.open(URL, 'XSPF_player', 'width=355,height=300,scrollbars=0,toolbar=0,location=0,directories=0,status=1,resizable=0');\n"; echo "window.location = '" . return_referer() . "';\n"; echo "return false;\n"; echo "}\n"; diff --git a/templates/show_ip_history.inc.php b/templates/show_ip_history.inc.php index dd251a3f..497082f1 100644 --- a/templates/show_ip_history.inc.php +++ b/templates/show_ip_history.inc.php @@ -21,6 +21,9 @@ */ ?> <?php show_box_top($temp_user->fullname . ' ' . _('IP History')); ?> +<div class="text-action"> + <a href="<?php echo conf('web_path')?>/admin/users.php?action=show_ip_history&user_id=<?php echo $temp_user->username?>&all"><?php echo _('Show All'); ?>...</a> +</div> <table border="0"> <tr class="table-header"> <td align="center"> diff --git a/templates/show_preferences.inc b/templates/show_preferences.inc index b9bf1e53..7221c73a 100644 --- a/templates/show_preferences.inc +++ b/templates/show_preferences.inc @@ -66,11 +66,11 @@ if (($GLOBALS['user']->has_access(100)) AND ($user_id == '-1' AND conf('use_auth <li <?php echo $tab_options; ?>> <a href="<?php echo $link; ?>?tab=options&user_id=<?php echo $user_id; ?>" <?php echo $a_options; ?>>Options</a> </li> -<?php if ($user_id != '-1') { ?> +<?php if ($user_id != '-1' && $_SESSION['userdata']['type'] == 'mysql') { ?> <li <?php echo $tab_account; ?>> <a href="<?php echo $link; ?>?tab=account&user_id=<?php echo $user_id; ?>" <?php echo $a_account; ?>>Account</a> </li> -<?php } else { ?> +<?php } elseif ($_SESSION['userdata']['type'] == 'mysql' || $user_id == '-1') { ?> <li <?php echo $tab_system; ?>> <a href="<?php echo $link; ?>?tab=system&user_id=<?php echo $user_id; ?>" <?php echo $a_system; ?>>System</a> </li> |