Fixed missing DOCTYPE and other required stuff on the install pages

author: pb1dft <pb1dft@ampache> 2006-11-20 00:35:34 +0000
committer: pb1dft <pb1dft@ampache> 2006-11-20 00:35:34 +0000
commit: 01b784da2d7dcfcd08739e7ae8ed1e890805f12d (patch)
tree: 3ed6b171aebe6f3ff89b6631a8deb5028c087a77
parent: 78de76eb7af36bb5c174ee7c3fafb41814fec3ed (diff)
download: ampache-01b784da2d7dcfcd08739e7ae8ed1e890805f12d.tar.gz
ampache-01b784da2d7dcfcd08739e7ae8ed1e890805f12d.tar.bz2
ampache-01b784da2d7dcfcd08739e7ae8ed1e890805f12d.zip
5 files changed, 37 insertions, 34 deletions
diff --git a/install.php b/install.php
index db59dd59..849cda5d 100644
--- a/install.php
+++ b/install.php
@@ -192,7 +192,7 @@ switch ($action) {
         case 'init':
 		/* First step of installation */
 		// Get the language
-		$htmllang = $_REQUEST['htmllang'];
+		$htmllang = $_POST['htmllang'];
 
 		// Set the lang in the conf array
 		conf(array('lang'=>$htmllang));
@@ -207,16 +207,16 @@ switch ($action) {
 				  'nl_NL' => 'ISO-8859-15',
 				  'tr_TR' => 'iso-8859-9',
 				  'zh_CN' => 'GBK');
-		$charset = $charsets[$_REQUEST['htmllang']];
-		
+		$charset = $charsets[$_POST['htmllang']];
+
 		// Set the site_charset in the conf array
- 	        conf(array('site_charset'=>$charsets[$_REQUEST['htmllang']]));
+ 	        conf(array('site_charset'=>$charsets[$_POST['htmllang']]));
 			
 		// Now we make voodoo with the Load gettext mojo
 		load_gettext();
 
 		// Page ready  :)
-		header ("Content-Type: text/html; charset=" . conf('site_charset'));
+		header ("Content-Type: text/html; charset=$charset");
 		require_once('templates/show_install.inc');
 		break;
 		
@@ -225,8 +225,8 @@ switch ($action) {
 		if (!function_exists('mysql_query')) { 
 			header ("Location: test.php");
 		}
-
-
+		$htmllang = "en_US";
+		header ("Content-Type: text/html; charset=UTF-8");
 		/* Show the language options first */
 		require_once('templates/show_install_lang.inc.php');
 	break;
diff --git a/templates/show_install.inc b/templates/show_install.inc
index 0c112227..92c649b3 100644
--- a/templates/show_install.inc
+++ b/templates/show_install.inc
@@ -1,10 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
 <head>
 <title>Ampache :: For The Love Of Music - Install</title>
+<?php //require_once(conf('prefix') . "/templates/install.css"); ?>
 </head>
 <body>
 <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script>
-<?php require_once(conf('prefix') . "/templates/install.css"); ?>
 <div id="header"> 
 <h1><?php echo _("Ampache Installation"); ?></h1>
 <p>For the love of Music</p>
@@ -15,11 +16,12 @@
 		<b><?php echo _("Requirements"); ?></b>
 		<p>
 		<?php echo _("This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites"); ?>
-		<br />
+		</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>
 		</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"); ?>
 		</p>
 	</div>
@@ -34,19 +36,19 @@
 		<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&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data" >
+		<form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] .  $_SERVER['PHP_SELF'] . "?action=create_db&amp;htmllang=$htmllang&amp;charset=$charset"; ?>" enctype="multipart/form-data" >
 <table>
 <tr>
 	<td class="align"><?php echo _("Desired Database Name"); ?></td>
-	<td><input type="textbox" name="local_db" value="ampache" /></td>
+	<td><input type="text" name="local_db" value="ampache" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("MySQL Hostname"); ?></td>
-	<td><input type="textbox" name="local_host" value="localhost" /></td>
+	<td><input type="text" name="local_host" value="localhost" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("MySQL Administrative Username"); ?></td>
-	<td><input type="textbox" name="local_username" value="root" /></td>
+	<td><input type="text" name="local_username" value="root" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("MySQL Administrative Password"); ?></td>
@@ -54,12 +56,11 @@
 </tr>
 <tr>
 	<td class="align"><?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>
+	<td><input type="checkbox" value="create_db_user" name="db_user" onClick="flipField('db_username');flipField('db_password');" /></td>
+</tr>
 <tr>
 	<td class="align"><?php echo _("Ampache Database Username"); ?></td>
-	<td><input type="textbox" id="db_username" name="db_username" value="ampache" disabled="disabled" /></td>
+	<td><input type="text" id="db_username" name="db_username" value="ampache" disabled="disabled" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("Ampache Database User Password"); ?></td>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index b2e580b1..e6257688 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -25,12 +25,13 @@
 */
 
 ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
 <head>
 <title>Ampache :: For The Love Of Music - Install</title>
+<?php require_once(conf('prefix') . "/templates/install.css"); ?>
 </head>
 <body>
-<?php require_once(conf('prefix') . "/templates/install.css"); ?>
 <div id="header"> 
 <h1><?php echo _("Ampache Installation"); ?></h1>
 <p>For the love of Music</p>
@@ -62,7 +63,7 @@
 <table>
 <tr>
 	<td class="align"><?php echo _("Username"); ?></td>
-	<td><input type="textbox" name="local_username" value="admin" /></td>
+	<td><input type="text" name="local_username" value="admin" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("Password"); ?></td>
diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc
index 28296c84..1cd287c7 100644
--- a/templates/show_install_config.inc
+++ b/templates/show_install_config.inc
@@ -25,12 +25,13 @@
 */
 
 ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>">
 <head>
 <title>Ampache :: For The Love Of Music - Install</title>
+<?php require_once(conf('prefix') . "/templates/install.css"); ?>
 </head>
 <body>
-<?php require_once(conf('prefix') . "/templates/install.css"); ?>
 <div id="header"> 
 <h1><?php echo _("Ampache Installation"); ?></h1>
 <p>For the love of Music</p>
@@ -53,7 +54,7 @@
 		<dl>
 		<dd><?php echo _("This steps takes the basic config values, and first attempts to write them out directly to your webserver. If access is denied it will prompt you to download the config file. Please put the downloaded config file in /config"); ?></dd>
 		</dl>
-		<?php echo _("Step 3 - Setup Initial Account"); ?></a><br />
+		<?php echo _("Step 3 - Setup Initial Account"); ?><br />
 		<br /><br />
 		<span class="header2">Generate Config File</span>
 		<?php echo $GLOBALS['error']->print_error('general'); ?>
@@ -61,19 +62,19 @@
 		<table>
 <tr>
 	<td class="align"><?php echo _("Web Path"); ?></td>
-	<td class="align"><input type="textbox" name="web_path" value="<?php echo $web_path; ?>" /></td>
+	<td class="align"><input type="text" name="web_path" value="<?php echo $web_path; ?>" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("Desired Database Name"); ?></td>
-	<td class="align"><input type="textbox" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
+	<td class="align"><input type="text" name="local_db" value="<?php echo scrub_out($_REQUEST['local_db']); ?>" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("MySQL Hostname"); ?></td>
-	<td class="align"><input type="textbox" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
+	<td class="align"><input type="text" name="local_host" value="<?php echo scrub_out($_REQUEST['local_host']); ?>" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("MySQL Username"); ?></td>
-	<td class="align"><input type="textbox" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
+	<td class="align"><input type="text" name="local_username" value="<?php echo scrub_out($_REQUEST['local_username']); ?>" /></td>
 </tr>
 <tr>
 	<td class="align"><?php echo _("MySQL Password"); ?></td>
@@ -131,8 +132,8 @@
 		</tr>
 		</table>
 		<br />
-		<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account&htmllang=$htmllang&charset=$charset"; ?>" enctype="multipart/form-data">
-		<input type="Submit" value="Continue to Step 3" />
+		<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=show_create_account&amp;htmllang=$htmllang&amp;charset=$charset"; ?>" enctype="multipart/form-data">
+		<input type="submit" value="Continue to Step 3" />
 		</form>
 	</div>
 	<div id="bottom">
diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php
index 330560a7..5d87c1be 100644
--- a/templates/show_install_lang.inc.php
+++ b/templates/show_install_lang.inc.php
@@ -1,11 +1,11 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="$htmllang" lang="$htmllang">
 <head>
 <title>Ampache :: Pour l'Amour de la Musique - Install</title>
+<?php require_once(conf('prefix') . "/templates/install.css"); ?>
 </head>
 <body>
 <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script>
-<?php require_once(conf('prefix') . "/templates/install.css"); ?>
 <div id="header"> 
 <h1><?php echo _('Ampache Installation'); ?></h1>
 <p>For the love of Music</p>
@@ -15,11 +15,12 @@
 		<b><?php echo _("Requirements"); ?></b>
 		<p>
 		<?php echo _('This Page handles the installation of the Ampache database and the creation of the ampache.cfg.php file. Before you continue please make sure that you have the following pre-requisites'); ?>
-		<br />
+		</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>
 		</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"); ?>
 		</p>
 	</div>
@@ -28,7 +29,7 @@
 		<b>Choose installation language.</b>
 		<p>
 		<?php echo $GLOBALS['error']->print_error('general'); ?>
-
+		</p>
 <form method="post" action="<?php echo $http_type . $_SERVER['HTTP_HOST'] .  $_SERVER['PHP_SELF'] . "?action=init"; ?>" enctype="multipart/form-data" >
 
 <?
@@ -46,11 +47,10 @@ foreach ($languages as $lang=>$name) {
 echo "</select>\n";
 ?>
 
-<input type="submit" value="<?php echo _('Start configuration'); ?>">
+<input type="submit" value="<?php echo _('Start configuration'); ?>" />
 
 	</form>
- </p>
-	</div>
+ 	</div>
 	<div id="bottom">
     	<p><b>Ampache Installation.</b><br />
     	For the love of Music.</p>
author	pb1dft <pb1dft@ampache>	2006-11-20 00:35:34 +0000
committer	pb1dft <pb1dft@ampache>	2006-11-20 00:35:34 +0000
commit	01b784da2d7dcfcd08739e7ae8ed1e890805f12d (patch)
tree	3ed6b171aebe6f3ff89b6631a8deb5028c087a77
parent	78de76eb7af36bb5c174ee7c3fafb41814fec3ed (diff)
download	ampache-01b784da2d7dcfcd08739e7ae8ed1e890805f12d.tar.gz ampache-01b784da2d7dcfcd08739e7ae8ed1e890805f12d.tar.bz2 ampache-01b784da2d7dcfcd08739e7ae8ed1e890805f12d.zip