--- mambo/branches/4.6/installation/install4.php 2007/01/28 13:25:42 926 +++ mambo/branches/4.6/installation/install4.php 2008/03/27 02:14:43 1659 @@ -1,12 +1,14 @@ +"; +?> + + + +<?php echo T_('Mambo - Web Installer') ?> + + + + + + @@ -60,7 +75,7 @@ - + @@ -68,7 +83,8 @@ "; - echo ""; + $error_msg = T_('You must provide a valid admin email address'); + echo ""; return; } @@ -85,7 +101,7 @@ - + @@ -93,17 +109,13 @@ "; - - echo ""; + $error_msg = T_('The database details provided are incorrect and/or empty'); + echo ""; return; } if ($sitename) { - if (!get_magic_quotes_gpc()) { - $configArray['sitename'] = addslashes($sitename); - } else { - $configArray['sitename'] = $sitename; - } + $configArray['sitename'] = $sitename; } else { ?>
@@ -112,7 +124,7 @@ - + @@ -120,11 +132,11 @@
- - - alert('".$error_msg."'); document.stepBack.submit(); "; return; + } if (file_exists( '../configuration.php' )) { @@ -141,6 +153,7 @@ $configArray['absolutePath']=$absolutePath; $configArray['filePerms']=$filePerms; $configArray['dirPerms']=$dirPerms; + $configArray['sitename'] = addslashes($configArray['sitename']); $config = " Please check back again soon.')."';\n"; $config .= "\$mosConfig_error_message = '".T_('This site is temporarily unavailable.
Please notify the System Administrator')."';\n"; $config .= "\$mosConfig_debug = '0';\n"; @@ -176,7 +190,7 @@ $config .= "\$mosConfig_hideEmail = '0';\n"; $config .= "\$mosConfig_enable_log_items = '0';\n"; $config .= "\$mosConfig_enable_log_searches = '0';\n"; - $config .= "\$mosConfig_enable_stats = '1';\n"; + $config .= "\$mosConfig_enable_stats = '0';\n"; $config .= "\$mosConfig_sef = '0';\n"; $config .= "\$mosConfig_vote = '0';\n"; $config .= "\$mosConfig_gzip = '0';\n"; @@ -299,20 +313,11 @@ - "; -?> - - - -<?php echo T_('Mambo - Web Installer') ?> - - - - - + $error_msg = T_('The site url has not been provided'); + echo ""; + return; +} ?>