diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-09 05:41:26 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-09-09 05:41:26 +0000 |
| commit | f4ad61dccfd3b92760659f0382ca51a14e92a8b8 (patch) | |
| tree | 3b7b5743a7d75e14c28fcccf96391c42b674e00c /lib/preferences.php | |
| parent | 83815169ceb211d4449928b21c02539795f81624 (diff) | |
| download | ampache-f4ad61dccfd3b92760659f0382ca51a14e92a8b8.tar.gz ampache-f4ad61dccfd3b92760659f0382ca51a14e92a8b8.tar.bz2 ampache-f4ad61dccfd3b92760659f0382ca51a14e92a8b8.zip | |
- Fixed missing web_path on catalog functions
- New Localplay Controller Abstract class, required for controllers
- Tweaked preferences as needed for localplay mojo
Diffstat (limited to 'lib/preferences.php')
| -rw-r--r-- | lib/preferences.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/preferences.php b/lib/preferences.php index 6ab531fc..b7efc09d 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -292,9 +292,10 @@ function create_preference_input($name,$value) { echo "</select>\n"; break; case 'localplay_controller': - $controllers = get_localplay_controllers(); + $controllers = Localplay::get_controllers(); echo "<select name=\"$name\">\n"; foreach ($controllers as $controller) { + if (!Localplay::is_enabled($controller)) { continue; } $is_selected = ''; if ($value == $controller) { $is_selected = 'selected="selected"'; } echo "\t<option value=\"" . $controller . "\" $is_selected>" . ucfirst($controller) . "</option>\n"; @@ -307,8 +308,8 @@ function create_preference_input($name,$value) { elseif ($value == '1') { $is_global = 'selected="selected"'; } echo "<select name=\"$name\">\n"; echo "<option value=\"0\">" . _('Disabled') . "</option>\n"; - echo "<option value=\"1\" $is_global>" . _('Global') . "</option>\n"; - echo "<option value=\"2\" $is_full>" . _('Local') . "</option>\n"; + echo "<option value=\"1\" $is_global>" . _('Server') . "</option>\n"; + echo "<option value=\"2\" $is_full>" . _('User') . "</option>\n"; echo "</select>\n"; break; case 'theme_name': @@ -342,7 +343,8 @@ function create_preference_input($name,$value) { ${$value} = ' selected="selected"'; echo "<select name=\"$name\">\n"; echo "\t<option value=\"send\"$send>" . _('Send on Add') . "</option>\n"; - echo "\t<option value=\"send_clear\"$send_clear>" . _('Send and Clear') . "</option>\n"; + echo "\t<option value=\"send_clear\"$send_clear>" . _('Send and Clear on Add') . "</option>\n"; + echo "\t<option value=\"clear\"$clear>" . _('Clear on Send') . "</option>\n"; echo "\t<option value=\"default\"$default>" . _('Default') . "</option>\n"; echo "</select>\n"; break; |