diff options
| -rwxr-xr-x | docs/CHANGELOG | 2 | ||||
| -rw-r--r-- | templates/show_install.inc.php | 3 | ||||
| -rw-r--r-- | templates/show_install_account.inc.php | 3 | ||||
| -rw-r--r-- | templates/show_install_config.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_install_lang.inc.php | 3 |
5 files changed, 11 insertions, 4 deletions
diff --git a/docs/CHANGELOG b/docs/CHANGELOG index c16c5ac0..78d48e5c 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,8 @@ -------------------------------------------------------------------------- v.3.6-Alpha1 + - Add full path to the files needed by the installation just to + make it a little clearer - Fixed potential endless loop with malformed genre tags in mp3s (Thx Bernhard Weyrauch) - Fixed web path always returning false on /test.php diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index afd68f33..9465ca3f 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ if (INSTALL != '1') { exit; } +$prefix = dirname(__FILE__); $dir = is_rtl($htmllang) ? 'rtl' : 'ltr'; ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -43,7 +44,7 @@ $dir = is_rtl($htmllang) ? 'rtl' : 'ltr'; </p> <ul> <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li> - <li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file"); ?></li> + <li><?php echo sprintf(_("Your webserver has read access to the %s file and the %s file"),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.dist'); ?></li> </ul> <p> <?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index 9c52b93e..8f51a714 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -20,6 +20,7 @@ */ if (INSTALL != '1') { exit; } +$prefix = dirname(__FILE__); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> @@ -41,7 +42,7 @@ if (INSTALL != '1') { exit; } <br /> <ul> <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li> - <li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.dist.php file"); ?></li> + <li><?php echo sprintf(_("Your webserver has read access to the %s file and the %s file"),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.dist'); ?></li> </ul> <?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?> </div> diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 080ee358..383591e2 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -20,6 +20,7 @@ */ if (INSTALL != '1') { exit; } +$prefix = dirname(__FILE__); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> @@ -40,7 +41,8 @@ if (INSTALL != '1') { exit; } <br /> <ul> <li><?php echo _("A MySQL Server with a username and password that can create/modify databases"); ?></li> - <li><?php echo _("Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file"); ?></li> + <li><?php echo sprintf(_("Your webserver has read access to the %s file and the %s file"),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.dist'); ?></li> + </ul> <?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?> </div> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index f2bc46a1..c893ad15 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -18,6 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +$prefix = dirname(__FILE__); ?> <?php if (INSTALL != '1') { exit; } ?> <?php $results = 0; ?> @@ -42,7 +43,7 @@ </p> <ul> <li><?php echo _('A MySQL Server with a username and password that can create/modify databases'); ?></li> - <li><?php echo _('Your webserver has read access to the /sql/ampache.sql file and the /config/ampache.cfg.php.dist file'); ?></li> + <li><?php echo sprintf(_("Your webserver has read access to the %s file and the %s file"),$prefix . '/sql/ampache.sql',$prefix . '/config/ampache.cfg.dist'); ?></li> </ul> <p> <?php echo _("Once you have ensured that you have the above requirements please fill out the information below. You will only be asked for the required config values. If you would like to make changes to your ampache install at a later date simply edit /config/ampache.cfg.php"); ?> |