diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-08-30 19:49:39 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-08-30 19:49:39 +0000 |
| commit | 3267cf14b9fa2ffdf1918fe68dd067ee932a5867 (patch) | |
| tree | 4f9ff7f027b61d52f5620943ccd66a22ee1a796d /templates | |
| parent | 96d7639ca1e320019e870c109e42f0618c16cf6b (diff) | |
| download | ampache-3267cf14b9fa2ffdf1918fe68dd067ee932a5867.tar.gz ampache-3267cf14b9fa2ffdf1918fe68dd067ee932a5867.tar.bz2 ampache-3267cf14b9fa2ffdf1918fe68dd067ee932a5867.zip | |
sync from branch
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_install.inc.php | 8 | ||||
| -rw-r--r-- | templates/show_install_account.inc.php | 4 | ||||
| -rw-r--r-- | templates/show_install_config.inc.php | 8 | ||||
| -rw-r--r-- | templates/show_install_lang.inc.php | 4 |
4 files changed, 14 insertions, 10 deletions
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index 5c0ebb90..b42b6769 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -60,7 +60,7 @@ if (INSTALL != '1') { exit; } <?php Error::display('general'); ?> <br /> <span class="header2"><?php echo _('Insert Ampache Database'); ?></span> - <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?action=create_db&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > + <form method="post" action="<?php echo WEB_PATH . "?action=create_db&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > <table> <tr> <td class="align"><?php echo _("Desired Database Name"); ?></td> @@ -95,6 +95,10 @@ if (INSTALL != '1') { exit; } <td><input type="checkbox" name="overwrite_db" value="1" /></td> </tr> <tr> + <td class="align"><?php echo _('Use Existing Database'); ?></td> + <td><input type="checkbox" name="existing_db" value="1" /></td> +</tr> +<tr> <td> </td> <td><input type="submit" value="<?php echo _("Insert Database"); ?>" /></td> </tr> diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php index e751a1bd..1e6991d3 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -55,7 +55,7 @@ if (INSTALL != '1') { exit; } <?php Error::display('general'); ?> <br /> <span class="header2"><?php echo _('Create Admin Account'); ?></span> - <form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > + <form method="post" action="<?php echo WEB_PATH . "?action=create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" > <table> <tr> <td class="align"><?php echo _('Username'); ?></td> diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 2c8f630c..43c55c3b 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -55,7 +55,7 @@ if (INSTALL != '1') { exit; } <?php Error::display('general'); ?> <br /> <span class="header2"><?php echo _('Generate Config File'); ?></span> - <form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_config"; ?>" enctype="multipart/form-data" > + <form method="post" action="<?php echo WEB_PATH . "?action=create_config"; ?>" enctype="multipart/form-data" > <table> <tr> <td class="align"><?php echo _('Web Path'); ?></td> @@ -123,13 +123,13 @@ if (INSTALL != '1') { exit; } <tr> <td> </td> <td> - <?php $check_url = $GLOBALS['php_self'] . "?action=show_create_config&htmllang=$htmllang&charset=$charset&local_db=" . $_REQUEST['local_db'] . "&local_host=" . $_REQUEST['local_host']; ?> + <?php $check_url = WEB_PATH . "?action=show_create_config&htmllang=$htmllang&charset=$charset&local_db=" . $_REQUEST['local_db'] . "&local_host=" . $_REQUEST['local_host']; ?> <a href="<?php echo $check_url; ?>">[<?php echo _('Check for Config'); ?>]</a> </td> </tr> </table> <br /> - <form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data"> + <form method="post" action="<?php echo WEB_PATH . "?action=show_create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data"> <input type="submit" value="<?php echo _('Continue to Step 3'); ?>" /> </form> </div> diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index c9686b10..a813d80f 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -142,7 +142,7 @@ <p> <?php Error::display('general'); ?> </p> -<form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?action=init"; ?>" enctype="multipart/form-data" > +<form method="post" action="<?php echo WEB_PATH . "?action=init"; ?>" enctype="multipart/form-data" > <?php $languages = get_languages(); |