diff options
| -rw-r--r-- | artists.php | 4 | ||||
| -rw-r--r-- | flag.php | 2 | ||||
| -rw-r--r-- | lib/class/stats.class.php | 2 | ||||
| -rw-r--r-- | lib/log.lib.php | 2 | ||||
| -rw-r--r-- | lib/themes.php | 4 | ||||
| -rw-r--r-- | search.php | 2 | ||||
| -rw-r--r-- | templates/show_add_playlist.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_alphabet_form.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_disabled_songs.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_edit_album.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_edit_artist.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_edit_song.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_login_form.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_preference_admin.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_rename_artist.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_user_registration.inc.php | 2 |
16 files changed, 18 insertions, 18 deletions
diff --git a/artists.php b/artists.php index a47eb193..743e1ae1 100644 --- a/artists.php +++ b/artists.php @@ -83,7 +83,7 @@ switch($_REQUEST['action']) { show_confirmation ( T_('Renamed artist(s)'), sprintf(T_('%1$s artists have been merged with %2$s'), $count, $artist->name), - conf('web_path') . "/artists.php?action=show&artist=" . $artist->id + Config::get('web_path') . '/artists.php?action=show&artist=' . $artist->id ); } else { $GLOBALS['error']->print_error('general'); @@ -163,7 +163,7 @@ switch($_REQUEST['action']) { show_confirmation ( T_('Renamed artist'), sprintf(T_('%1$s is now known as %2$s'), $artist->name, $newname), - conf('web_path') . "/artists.php?action=show&artist=" . $newid + Config::get('web_path') . "/artists.php?action=show&artist=" . $newid ); } @@ -47,7 +47,7 @@ switch ($action) { case 'show_flag': /* Store where they came from */ $_SESSION['source_page'] = return_referer(); - include(conf('prefix') . '/templates/show_flag.inc.php'); + require Config::get('prefix') . '/templates/show_flag.inc.php'; break; case 'show_remove_flag': diff --git a/lib/class/stats.class.php b/lib/class/stats.class.php index daead709..fb7de902 100644 --- a/lib/class/stats.class.php +++ b/lib/class/stats.class.php @@ -122,7 +122,7 @@ class Stats { /** * get_top * This returns the top X for type Y from the - * last conf('stats_threshold') days + * last stats_threshold days */ public static function get_top($type,$count='',$threshold = '') { diff --git a/lib/log.lib.php b/lib/log.lib.php index 15910255..37a1c790 100644 --- a/lib/log.lib.php +++ b/lib/log.lib.php @@ -121,7 +121,7 @@ function ampache_error_handler($errno, $errstr, $errfile, $errline) { /** * debug_event * This function is called inside ampache, it's actually a wrapper for the - * log_event. It checks for conf('debug') and conf('debug_level') and only + * log_event. It checks config for debug and debug_level and only * calls log event if both requirements are met. */ function debug_event($type, $message, $level, $file = '', $username = '') { diff --git a/lib/themes.php b/lib/themes.php index 28c29a8d..c6d3f32c 100644 --- a/lib/themes.php +++ b/lib/themes.php @@ -82,7 +82,7 @@ function get_theme($name) { */ function get_theme_author($theme_name) { - $theme_path = conf('prefix') . "/themes/" . conf('theme_name') . "/theme.cfg.php"; + $theme_path = Config::get('prefix') . '/themes/' . Config::get('theme_name') . '/theme.cfg.php'; $results = read_config($theme_path); return $results['author']; @@ -95,7 +95,7 @@ function get_theme_author($theme_name) { */ function theme_exists($theme_name) { - $theme_path = conf('prefix') . "/themes/" . $theme_name . "/theme.cfg.php"; + $theme_path = Config::get('prefix') . '/themes/' . $theme_name . '/theme.cfg.php'; if (!file_exists($theme_path)) { return false; @@ -40,7 +40,7 @@ switch ($_REQUEST['action']) { case 'save_as_track': $playlist_id = save_search($_REQUEST); $playlist = new Playlist($playlist_id); - show_confirmation(T_('Search Saved'),sprintf(T_('Your Search has been saved as a track in %s'), $playlist->name),conf('web_path') . "/search.php"); + show_confirmation(T_('Search Saved'),sprintf(T_('Your Search has been saved as a track in %s'), $playlist->name), Config::get('web_path') . "/search.php"); break; case 'save_as_smartplaylist': $playlist = new Search(); diff --git a/templates/show_add_playlist.inc.php b/templates/show_add_playlist.inc.php index 0b8c462b..4e994603 100644 --- a/templates/show_add_playlist.inc.php +++ b/templates/show_add_playlist.inc.php @@ -21,7 +21,7 @@ */ ?> <?php show_box_top(T_('Create a new playlist')); ?> -<form name="songs" method="post" action="<?php echo conf('web_path'); ?>/playlist.php"> +<form name="songs" method="post" action="<?php echo Config::get('web_path'); ?>/playlist.php"> <table> <tr> <td><?php echo T_('Name'); ?>:</td> diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php index d6d2775a..0efcdc9b 100644 --- a/templates/show_alphabet_form.inc.php +++ b/templates/show_alphabet_form.inc.php @@ -20,7 +20,7 @@ * */ ?> -<form style="display:inline;" name="f" method="get" action="<?php echo conf('web_path') . "/$action"; ?>" enctype="multipart/form-data"> +<form style="display:inline;" name="f" method="get" action="<?php echo Config::get('web_path') . "/$action"; ?>" enctype="multipart/form-data"> <label for="match" accesskey="S"><?php echo $text; ?></label> <input type="text" size="5" id="match" name="match" value="<?php echo $match; ?>" /> <input type="hidden" name="action" value="<?php echo scrub_out($_REQUEST['action']); ?>"> diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php index dcdef05c..a69ec924 100644 --- a/templates/show_disabled_songs.inc.php +++ b/templates/show_disabled_songs.inc.php @@ -21,7 +21,7 @@ */ ?> <br /> -<form name="songs" method="post" action="<?php echo conf('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data" style="Display:inline"> +<form name="songs" method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data" style="Display:inline"> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_select" /> diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php index 8e8bb9aa..10856a2c 100644 --- a/templates/show_edit_album.inc.php +++ b/templates/show_edit_album.inc.php @@ -22,7 +22,7 @@ ?> <?php show_box_top(T_('Edit Album')); ?> -<form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php?action=edit_album"> +<form name="edit_album" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_album"> <table class="tabledata"> <tr class="<?php echo flip_class(); ?>"> <td><?php echo T_('Name'); ?></td> diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php index 2a0f3212..73acf847 100644 --- a/templates/show_edit_artist.inc.php +++ b/templates/show_edit_artist.inc.php @@ -22,7 +22,7 @@ ?> <?php show_box_top(T_('Edit Artist')); ?> -<form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php?action=edit_artist"> +<form name="edit_artist" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php?action=edit_artist"> <table class="tabledata"> <tr class="<?php echo flip_class(); ?>"> <td><?php echo T_('Name'); ?></td> diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php index cb0004c7..94781219 100644 --- a/templates/show_edit_song.inc.php +++ b/templates/show_edit_song.inc.php @@ -22,7 +22,7 @@ ?> <?php show_box_top(T_('Edit Song')); ?> -<form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/flag.php"> +<form name="edit_song" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/flag.php"> <table> <tr class="<?php echo flip_class(); ?>"> <td><?php echo T_('File'); ?>:</td> diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php index e9fb4423..a92520ce 100644 --- a/templates/show_login_form.inc.php +++ b/templates/show_login_form.inc.php @@ -79,7 +79,7 @@ function focus(){ document.login.username.focus(); } <?php if (Config::get('allow_public_registration')) { ?> <a class="button" id="registerbutton" href="<?php echo Config::get('web_path'); ?>/register.php"><?php echo T_('Register'); ?></a> - <?php } // end if (conf('allow_public_registration')) ?> + <?php } // end if allow_public_registration ?> </div> </form> diff --git a/templates/show_preference_admin.inc.php b/templates/show_preference_admin.inc.php index 03057ea7..e4388a12 100644 --- a/templates/show_preference_admin.inc.php +++ b/templates/show_preference_admin.inc.php @@ -22,7 +22,7 @@ show_box_top(T_('Preference Administration')); ?> -<form method="post" action="<?php echo conf('web_path'); ?>/admin/preferences.php" enctype="multipart/form-data"> +<form method="post" action="<?php echo Config::get('web_path'); ?>/admin/preferences.php" enctype="multipart/form-data"> <table class="tabledata" cellpadding="0" cellspacing="0"> <colgroup> <col id="col_preference" /> diff --git a/templates/show_rename_artist.inc.php b/templates/show_rename_artist.inc.php index 3f8f277f..74ef6485 100644 --- a/templates/show_rename_artist.inc.php +++ b/templates/show_rename_artist.inc.php @@ -27,7 +27,7 @@ function insert() } </script> <?php /* HINT: Artist Name */ show_box_top(sprintf(T_('Rename %s'), $artist->name)); ?> -<form name="rename_artist" method="post" action="<?php echo conf('web_path'); ?>/artists.php?action=rename&artist=<?php echo $artist->id; ?>" style="Display:inline;"> +<form name="rename_artist" method="post" action="<?php echo Config::get('web_path'); ?>/artists.php?action=rename&artist=<?php echo $artist->id; ?>" style="Display:inline;"> <?php show_artist_pulldown($artist->id, "artist_id", 4); ?> <br /> <?php echo T_('OR'); ?><br /> diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php index 3526a79b..97410638 100644 --- a/templates/show_user_registration.inc.php +++ b/templates/show_user_registration.inc.php @@ -64,7 +64,7 @@ if (Config::get('user_agreement')) { ?> <?php Error::display('user_agreement'); ?> </div> </div> -<?php } // end if(conf('user_agreement')) ?> +<?php } // end if user_agreement ?> <h3><?php echo T_('User Information'); ?></h3> <div class="registerfield require"> <label for="username"><?php echo T_('Username'); ?>: <span class="asterix">*</span></label> |