Updated tempalate, po files, and Install process.

11 files changed, 126 insertions, 19 deletions

diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php
index 19b1507d..1b59cf08 100644
--- a/templates/show_denied.inc.php
+++ b/templates/show_denied.inc.php
@@ -47,7 +47,7 @@ echo _("Functions are disabled in the demo because previous users of the demo ha
 <?php } ?>
 </p>
 <div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
 Pour l'Amour de la Musique.</p>
 </div>
 </body>
diff --git a/templates/show_gather_art.inc.php b/templates/show_gather_art.inc.php
index 1cd126ed..9003748b 100644
--- a/templates/show_gather_art.inc.php
+++ b/templates/show_gather_art.inc.php
@@ -20,7 +20,7 @@
 */
 
 show_box_top();
-echo "<b>" . _('Starting Album Art Search') . ". . .</b><br />\n";
+echo "<strong>" . _('Starting Album Art Search') . ". . .</strong><br />\n";
 echo _('Searched') . ": <span id=\"count_art_" . $catalog_id . "\">" . _('None') . "</span><br />";
 echo _('Reading') . ":<span id=\"read_art_$catalog_id\"></span><br />";
 show_box_bottom(); 
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php
index 5d3a05eb..4738d263 100644
--- a/templates/show_install.inc.php
+++ b/templates/show_install.inc.php
@@ -35,7 +35,7 @@ if (INSTALL != '1') { exit; }
 <div id="text-box">
 
 	<div class="notify">
-		<b><?php echo _('Requirements'); ?></b>
+		<strong><?php echo _('Requirements'); ?></strong>
 		<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"); ?>
 		</p>
@@ -49,7 +49,7 @@ if (INSTALL != '1') { exit; }
 	</div>
 	
 	<div class="content">
-		<b><?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?></b><br />
+		<strong><?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?></strong><br />
 		<dl>
 			<dd><?php echo _("This step creates and inserts the Ampache database, as such please provide a mysql account with database creation rights. This step may take a while depending upon the speed of your computer"); ?></dd>
 		</dl>
@@ -103,7 +103,7 @@ if (INSTALL != '1') { exit; }
 		
 	</div>
 	<div id="bottom">
-    	<p><b>Ampache Installation.</b><br />
+    	<p><strong>Ampache Installation.</strong><br />
     	Pour l'Amour de la Musique</p>
    </div>
 </div>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 486a316e..9eb5183a 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -47,14 +47,14 @@ if (INSTALL != '1') { exit; }
 	<div class="content">
 	<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
 	<?php echo _("Step 2 - Creating the ampache.cfg.php file"); ?><br />
-	<b><?php echo _("Step 3 - Setup Initial Account"); ?></b><br />
+	<strong><?php echo _("Step 3 - Setup Initial Account"); ?></strong><br />
 	<dl>
 	<dd><?php echo _("This step creates your initial Ampache admin account. Once your admin account has been created you will be directed to the login page"); ?></dd>
 	</dl>
 	<?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"; ?>" enctype="multipart/form-data" >
+	<form method="post" action="<?php echo $GLOBALS['php_self'] . "?action=create_account&amp;htmllang=$htmllang&amp;charset=$charset"; ?>" enctype="multipart/form-data" >
 <table>
 <tr>
 	<td class="align"><?php echo _('Username'); ?></td>
@@ -76,7 +76,7 @@ if (INSTALL != '1') { exit; }
 	</form>
 	</div>
 	<div id="bottom">
-    	<p><b>Ampache Installation.</b><br />
+    	<p><strong>Ampache Installation.</strong><br />
     	For the love of Music.</p>
    </div>
 
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index ab266495..3cb13849 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -46,7 +46,7 @@ if (INSTALL != '1') { exit; }
 
 	<div class="content">
 		<?php echo _("Step 1 - Creating and Inserting the Ampache Database"); ?><br />
-		<b><?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?></b><br />
+		<strong><?php echo _("Step 2 - Creating the Ampache.cfg.php file"); ?></strong><br />
 		<dl>
 		<dd><?php echo _("This steps takes the basic config values and generates the config file. It will prompt you to download the config file. Please put the downloaded config file in /config"); ?></dd>
 		</dl>
@@ -133,7 +133,7 @@ if (INSTALL != '1') { exit; }
 		</form>
 	</div>
 	<div id="bottom">
-    	<p><b>Ampache Installation.</b><br />
+    	<p><strong>Ampache Installation.</strong><br />
     	For the love of Music.</p>
 	</div>
 </div>
diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php
index 4ec20405..7e790af2 100644
--- a/templates/show_install_lang.inc.php
+++ b/templates/show_install_lang.inc.php
@@ -20,6 +20,7 @@
 */
 ?>
 <?php if (INSTALL != '1') { exit; } ?>
+<?php $results = 0; ?>
 <!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; ?>">
 <head>
@@ -34,7 +35,7 @@
 </div>
 <div id="text-box">
 	<div class="notify">
-		<b><?php echo _('Requirements'); ?></b>
+		<strong><?php echo _('Requirements'); ?></strong>
 		<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'); ?>
 		</p>
@@ -46,9 +47,109 @@
 <?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>
-	
 	<div class="content">
