X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=install%2Findex.php;h=221d207c38ce6a2844ad721a15f1b4ee03729e7f;hb=fc0693c868a6371cf100423e21ed7906e0980e48;hp=68f3b354ae8f20f80eb4d98674450a450f57fed8;hpb=1273d798e494986d5d35b885ccbd0ccaaa0c2695;p=fa-stable.git

diff --git a/install/index.php b/install/index.php
index 68f3b354..221d207c 100644
--- a/install/index.php
+++ b/install/index.php
@@ -2,7 +2,7 @@
 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();
@@ -10,28 +10,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');
+//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 +61,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 +80,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,7 +117,7 @@ function change_os(type) {
 					?><font class="bad">Enabled</font><?php
 				} else {
 					?><font class="good">Disabled</font><?php
-				}	
+				}
 				?>
 			</td>
 		</tr>
@@ -135,7 +136,7 @@ function change_os(type) {
 			<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;"><?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')) 
+			<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>
@@ -212,16 +213,16 @@ 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'; } ?> />
 				<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>
@@ -259,7 +260,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>
@@ -269,7 +270,7 @@ function change_os(type) {
 				<tr valign="top">
 					<td>Please note: &nbsp;</td>
 					<td>
-						FrontAccounting is released under the 
+						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.
@@ -282,7 +283,7 @@ function change_os(type) {
 			</td>
 		</tr>
 		</table>
-	
+
 	</td>
 </tr>
 </table>

- FrontAccounting + FrontAccounting Installation Wizard
lang/	Writeable'; } elseif(!file_exists($path_to_root.'/lang/')) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>		Writeable'; } elseif(!file_exists($comp_path)) { echo 'Directory Not Found'; } else { echo 'Unwriteable'; } ?>
Table Prefix:	Table Prefix ( 0_ ):	- + />		/> Install Tables - (Please note: May remove existing tables and data)

Please note:	- FrontAccounting is released under the + FrontAccounting is released under the GNU General Public License By clicking install, you are accepting the license. @@ -282,7 +283,7 @@ function change_os(type) {