diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-19 07:58:16 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-19 07:58:16 +0000 |
| commit | 8e1e11bdb72832ce5297471f21e2b15cf2b95c55 (patch) | |
| tree | 9d5db696642c390f1fa182c651da7be61bf89a62 | |
| parent | 466198e1e89da048a3d861204e13eae911bd13f2 (diff) | |
| download | ampache-8e1e11bdb72832ce5297471f21e2b15cf2b95c55.tar.gz ampache-8e1e11bdb72832ce5297471f21e2b15cf2b95c55.tar.bz2 ampache-8e1e11bdb72832ce5297471f21e2b15cf2b95c55.zip | |
fixed preference bug that made it impossible for admins to edit users preferences
| -rw-r--r-- | admin/preferences.php | 1 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 2 | ||||
| -rw-r--r-- | templates/show_preferences.inc | 10 |
3 files changed, 9 insertions, 4 deletions
diff --git a/admin/preferences.php b/admin/preferences.php index ba4802e3..bc3c653f 100644 --- a/admin/preferences.php +++ b/admin/preferences.php @@ -53,6 +53,7 @@ switch($action) { update_preferences($user_id); if ($user_id != '-1') { $fullname = "ADMIN - " . $temp_user->fullname; + $_REQUEST['action'] = 'user'; $preferences = $temp_user->get_preferences(); } else { diff --git a/docs/CHANGELOG b/docs/CHANGELOG index b1e279d7..cb5ab55d 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.3.3 + - Fixed a bug with admins ability to set the preferences of a + specific user - Fixed logic on force http that was causing it not to work under specific configurations - Fixed a flagged and rated item clean issue with catalogs diff --git a/templates/show_preferences.inc b/templates/show_preferences.inc index 3db56651..6514d88f 100644 --- a/templates/show_preferences.inc +++ b/templates/show_preferences.inc @@ -31,6 +31,8 @@ */ $current_tab = scrub_in($_REQUEST['tab']); if (!$current_tab) { $current_tab = 'interface'; } +// HORRIBLE HACK! +if ($_REQUEST['action'] == 'user') { $action_txt = '&action=user'; } $link = conf('web_path') . $target; /* CSS construction bs */ @@ -57,17 +59,17 @@ if (($GLOBALS['user']->has_access(100)) AND ($user_id == '-1' AND conf('use_auth <div id="tabcontainer"> <ul id="tablist"> <li <?php echo $tab_interface; ?>> - <a href="<?php echo $link; ?>?tab=interface&user_id=<?php echo $user_id; ?>" <?php echo $a_interface; ?>><?php echo _('Interface'); ?></a> + <a href="<?php echo $link; ?>?tab=interface&user_id=<?php echo $user_id . $action_txt; ?>" <?php echo $a_interface; ?>><?php echo _('Interface'); ?></a> </li> <li <?php echo $tab_streaming; ?>> - <a href="<?php echo $link; ?>?tab=streaming&user_id=<?php echo $user_id; ?>" <?php echo $a_streaming; ?>><?php echo _('Streaming'); ?></a> + <a href="<?php echo $link; ?>?tab=streaming&user_id=<?php echo $user_id . $action_txt; ?>" <?php echo $a_streaming; ?>><?php echo _('Streaming'); ?></a> </li> <li <?php echo $tab_options; ?>> - <a href="<?php echo $link; ?>?tab=options&user_id=<?php echo $user_id; ?>" <?php echo $a_options; ?>><?php echo _('Options'); ?></a> + <a href="<?php echo $link; ?>?tab=options&user_id=<?php echo $user_id . $action_txt; ?>" <?php echo $a_options; ?>><?php echo _('Options'); ?></a> </li> <?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; ?>><?php echo _('Account'); ?></a> + <a href="<?php echo $link; ?>?tab=account&user_id=<?php echo $user_id . $action_txt; ?>" <?php echo $a_account; ?>><?php echo _('Account'); ?></a> </li> <?php } elseif ($_SESSION['userdata']['type'] == 'mysql' || $user_id == '-1') { ?> <li <?php echo $tab_system; ?>> |