fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SPEEDY fix some issues in autoloader and login page

Browse Source
This commit is contained in:
Fernando Ontiveros
2012-11-13 15:09:16 -04:00
parent 5113ac34d3
commit 1ffb33c427
2 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/methods/login/login.php
View File

@@ -48,11 +48,11 @@ if (!isset($_SESSION['FAILED_LOGINS'])) {
$sFailedLogins = $_SESSION['FAILED_LOGINS'];
require_once 'classes/model/LoginLog.php';
$aFields['LOGIN_VERIFY_MSG'] = G::loadTranslation('LOGIN_VERIFY_MSG');
//$aFields['LOGIN_VERIFY_MSG'] = Bootstrap::loadTranslation('LOGIN_VERIFY_MSG');
if (isset ($_SESSION['USER_LOGGED'])) {
require_once 'classes/model/LoginLog.php';
//close the session, if the current session_id was used in PM.
$oCriteria = new Criteria('workflow');
@@ -143,6 +143,7 @@ global $_DBArray;
$_DBArray ['langOptions'] = $availableLangArray;
G::LoadClass('configuration');
//BootStrap::LoadClass('configuration');
$oConf = new Configurations();
$oConf->loadConfig($obj, 'ENVIRONMENT_SETTINGS', '');
@@ -153,7 +154,7 @@ $aFields['USER_LANG'] = isset($oConf->aConfig['login_defaultLanguage'])
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');
G::LoadClass('serverConfiguration');
//Bootstrap::LoadClass('serverConfiguration');
//get the serverconf singleton, and check if we can send the heartbeat
$oServerConf = & serverConf::getSingleton();
@@ -192,12 +193,7 @@ if ($flagGettingStarted == 0) {
$dummy = '';
G::loadClass('configuration');
$oConf = new Configurations();
$oConf->loadConfig($dummy, 'ENVIRONMENT_SETTINGS', '');
$flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])
? $oConf->aConfig['login_enableForgotPassword']
: 'off';