diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-23 06:49:34 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-23 06:49:34 +0000 |
| commit | c47908044458821b83ad1954dd3bc29248e2fc4b (patch) | |
| tree | b72f93cac1b8fffaa6a047e1f2ebea5ff5d2757a /lib | |
| parent | cb14ac7b4bddc4f8ee59ef4b7d7e6ddb9cacbaaf (diff) | |
| download | ampache-c47908044458821b83ad1954dd3bc29248e2fc4b.tar.gz ampache-c47908044458821b83ad1954dd3bc29248e2fc4b.tar.bz2 ampache-c47908044458821b83ad1954dd3bc29248e2fc4b.zip | |
adding it_IT and fixing a bug that let guests use batch download
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/general.lib.php | 8 | ||||
| -rw-r--r-- | lib/preferences.php | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/general.lib.php b/lib/general.lib.php index 6e38bf0e..decd5fc1 100644 --- a/lib/general.lib.php +++ b/lib/general.lib.php @@ -468,13 +468,15 @@ function scrub_in($str) { /*! @function batch_ok() @discussion return boolean if user can batch download + //FIXME: This needs to be fixed, it shouldn't be an independent function + //FIXME: It should reference a central one maybe the access object? */ function batch_ok( ) { - global $user; + // i check this before showing any link // should make it easy to tie to a new pref if you choose to add it - if (conf('allow_zip_download')) { - return( $user->prefs['download'] ); + if (conf('allow_zip_download') AND $GLOBALS['user']->has_access(25)) { + return( $GLOBALS['user']->prefs['download'] ); } // if allowed zip downloads return false; diff --git a/lib/preferences.php b/lib/preferences.php index 3a7243ef..8e7135d7 100644 --- a/lib/preferences.php +++ b/lib/preferences.php @@ -293,13 +293,14 @@ function create_preference_input($name,$value) { $var_name = $value . "_lang"; ${$var_name} = "selected=\"selected\""; echo "<select name=\"$name\">\n"; + echo "\t<option value=\"de_DE\" $de_DE_lang>" . _("German") . "</option>\n"; echo "\t<option value=\"en_US\" $en_US_lang>" . _("English") . "</option>\n"; echo "\t<option value=\"en_GB\" $en_GB_lang>" . _("British English") . "</option>\n"; - echo "\t<option value=\"de_DE\" $de_DE_lang>" . _("German") . "</option>\n"; - echo "\t<option value=\"fr_FR\" $fr_FR_lang>" . _("French") . "</option>\n"; - echo "\t<option value=\"tr_TR\" $tr_TR_lang>" . _("Turkish") . "</option>\n"; echo "\t<option value=\"es_ES\" $es_ES_lang>" . _("Spanish") . "</option>\n"; + echo "\t<option value=\"fr_FR\" $fr_FR_lang>" . _("French") . "</option>\n"; + echo "\t<option value=\"it_IT\" $it_IT_lang>" . _("Italian") . "</option>\n"; echo "\t<option value=\"nl_NL\" $nl_NL_lang>" . _("Dutch") . "</option>\n"; + echo "\t<option value=\"tr_TR\" $tr_TR_lang>" . _("Turkish") . "</option>\n"; echo "\t<option value=\"zh_CN\" $zh_CN_lang>" . _("Simplified Chinese") . "</option>\n"; echo "</select>\n"; break; |