diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-31 09:46:22 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-31 09:46:22 +0000 |
| commit | fb3f5189882db644e443ebaf4e5e1efdb84d4348 (patch) | |
| tree | 23bb5b6a297102d31a8fcdf56141c8f52f2907d6 /templates | |
| parent | 621f007155dc1e3a8a5b916e246018df4a25d4f3 (diff) | |
| download | ampache-fb3f5189882db644e443ebaf4e5e1efdb84d4348.tar.gz ampache-fb3f5189882db644e443ebaf4e5e1efdb84d4348.tar.bz2 ampache-fb3f5189882db644e443ebaf4e5e1efdb84d4348.zip | |
fixed up install script and updated sql file
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_install.inc | 15 | ||||
| -rw-r--r-- | templates/show_install_account.inc.php | 5 | ||||
| -rw-r--r-- | templates/show_install_config.inc | 11 |
3 files changed, 24 insertions, 7 deletions
diff --git a/templates/show_install.inc b/templates/show_install.inc index 994cce73..8203af62 100644 --- a/templates/show_install.inc +++ b/templates/show_install.inc @@ -29,6 +29,7 @@ <title>Ampache :: For The Love Of Music - Install</title> </head> <body> +<script src="lib/general.js" language="javascript" type="text/javascript"></script> <?php require_once(conf('prefix') . "/templates/style.inc"); ?> <div class="text-box"> <span class="header1"><?php echo _("Ampache Installation"); ?></span> @@ -51,6 +52,7 @@ <?php echo _("Step 3 - Setup Initial Account"); ?><br /> <br /><br /> <span class="header2">Insert Ampache Database</span> +<?php echo $GLOBALS['error']->print_error('general'); ?> <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'] . "?action=create_db"; ?>" enctype="multipart/form-data" > <table cellpadding="5" cellspacing="0" border="0"> <tr> @@ -70,6 +72,19 @@ <td><input type="password" name="local_pass" /></td> </tr> <tr> + <td><?php echo _("Create Database User for New Database"); ?>? </td> + <td> + <input type="checkbox" value="create_db_user" name="db_user" onclick="flipField('db_username');flipField('db_password');"> + </td> +<tr> + <td><?php echo _("Ampache Database Username"); ?></td> + <td><input type="textbox" id="db_username" name="db_username" value="ampache" disabled="disabled" /></td> +</tr> +<tr> + <td><?php echo _("Ampache Database User Password"); ?></td> + <td><input type="password" id="db_password" name="db_password" value="" disabled="disabled" /></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 1cc18fff..d8a0f721 100644 --- a/templates/show_install_account.inc.php +++ b/templates/show_install_account.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2005 Ampache.org + Copyright (c) 2001 - 2006 Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -53,7 +53,8 @@ </dl> <br /><br /> <span class="header2">Create Admin Account</span> -<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_account"; ?>" enctype="multipart/form-data" > +<?php echo $GLOBALS['error']->print_error('general'); ?> +<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account"; ?>" enctype="multipart/form-data" > <table cellpadding="5" cellspacing="0" border="0"> <tr> <td><?php echo _("Username"); ?></td> diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc index 2f58215d..ba4478fb 100644 --- a/templates/show_install_config.inc +++ b/templates/show_install_config.inc @@ -53,6 +53,7 @@ <?php echo _("Step 3 - Setup Initial Account"); ?></a><br /> <br /><br /> <span class="header2">Generate Config File</span> +<?php echo $GLOBALS['error']->print_error('general'); ?> <form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=create_config"; ?>" enctype="multipart/form-data" > <table cellpadding="5" cellspacing="0" border="0"> <tr> @@ -61,15 +62,15 @@ </tr> <tr> <td><?php echo _("Desired Database Name"); ?></td> - <td><input type="textbox" name="local_db" value="<?php echo $_REQUEST['local_db']; ?>" /></td> + <td><input type="textbox" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td> </tr> <tr> <td><?php echo _("MySQL Hostname"); ?></td> - <td><input type="textbox" name="local_host" value="<?php echo $_REQUEST['local_host']; ?>" /></td> + <td><input type="textbox" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td> </tr> <tr> <td><?php echo _("MySQL Username"); ?></td> - <td><input type="textbox" name="local_username" value="username" /></td> + <td><input type="textbox" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td> </tr> <tr> <td><?php echo _("MySQL Password"); ?></td> @@ -121,12 +122,12 @@ <tr> <td> </td> <td> - <a href="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF']; ?>?action=show_create_config&local_db=<?php echo $_REQUEST['local_db']; ?>&local_host=<?php echo $_REQUEST['local_host']; ?>">[<?php echo _("Check for Config"); ?>]</a> + <a href="<?php echo $http_type . $_SERVER['HTTP_HOST'] . $GLOBALS['php_self']; ?>?action=show_create_config&local_db=<?php echo $_REQUEST['local_db']; ?>&local_host=<?php echo $_REQUEST['local_host']; ?>">[<?php echo _("Check for Config"); ?>]</a> </td> </tr> </table> <br /> -<form method="post" action="<?php echo $_SERVER['PHP_SELF'] . "?action=show_create_account"; ?>" enctype="multipart/form-data"> +<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account"; ?>" enctype="multipart/form-data"> <input type="Submit" value="Continue to Step 3" /> </form> </div> |