Menu
▾
▴
[Web-erp-svn] SF.net SVN: web-erp:[6185] trunk/includes
|
From: <ice...@us...> - 2013-08-06 07:08:52
|
Revision: 6185
http://sourceforge.net/p/web-erp/reponame/6185
Author: icedlava
Date: 2013-08-06 07:08:49 +0000 (Tue, 06 Aug 2013)
Log Message:
-----------
Cleanup login and db connect for new configuration settings and highlight backward compat code that can be removed at later point.
Modified Paths:
--------------
trunk/includes/ConnectDB.inc
trunk/includes/Login.php
Modified: trunk/includes/ConnectDB.inc
===================================================================
--- trunk/includes/ConnectDB.inc 2013-08-06 07:06:19 UTC (rev 6184)
+++ trunk/includes/ConnectDB.inc 2013-08-06 07:08:49 UTC (rev 6185)
@@ -11,7 +11,7 @@
if (isset($_POST['CompanyNameField'])){
if (isset($CompanyList) && is_array($CompanyList)) {
foreach ($CompanyList as $key => $CompanyEntry){
- if (is_dir('./companies/'.strtolower($CompanyEntry['database']).'') && ($key == $_POST['CompanyNameField']) ){
+ if (is_dir('./companies/'.strtolower($CompanyEntry['database']).'') && ($key == $_POST['CompanyNameField']) && ($DefaultDatabase == $CompanyEntry['database'])) {
$_SESSION['DatabaseName'] = $CompanyEntry['database'];
$_SESSION['CompanyName'] = $CompanyEntry['company'];
include_once ($PathPrefix . 'includes/ConnectDB_' . $DBType . '.inc');
@@ -27,7 +27,9 @@
echo '<br /><a href="index.php">' . _('Back to login page') . '</a>';
exit;
}
- } else { //provision for old setup
+ }
+ //provision for old setup - delete when we have a reliable upgrade for config.php
+ else {
if (ContainsIllegalCharacters($_POST['CompanyNameField'])){
prnMsg(_('The company database being logged into cannot contain any of the illegal characters'),'error');
echo '<br /><a href="index.php">' . _('Back to login page') . '</a>';
@@ -42,15 +44,16 @@
prnMsg(_('Check the company name entered' . ' (' . $_POST['CompanyNameField'] . ') ' . 'is the same as the database name.'),'error');
prnMsg(_('The company name abbreviation entered at login must also have a company directory defined. See your system administrator'),'error');
}
- }
+ } // end provision for old setup
} elseif (isset($DatabaseName)) { /* Scripts that do not require a login must have the $DatabaseName variable set in hard code */
$_SESSION['DatabaseName'] = $DatabaseName;
$_SESSION['CompanyName']= $DatabaseName;
include_once ($PathPrefix . 'includes/ConnectDB_' . $DBType . '.inc');
}
+
} else {
include_once($PathPrefix .'includes/ConnectDB_' . $DBType . '.inc');
}
-?>
\ No newline at end of file
+?>
Modified: trunk/includes/Login.php
===================================================================
--- trunk/includes/Login.php 2013-08-06 07:06:19 UTC (rev 6184)
+++ trunk/includes/Login.php 2013-08-06 07:08:49 UTC (rev 6185)
@@ -11,7 +11,6 @@
echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
?>
-
<html>
<head>
<title>webERP Login screen</title>
@@ -38,17 +37,24 @@
<input type="hidden" name="FormID" value="<?php echo $_SESSION['FormID']; ?>" />
<span>
<?php
- if ($AllowCompanySelectionBox === 'Hide'){
- // do not show input or selection box
- echo '<input type="hidden" name="CompanyNameField" value="' . $DefaultCompany . '" />';
- } else if ($AllowCompanySelectionBox === 'ShowInputBox'){
- // show input box
- echo _('Company') . '<input type="text" name="CompanyNameField" autofocus="autofocus" required="required" value="' . $DefaultCompany . '" />';
- } else {
- // Show selection box ($AllowCompanySelectionBox == 'ShowSelectionBox')
- echo _('Company:').'<br />';
- echo '<select name="CompanyNameField">';
- if (isset($CompanyList) && is_array($CompanyList)) {
+ if (isset($CompanyList) && is_array($CompanyList)) {
+ foreach ($CompanyList as $key => $CompanyEntry){
+ if ($DefaultDatabase == $CompanyEntry['database']) {
+ $CompanyNameField = "$key";
+ $DefaultCompany = $CompanyEntry['company'];
+ }
+ }
+ if ($AllowCompanySelectionBox === 'Hide'){
+ // do not show input or selection box
+ echo '<input type="hidden" name="CompanyNameField" value="' . $CompanyNameField . '" />';
+ } elseif ($AllowCompanySelectionBox === 'ShowInputBox'){
+ // show input box
+ echo _('Company') .': <br />'. '<input type="text" name="DefaultCompany" autofocus="autofocus" required="required" value="' . htmlspecialchars($DefaultCompany ,ENT_QUOTES,'UTF-8') . '" disabled="disabled"/>';//use disabled input for display consistency
+ echo '<input type="hidden" name="CompanyNameField" value="' . $CompanyNameField . '" />';
+ } else {
+ // Show selection box ($AllowCompanySelectionBox == 'ShowSelectionBox')
+ echo _('Company:').'<br />';
+ echo '<select name="CompanyNameField">';
foreach ($CompanyList as $key => $CompanyEntry){
if (is_dir('companies/' . $CompanyEntry['database']) ){
if ($CompanyEntry['database'] == $DefaultDatabase) {
@@ -58,20 +64,33 @@
}
}
}
- } else { //provision for backward compat
- $Companies = scandir('companies/', 0);
+ echo '</select>';
+ }
+ }
+ else { //provision for backward compat - remove when we have a reliable upgrade for config.php
+ if ($AllowCompanySelectionBox === 'Hide'){
+ // do not show input or selection box
+ echo '<input type="hidden" name="CompanyNameField" value="' . $DefaultCompany . '" />';
+ } else if ($AllowCompanySelectionBox === 'ShowInputBox'){
+ // show input box
+ echo _('Company') . '<input type="text" name="CompanyNameField" autofocus="autofocus" required="required" value="' . $DefaultCompany . '" />';
+ } else {
+ // Show selection box ($AllowCompanySelectionBox == 'ShowSelectionBox')
+ echo _('Company:').'<br />';
+ echo '<select name="CompanyNameField">';
+ $Companies = scandir('companies/', 0);
foreach ($Companies as $CompanyEntry){
- if (is_dir('companies/' . $CompanyEntry) AND $CompanyEntry != '..' AND $CompanyEntry != '' AND $CompanyEntry!='.svn' AND $CompanyEntry!='.'){
- if ($CompanyEntry==$DefaultDatabase) {
- echo '<option selected="selected" label="'.$CompanyEntry.'" value="'.$CompanyEntry.'">'.$CompanyEntry.'</option>';
- } else {
- echo '<option label="'.$CompanyEntry.'" value="'.$CompanyEntry.'">'.$CompanyEntry.'</option>';
- }
- }
- }
+ if (is_dir('companies/' . $CompanyEntry) AND $CompanyEntry != '..' AND $CompanyEntry != '' AND $CompanyEntry!='.svn' AND $CompanyEntry!='.'){
+ if ($CompanyEntry==$DefaultDatabase) {
+ echo '<option selected="selected" label="'.$CompanyEntry.'" value="'.$CompanyEntry.'">'.$CompanyEntry.'</option>';
+ } else {
+ echo '<option label="'.$CompanyEntry.'" value="'.$CompanyEntry.'">'.$CompanyEntry.'</option>';
+ }
+ }
+ }
+ echo '</select>';
}
- echo '</select>';
- }
+ } //end provision for backward compat
?>
</span>
<br />
@@ -94,4 +113,4 @@
<div style="text-align:center"><a href="https://sourceforge.net/projects/web-erp"><img src="https://sflogo.sourceforge.net/sflogo.php?group_id=70949&type=8" width="80" height="15" alt="Get webERP Accounting & Business Management at SourceForge.net. Fast, secure and Free Open Source software downloads" /></a></div>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
|
