[Linpha-cvs] SF.net SVN: linpha: [4752] trunk/linpha2
Status: Inactive
Brought to you by:
bzrudi
From: <bz...@us...> - 2007-07-13 08:31:41
|
Revision: 4752 http://svn.sourceforge.net/linpha/?rev=4752&view=rev Author: bzrudi Date: 2007-07-13 01:31:36 -0700 (Fri, 13 Jul 2007) Log Message: ----------- make installer really abort on error, no longer support 'continue at own risk' makes no sense here. Modified Paths: -------------- trunk/linpha2/ChangeLog trunk/linpha2/install/step2_requirements.php trunk/linpha2/lib/classes/linpha.class.php Modified: trunk/linpha2/ChangeLog =================================================================== --- trunk/linpha2/ChangeLog 2007-07-12 16:20:55 UTC (rev 4751) +++ trunk/linpha2/ChangeLog 2007-07-13 08:31:36 UTC (rev 4752) @@ -1,3 +1,8 @@ +2007-07-13 bzrudi + * Make installer really abort when detecting serious problem. No longer + support "Continue at own risk", as it make absolutely no sense. + * + 2007-07-12 bzrudi * Rewrite linGetImageSize() to make videos and other filetypes like pdf work again and another bunch of cleanups and fixes @@ -3,5 +8,5 @@ * linpha.image.class.php temporary disable video thumbnail watermark as it's broken. (distorted and wrong size) TODO: flo!? - * Remove exiftool/t/ dir. Not needed as it contains just sample data. + * Removed /lib/exiftool/t/ dir. Not needed as it contains just sample data. 2007-07-11 bzrudi @@ -522,8 +527,7 @@ 2006-04-29 flo * filemanager: implementing upload only images and videos, escape filenames correct - (-> create a folder and file called "<script>" and you will find things which needs to be escaped) - + 2006-04-28 flo * filemanager: implemeting move, copy, change permissions, upload Modified: trunk/linpha2/install/step2_requirements.php =================================================================== --- trunk/linpha2/install/step2_requirements.php 2007-07-12 16:20:55 UTC (rev 4751) +++ trunk/linpha2/install/step2_requirements.php 2007-07-13 08:31:36 UTC (rev 4752) @@ -27,6 +27,9 @@ include_once(LINPHA_DIR.'/install/header.php'); include_once(LINPHA_DIR.'/install/lib.requirements.php'); include_once(LINPHA_DIR.'/install/header_html.php'); + +$requirements_failed = false; + ?> <script language="JavaScript" type='text/javascript'> @@ -77,7 +80,7 @@ { print_line_right(failed_msg()); print_line_info( sprintf(i18n_install("PHP Version >= %s is required"),'5.0.0') ); - $error = 1; + $requirements_failed = true; } @@ -100,7 +103,7 @@ print_line_middle( i18n_install("NONE") ); print_line_right(failed_msg()); print_line_info( i18n_install("Enable at least support for one Database in your PHP configuration file (php.ini)") ); - $error = 1; + $requirements_failed = true; } else { @@ -251,7 +254,7 @@ { print_line_middle( i18n_install("Not Found") ); print_line_right(failed_msg()); - $error = 1; + $requirements_failed = true; } print_line_left( i18n_install("GD JPEG Support") ); @@ -261,7 +264,7 @@ print_line_right(failed_msg()); print_line_info( i18n_install("Your GD Library lacks JPEG support, LinPHA will not support JPEG Images!") ); - $error = 1; + $requirements_failed = true; } else { @@ -398,7 +401,7 @@ print_line_middle( i18n_install("No") ); print_line_right(failed_msg()); print_line_info( sprintf(i18n_install("Please make sure the directory %s is writeable!"),'/linpha/var/') ); - $error = 1; + $requirements_failed = 1; } /** @@ -437,7 +440,7 @@ /** - * show footer of table requirements + * show footer of table requirementslib.install.php */ print_foot(); @@ -461,11 +464,12 @@ <?php -if(isset($error)) +if($requirements_failed) { - echo "<h2>".i18n_install("!!! INSTALLATION ABORTED !!!")."</h2><br />"; - echo i18n_install("There was at least one serious error - continue at your own risk"); - echo "<br /><br />"; + echo "<strong>".i18n_install("!!! INSTALLATION ABORTED !!!")."</strong><br />"; + echo i18n_install("Installer detected at least one serious problem. Please click the status info links above for more information."); + echo "<br />"; + exit(); } include_once(LINPHA_DIR.'/install/footer.php'); Modified: trunk/linpha2/lib/classes/linpha.class.php =================================================================== --- trunk/linpha2/lib/classes/linpha.class.php 2007-07-12 16:20:55 UTC (rev 4751) +++ trunk/linpha2/lib/classes/linpha.class.php 2007-07-13 08:31:36 UTC (rev 4752) @@ -36,8 +36,9 @@ class Linpha { - public $db, $sql, $template; +public $db, $sql, $template; + function __construct() { $this->sql = new LinSql(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |