X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=install%2Findex.php;h=569245493f6ed427558624d2b947dfc56a14df3a;hb=7286bbfc939360b0fcb573ae075b2b8e899d96c8;hp=221d207c38ce6a2844ad721a15f1b4ee03729e7f;hpb=f12dbe7523bb1abc6cd69b009ef8f0be838f5348;p=fa-stable.git

diff --git a/install/index.php b/install/index.php
index 221d207c..56924549 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1,4 +1,11 @@
 <?php
+/**********************************************************************
+	This installer is based on code from the	
+ 	Website Baker Project <http://www.websitebaker.org/>
+ 	Copyright (C) 2004-2007, Ryan Djurovich.
+ 	The code is released under GPLv3
+ 	modified by FrontAcounting, LLC.
+***********************************************************************/
 error_reporting(E_ALL);
 ini_set("display_errors", "On");
 // Start a session
@@ -14,6 +21,7 @@ if(!isset($_GET['sessions_checked']) || $_GET['sessions_checked'] != 'true')
 {
 	// Set session variable
 	$_SESSION['session_support'] = '<font class="good">Enabled</font>';
+	$_SESSION['message'] = '';
 	// Reload page
 	header('Location: index.php?sessions_checked=true');
 	exit(0);
@@ -80,8 +88,15 @@ function change_os(type) {
 		<center>
 			<img src="<?php echo $path_to_root; ?>/themes/default/images/logo_frontaccounting.png" width="250" height="50" alt="Logo" />
 		</center>
-
-
+<?php
+ if(file_exists($path_to_root.'/config.php')) { 
+?><div style="width: 700px; padding: 10px; margin-bottom: 5px; border: 1px solid #FF0000; background-color: #FFDBDB;"><b>Error:</b> Seems you have FrontAccounting application already installed.<BR>
+After logging as an admin to first installed company you can:
+<ul>
+<li> Add more companies using Add/Update Companies under Setup tab;</li>
+<li> Upgrade FA version using Upgrade Software under Setup tab.</li>
+</ul></div>
+<?php exit; } ?>
 		<?php
 		if(isset($_SESSION['message']) AND $_SESSION['message'] != '') {
 			?><div style="width: 700px; padding: 10px; margin-bottom: 5px; border: 1px solid #FF0000; background-color: #FFDBDB;"><b>Error:</b> <?php echo $_SESSION['message']; ?></div><?php
@@ -121,6 +136,30 @@ function change_os(type) {
 				?>
 			</td>
 		</tr>
+		<?php if (substr(php_sapi_name(), 0, 3) == 'cgi') {	?>
+		<tr>
+			<td width="140" style="color: #666666;">Magic Quotes GPC</td>
+			<td width="35">
+				<?php
+				if(ini_get('magic_quotes_gpc')) {
+					echo '<font class="bad">Enabled</font>';
+				} else {
+					echo '<font class="good">Disabled</font>';
+				}
+				?>
+			</td>
+			<td width="140" style="color: #666666;">Register Globals</td>
+			<td width="35">
+				<?php
+				if (ini_get('register_globals')) {
+					echo '<font class="bad">Enabled</font>';
+				} else {
+					echo '<font class="good">Disabled</font>';
+				}
+				?>
+			</td>
+		</tr>
+		<?php } ?>
 		</table>
 		<table cellpadding="3" cellspacing="0" width="100%" align="center">
 		<tr>
@@ -128,9 +167,9 @@ function change_os(type) {
 		</tr>
 		<tr>
 			<td style="color: #666666;">config_db.php</td>
-			<td><?php if(is_writable($path_to_root.'/config_db.php')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists($path_to_root.'/config_db.php')) { echo '<font class="bad">File Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td><?php if(is_writable($path_to_root)) { echo '<font class="good">Writeable</font>'; } elseif(file_exists($path_to_root.'/config_db.php')) { echo '<font class="bad">File Exists</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
 			<td style="color: #666666;">modules/</td>
-			<td><?php if(is_writable($path_to_root.'/modules/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists($path_to_root.'/lang/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td><?php if(is_writable($path_to_root.'/modules/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists($path_to_root.'/modules/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
 		</tr>
 		<tr>
 			<td style="color: #666666;">lang/</td>
@@ -191,7 +230,7 @@ function change_os(type) {
 			<td colspan="5">Please enter your MySQL database server details below...</td>
 		</tr>
 		<tr>
-			<td width="120" style="color: #666666;">Host Name:</td>
+			<td width="150" style="color: #666666;">Host Name:</td>
 			<td width="230">
 				<input type="text" tabindex="7" name="database_host" style="width: 98%;" value="<?php if(isset($_SESSION['database_host'])) { echo $_SESSION['database_host']; } else { echo 'localhost'; } ?>" />
 			</td>
@@ -219,12 +258,20 @@ function change_os(type) {
 			</td>
 			<td>&nbsp;</td>
 			<td colspan="2">
-				<input type="checkbox" tabindex="12" name="install_tables" id="install_tables" value="true"<?php if(!isset($_SESSION['install_tables'])) { echo ' checked'; } elseif($_SESSION['install_tables'] == 'true') { echo ' checked'; } ?> />
+				<input type="checkbox" tabindex="12" name="install_tables" id="install_tables" value="true" onclick="document.getElementById('db_options').style.display = this.checked? 'block':'none';"<?php if(!isset($_SESSION['install_tables'])) { echo ' checked'; } elseif($_SESSION['install_tables'] == 'true') { echo ' checked'; } ?> />
 				<label for="install_tables" style="color: #666666;">Install Tables</label>
 				<br />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 				<span style="font-size: 10px; color: #666666;">(Please note: May remove existing tables and data)</span></td>
 			</td>
 		</tr>
+		<tr id="db_options">
+			<td style="color: #666666;">Fill database with demo data:</td>
+			<td>
+				<input type="checkbox" tabindex="6" name="demo_data" id="demo_data" value="true" <?php if(!isset($_SESSION['demo_data']) OR $_SESSION['demo_data'] == true) { echo 'checked'; } ?> />
+				<br />
+		</td>
+			<td colspan="2">&nbsp;</td>
+		</tr>
 		<tr>
 			<td colspan="5"><h1>Step 5</h1>Please enter the training company name below (you can create your own company later)...</td>
 		</tr>
@@ -271,9 +318,8 @@ function change_os(type) {
 					<td>Please note: &nbsp;</td>
 					<td>
 						FrontAccounting is released under the
-						<a href="http://www.gnu.org/licenses/gpl.html" target="_blank" tabindex="19">GNU General Public License</a>
-						<br />
-						By clicking install, you are accepting the license.
+						<a href="http://www.gnu.org/licenses/gpl-3.0.html" target="_blank" tabindex="19">GNU General Public License.</a> By 
+						clicking install, you are accepting the license.
 					</td>
 				</tr>
 				</table>
@@ -296,7 +342,7 @@ function change_os(type) {
 		<!-- Please note: the below reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
 		<a href="http://frontaccounting.com/" style="color: #000000;" target="_blank">FrontAccounting</a>
 		is	released under the
-		<a href="http://www.gnu.org/licenses/gpl.html" style="color: #000000;" target="_blank">GNU General Public License</a>
+		<a href="http://www.gnu.org/licenses/gpl-3.0.html" style="color: #000000;" target="_blank">GNU General Public License</a>
 		<!-- Please note: the above reference to the GNU GPL should not be removed, as it provides a link for users to read about warranty, etc. -->
 	</td>
 </tr>

config_db.php	Writeable'; } elseif(!file_exists($path_to_root.'/config_db.php')) { echo 'File Not Found'; } else { echo 'Unwriteable'; } ?>	Writeable'; } elseif(file_exists($path_to_root.'/config_db.php')) { echo 'File Exists'; } else { echo 'Unwriteable'; } ?>	modules/	Writeable'; } elseif(!file_exists($path_to_root.'/lang/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>	Writeable'; } elseif(!file_exists($path_to_root.'/modules/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
lang/	Please enter your MySQL database server details below...
Host Name:	Host Name:			- /> + /> Install Tables (Please note: May remove existing tables and data)
Fill database with demo data:	+ /> + +
Step 5 Please enter the training company name below (you can create your own company later)...
Please note:	FrontAccounting is released under the - GNU General Public License - - By clicking install, you are accepting the license. + GNU General Public License. By + clicking install, you are accepting the license.