conf() -> Config::get()

I have a feeling a lot of these are in stale, unused code, but there
might be some actual bugs here.  conf() was replaced a while back.

10 files changed, 10 insertions, 10 deletions

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&amp;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&amp;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>