X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=install%2Findex.php;h=0372573a21e4360545b82db09ba17bf87d757979;hb=7b771debfad8969c0bb64ada9d248b4a6b219409;hp=786dde60633669cdb5e24bd2def8c7c4743eb220;hpb=da8311619dd73feae101d246a1957b972e00cbd2;p=fa-stable.git

diff --git a/install/index.php b/install/index.php
index 786dde60..0372573a 100644
--- a/install/index.php
+++ b/install/index.php
@@ -1,9 +1,18 @@
 <?php
-
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
+***********************************************************************/
 error_reporting(E_ALL);
 ini_set("display_errors", "On");
 // Start a session
-if(!defined('SESSION_STARTED')) 
+if(!defined('SESSION_STARTED'))
 {
 	session_name('ba_session_id');
 	session_start();
@@ -11,27 +20,29 @@ if(!defined('SESSION_STARTED'))
 }
 
 // Check if the page has been reloaded
-if(!isset($_GET['sessions_checked']) || $_GET['sessions_checked'] != 'true') 
+if(!isset($_GET['sessions_checked']) || $_GET['sessions_checked'] != 'true')
 {
 	// Set session variable
 	$_SESSION['session_support'] = '<font class="good">Enabled</font>';
 	// Reload page
 	header('Location: index.php?sessions_checked=true');
 	exit(0);
-} 
-else 
+}
+else
 {
 	// Check if session variable has been saved after reload
-	if(isset($_SESSION['session_support'])) 
+	if(isset($_SESSION['session_support']))
 	{
 		$session_support = $_SESSION['session_support'];
-	} 
-	else 
-	{   
+	}
+	else
+	{
 		$session_support = '<font class="bad">Disabled</font>';
 	}
 }
 $path_to_root = "..";
+//include_once($path_to_root.'/config.php');
+$comp_path = $path_to_root."/company";
 
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -60,7 +71,7 @@ function change_os(type) {
 <table cellpadding="0" cellspacing="0" border="0" width="750" align="center">
 <tr>
 	<td width="100%" align="center" style="font-size: 20px;">
-		<font style="color: #FFFFFF;">FrontAccounting</font> 
+		<font style="color: #FFFFFF;">FrontAccounting</font>
 		<font style="color: #DDDDDD;">Installation Wizard</font>
 	</td>
 </tr>
@@ -79,8 +90,8 @@ 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(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
@@ -116,10 +127,34 @@ function change_os(type) {
 					?><font class="bad">Enabled</font><?php
 				} else {
 					?><font class="good">Disabled</font><?php
-				}	
+				}
 				?>
 			</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,18 +163,16 @@ function change_os(type) {
 		<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 style="color: #666666;">inventory/manage/image/</td>
-			<td><?php if(is_writable($path_to_root.'/inventory/manage/image/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists($path_to_root.'/inventory/manage/image/')) { echo '<font class="bad">Directory Not Found</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>
 		</tr>
 		<tr>
 			<td style="color: #666666;">lang/</td>
 			<td><?php if(is_writable($path_to_root.'/lang/')) { 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 style="color: #666666;">reporting/pdf_files/</td>
-			<td><?php if(is_writable($path_to_root.'/reporting/pdf_files/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists($path_to_root.'/reporting/pdf_files/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
-		</tr>
-		<tr>
-			<td style="color: #666666;">admin/backup/</td>
-			<td><?php if(is_writable($path_to_root.'/admin/backup/')) { echo '<font class="good">Writeable</font>'; } elseif(!file_exists($path_to_root.'/admin/backup/')) { echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
+			<td style="color: #666666;"><?php echo 'Company data dirs ('.  $comp_path. '/*)'; ?></td>
+			<td><?php if(is_writable($comp_path) && is_writable($comp_path.'/0') && is_writable($comp_path.'/0/images'))
+			{ echo '<font class="good">Writeable</font>'; } elseif(!file_exists($comp_path)) {
+			 echo '<font class="bad">Directory Not Found</font>'; } else { echo '<font class="bad">Unwriteable</font>'; } ?></td>
 		</tr>
 		</table>
 		<table cellpadding="3" cellspacing="0" width="100%" align="center">
@@ -192,7 +225,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>
@@ -214,18 +247,26 @@ function change_os(type) {
 			</td>
 		</tr>
 		<tr>
-			<td style="color: #666666;">Table Prefix:</td>
+			<td style="color: #666666;">Table Prefix ( 0_ ):</td>
 			<td>
-				<input type="text" tabindex="11" name="table_prefix" style="width: 250px;" value="<?php if(isset($_SESSION['table_prefix'])) { echo $_SESSION['table_prefix']; } else { echo '0_'; } ?>" />
+				<input type="checkbox" tabindex="11" name="table_prefix" id="table_prefix" value="true"<?php if(!isset($_SESSION['table_prefix'])) { echo ' checked'; } elseif($_SESSION['table_prefix'] == 'true') { echo ' checked'; } ?> />
 			</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>		
+				<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>
@@ -261,7 +302,7 @@ function change_os(type) {
 				<input type="password" tabindex="17" name="admin_repassword" style="width: 98%;"<?php if(isset($_SESSION['admin_password'])) { echo ' value = "'.$_SESSION['admin_password'].'"'; } ?> />
 			</td>
 		</tr>
-		
+
 		<tr>
 			<td colspan="5" style="padding: 10px; padding-bottom: 0;"><h1 style="font-size: 0px;">&nbsp;</h1></td>
 		</tr>
@@ -271,10 +312,9 @@ function change_os(type) {
 				<tr valign="top">
 					<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.
+						FrontAccounting is released under the
+						<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>
@@ -284,7 +324,7 @@ function change_os(type) {
 			</td>
 		</tr>
 		</table>
-	
+
 	</td>
 </tr>
 </table>
@@ -297,7 +337,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>

- FrontAccounting + FrontAccounting Installation Wizard
Magic Quotes GPC	+ Enabled'; + } else { + echo 'Disabled'; + } + ?> +	Register Globals	+ Enabled'; + } else { + echo 'Disabled'; + } + ?> +
config_db.php	Writeable'; } elseif(!file_exists($path_to_root.'/config_db.php')) { echo 'File Not Found'; } else { echo 'Unwriteable'; } ?>	inventory/manage/image/	Writeable'; } elseif(!file_exists($path_to_root.'/inventory/manage/image/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>	modules/	Writeable'; } elseif(!file_exists($path_to_root.'/lang/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
lang/	Writeable'; } elseif(!file_exists($path_to_root.'/lang/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>	reporting/pdf_files/	Writeable'; } elseif(!file_exists($path_to_root.'/reporting/pdf_files/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
admin/backup/	Writeable'; } elseif(!file_exists($path_to_root.'/admin/backup/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>		Writeable'; } elseif(!file_exists($comp_path)) { + echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
Please enter your MySQL database server details below...
Host Name:	Host Name:
Table Prefix:	Table Prefix ( 0_ ):	- + />	- /> + /> 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. + FrontAccounting is released under the + GNU General Public License. By + clicking install, you are accepting the license.