From 2a83cc96dc9c2588c5f3ad02d73c59f2ab19c58b Mon Sep 17 00:00:00 2001 From: Karl 'vollmerk' Vollmer Date: Sun, 8 Mar 2009 05:08:21 +0000 Subject: more work for alpha2 release, clean up install and debug a bit --- templates/install.css | 14 ++--- templates/show_install.inc.php | 2 +- templates/show_install_check.inc.php | 112 +++++++++++++++++++++++++++++++++ templates/show_install_config.inc.php | 12 ++-- templates/show_install_lang.inc.php | 114 ++++------------------------------ templates/show_test.inc.php | 64 +++++++------------ 6 files changed, 159 insertions(+), 159 deletions(-) create mode 100644 templates/show_install_check.inc.php (limited to 'templates') diff --git a/templates/install.css b/templates/install.css index 10eb86eb..f5d8a8a4 100644 --- a/templates/install.css +++ b/templates/install.css @@ -1,6 +1,6 @@ /** * - * Copyright (c) 2001 - 2007 Ampache.org + * Copyright (c) Ampache.org * All rights reserved. * * This program is free software; you can redistribute it and/or @@ -118,15 +118,15 @@ textarea:focus{ /* Extras */ .ok { -font-weight:bold; -color:#009900; -margin:10px 10px 10px 10px; + font-weight:bold; + color:#009900; + margin:10px 10px 10px 10px; } .notok { -font-weight:bold; -color:#FF3300; -margin:10px 10px 10px 10px; + font-weight:bold; + color:#FF3300; + margin:3px 3px 3px 3px; } /* Bottom */ diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php index 799ba65b..7c2bce79 100644 --- a/templates/show_install.inc.php +++ b/templates/show_install.inc.php @@ -36,7 +36,7 @@ if (INSTALL != '1') { exit; }
- +

diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php new file mode 100644 index 00000000..896a3cbd --- /dev/null +++ b/templates/show_install_check.inc.php @@ -0,0 +1,112 @@ + + +

+

: + +

+

: + +

+

: + +

+

: + +

+

: + +

+

: + +

+
+

+

: + +

+

: + +

diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php index 7586cf9b..080ee358 100644 --- a/templates/show_install_config.inc.php +++ b/templates/show_install_config.inc.php @@ -92,12 +92,10 @@ if (INSTALL != '1') { exit; } [ ERROR "; + echo debug_result('',false); } else { - $status['read_config'] = 'true'; - echo " OK "; + echo debug_result('',true); } ?> ] @@ -111,12 +109,10 @@ if (INSTALL != '1') { exit; } ERROR "; + echo debug_result('',false); } else { - $status['parse_config'] = 'true'; - echo " OK "; + echo debug_result('',true); } ?> ] diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php index a079708c..f2bc46a1 100644 --- a/templates/show_install_lang.inc.php +++ b/templates/show_install_lang.inc.php @@ -36,7 +36,7 @@
- +

@@ -47,103 +47,19 @@

-
+ +
+
-

-

-

: - ERROR " . phpversion() . " " . _('Hash Function Exists') . " " - . print_boolean(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_boolean(in_array('sha256',$algos)); - $results = $results + 1; - } else { - echo "    OK    " . phpversion() . ""; - } - ?> -

-

: - ERROR "; - $results = $results + 1; - } else { - if(strcmp('5.0.0',mysql_get_client_info()) > 0) { - echo "    WARNING     " . mysql_get_client_info() . "We recommend MySQL version more than 5.0.0"; - } else { - echo "    OK    "; - echo "" . mysql_get_client_info() . ""; - } - } - ?> -

-

: - ERROR "; - $results = $results + 1; - } else { - echo "    OK     "; - } - ?> -

-

: - ERROR "; - $results = $results + 1; - } else { - echo "    OK     "; - } - ?> -

-

: - ERROR "; - $results = $results + 1; - } else { - echo "    OK     "; - } - ?> -

-

: - ERROR "; - $results = $results + 1; - } else { - echo "    OK     "; - } - ?> -

-
-

-

: - " . _('WARNING: This server will use gettext emulator.') . " "; - } else { - echo "    OK     "; - } - ?> -

-

: - WARNING "; - } else { - echo "    OK     "; - } - ?> -

+
- -
- -

- -

+ + +
+ +

+ +

" enctype="multipart/form-data" > \n";
- -
- run correctly by this server.'); ?>
- -
-

Ampache Installation.
For the love of Music.

diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index 5c193f98..c8f569be 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -46,12 +46,10 @@ [ ERROR "; + echo debug_result('',false); } else { - $status['php_ver'] = 'true'; - echo "    OK     "; + echo debug_result('',true); } ?> ] @@ -65,12 +63,10 @@ [ ERROR "; + echo debug_result('',false); } else { - $status['mysql_php'] = 'true'; - echo "    OK     "; + echo debug_result('',true); } ?> ] @@ -84,12 +80,10 @@ [ ERROR "; + echo debug_result('',false); } else { - $status['session_php'] = 'true'; - echo "    OK     "; + echo debug_result('',true); } ?> ] @@ -103,12 +97,10 @@ [ ERROR "; + echo debug_result('',false); } else { - $status['iconv_php'] = 'true'; - echo "   OK     "; + echo debug_result('',true); } ?>] @@ -121,11 +113,10 @@ [ ERROR "; + echo debug_result('',false); } else { - echo "   OK     "; + echo debug_result('',true); } ?>] @@ -138,11 +129,10 @@ [ ERROR "; + echo debug_result('',false); } else { - echo "   OK     "; + echo debug_result('',true); } ?>] @@ -155,10 +145,10 @@ [ ERROR "; + echo debug_result('',false); } else { - echo "    OK     "; + echo debug_result('',true); } ?> ] @@ -177,11 +167,10 @@ $results = @parse_ini_file($configfile); Config::set_by_array($results); if (!check_config_values($results)) { - echo " ERROR "; + echo debug_result('',false); } else { - $status['parse_config'] = true; - echo "    OK     "; + echo debug_result('',true); } ?> ] @@ -196,12 +185,10 @@ ERROR "; + echo debug_result('',false); } else { - $status['check_db'] = 'true'; - echo "    OK     "; + echo debug_result('',true); } ?> ] @@ -216,19 +203,16 @@ ERROR "; + echo debug_result('',false); } else { - $status['check_db_insert'] = 'true'; - echo "    OK     "; + echo debug_result('',true); } ?> ] - This checks a few key tables to make sure that you have successfully inserted the ampache database and - that the user has access to the database + @@ -250,16 +234,14 @@ echo "      "; } else { - $status['check_webpath'] = false; - echo "ERROR"; + echo debug_result('',false); } ?> ] - This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see a check mark - here then your web_path is not set correctly. + -- cgit