-		<b>Choose installation language.</b>
+		<h3><?php echo _('System Checks'); ?></h3>
+		<h4><?php echo _('Requirements'); ?></h4>
+		<p><?php echo _('PHP Version:'); ?>
+		<?php
+			if(strcmp('5.1.0',phpversion()) > 0) {
+				echo " <font color=\"red\">ERROR</font> " . phpversion();
+				$results = $results + 1;
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> " . phpversion();
+			}
+		?>
+		</p>
+		<p><?php echo _('Mysql for PHP:'); ?>
+		<?php
+			if (!function_exists('mysql_query')) {
+				echo " <font color=\"red\">ERROR</font> ";
+				$results = $results + 1;
+			} else {
+				if(strcmp('5.0.0',mysql_get_server_info()) > 0) {
+					echo " <font color=\"#FF6600\">&nbsp;&nbsp;&nbsp;WARNING&nbsp;&nbsp;&nbsp;&nbsp;</font> " . mysql_get_server_info() . "<strong>We recommend MySQL version more than 5.0.0</strong>";
+				} else {
+					echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> " . mysql_get_server_info();
+				}
+			}
+		?>
+		</p>
+		<p><?php echo _('PHP Session Support:'); ?>
+		<?php
+			if (!function_exists('session_set_save_handler')) {
+				echo " <font color=\"red\">ERROR</font> ";
+				$results = $results + 1;
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+			}
+		?>
+		</p>
+		<p><?php echo _('PHP ICONV Support:'); ?>
+		<?php
+			if (!function_exists('iconv')) {
+				echo " <font color=\"red\">ERROR</font> ";
+				$results = $results + 1;
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+			}
+		?>
+		</p>
+		<p><?php echo _('PHP PCRE Support:'); ?>
+		<?php
+			if (!function_exists('preg_match')) {
+				echo " <font color=\"red\">ERROR</font> ";
+				$results = $results + 1;
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+			}
+		?>
+		</p>
+		<p><?php echo _('PHP PutENV Support:'); ?>
+		<?php
+			$current = ini_get('memory_limit');
+			$current = substr($current_memory,0,strlen($current_memory)-1);
+			$new_limit = ($current+1) . "M";
+			if (!ini_set(memory_limit,$new_limit)) {
+				echo " <font color=\"red\">ERROR</font> ";
+				$results = $results + 1;
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+			}
+		?>
+		</p>
+		<p><?php echo _('PHP Safe Mode:'); ?>
+		<?php
+			if (ini_get('safe_mode')) {
+				echo " <font color=\"red\">Using Safe Mode.</font> ";
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+			}
+		?>
+		</p>
+		<hr />
+		<h4><?php echo _('Optional'); ?></h4>
+		<p><?php echo _('PHP GetText Support:'); ?>
+		<?php
+			if (!function_exists('gettext')) {
+				echo " <font color=\"#FF6600\">WARNING: This server will use gettext emulator.</font> ";
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+			}
+		?>
+		</p>
+		<p><?php echo _('PHP Mbstring Support:'); ?>
+		<?php
+			if (!function_exists('mb_check_encoding')) {
+				echo " <font color=\"#FF6600\">WARNING</font> ";
+			} else {
+				echo " <font color=\"green\">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;</font> ";
+			}
+		?>
+		</p>
+	</div>
+	<?php if($results == 0) { ?>
+	<div class="content">
+		<strong><?php echo _('Choose installation language.'); ?></strong>
 		<p>
 		<?php Error::display('general'); ?>
 		</p>
@@ -73,8 +174,14 @@ echo "</select>\n";
 
 	</form>
  	</div>
+	<?php } else { /* if results */ ?>
+	<div class="content">
+	<?php echo _('Ampache does not <strong>run</strong> correctly by this server.'); ?><br />
+	<?php echo _('Please contact your server administrator, and fix them.'); ?>
+	</div>
+	<?php } /* if results */ ?>
 	<div id="bottom">
-    	<p><b>Ampache Installation.</b><br />
+    	<p><strong>Ampache Installation.</strong><br />
     	For the love of Music.</p>
    </div>
 </div>
diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php
index 19d4e308..55cb78db 100644
--- a/templates/show_registration_confirmation.inc.php
+++ b/templates/show_registration_confirmation.inc.php
@@ -46,7 +46,7 @@ $web_path = Config::get('web_path');
 <a href="<?php echo Config::get('web_path'); ?>/login.php"><?php echo _('Return to Login Page'); ?></a>
 </div><!--end <div>id="maincontainer-->
 <div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
 Pour l'Amour de la Musique.</p>
 </div>
 </body>
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 4fa81cf3..43338288 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -264,7 +264,7 @@
 </table>
 </div>
 <div id="bottom">
-<p><b>Ampache Debug.</b><br />
+<p><strong>Ampache Debug.</strong><br />
 For the love of Music.</p>
 </div>
 </body>
diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php
index ab9e1ee2..085fa17c 100644
--- a/templates/show_test_config.inc.php
+++ b/templates/show_test_config.inc.php
@@ -74,7 +74,7 @@ This variable no longer exists, all downsampling/transcoding is handled by the t
 <br />
 </div>
 <div id="bottom">
-<p><b>Ampache Debug.</b><br />
+<p><strong>Ampache Debug.</strong><br />
 For the love of Music.</p>
 </div>
 </body>
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php
index da9bae91..99e8796f 100644
--- a/templates/show_user_activate.inc.php
+++ b/templates/show_user_activate.inc.php
@@ -56,7 +56,7 @@ $web_path = Config::get('web_path');
 <?php } ?>
 </div><!--end <div>id="maincontainer-->
 <div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
 Pour l'Amour de la Musique.</p>
 </div>
 </body>
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index f35e6bfe..c435293d 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -137,7 +137,7 @@ if (Config::get('user_agreement')) { ?>
 </form>
 </div><!--end <div>id="maincontainer-->
 <div id="bottom">
-<p><b>Ampache</b><br />
+<p><strong>Ampache</strong><br />
 Pour l'Amour de la Musique.</p>
 </div>
 </body>