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

Merged master into dashboards2

Browse Source
This commit is contained in:
Dante Loayza
2015-04-16 08:45:32 -04:00
parent 071e86d304 b2b421f039
commit f4c4b96e94
41 changed files with 1423 additions and 372 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/methods/login/forgotPassword.php
View File

@@ -23,6 +23,10 @@
*
*/
$G_PUBLISH = new Publisher ();
$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php');
if(SYS_SKIN == 'neoclassic'){
$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPasswordpm3', '', array(), 'retrivePassword.php');
}else{
$G_PUBLISH->AddContent ( 'xmlform', 'xmlform', 'login/forgotPassword', '', array(), 'retrivePassword.php');
}
G::RenderPage ( "publish" );

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

@@ -148,7 +148,11 @@ if (!class_exists('pmLicenseManager')) {
$licenseManager =& pmLicenseManager::getSingleton();
if (in_array(G::encryptOld($licenseManager->result), array('38afd7ae34bd5e3e6fc170d8b09178a3', 'ba2b45bdc11e2a4a6e86aab2ac693cbb'))) {
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
if(SYS_SKIN == 'neoclassic'){
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpiredpm3', '', array(), 'licenseUpdate');
}else{
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/licenseExpired', '', array(), 'licenseUpdate');
}
G::RenderPage('publish');
die();
}
@@ -192,7 +196,12 @@ if (isset($myUrl) && $myUrl != "") {
}
$G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/login', '', $aFields, SYS_URI . 'login/authentication.php');
if(SYS_SKIN == 'neoclassic'){
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/loginpm3', '', $aFields, SYS_URI . 'login/authentication.php');
}else{
$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

24
workflow/engine/methods/login/sysLogin.php
View File

@@ -23,12 +23,12 @@
*
*/
/*----------------------------------********---------------------------------*/
//Browser Compatibility
$browserSupported = G::checkBrowserCompatibility();
if ($browserSupported==false){
if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){
G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
}
//Browser Compatibility
$browserSupported = G::checkBrowserCompatibility();
if ($browserSupported==false){
if(!isset($_SESSION['G_MESSAGE']) || $_SESSION['G_MESSAGE'] == ""){
G::SendTemporalMessage ('ID_CURRENT_BROWSER_NOT_SUPPORTED', 'warning');
}
}
/*----------------------------------********---------------------------------*/
if (isset ($_POST['form']['USER_ENV'])) {
@@ -160,13 +160,21 @@ switch (WS_IN_LOGIN) {
//Get Server Configuration
$oServerConf = & serverConf::getSingleton ();
if ($oServerConf->getProperty ('LOGIN_NO_WS')) {
$fileLogin = 'login/sysLoginNoWS';
if(SYS_SKIN == 'neoclassic'){
$fileLogin = 'login/sysLoginNoWSpm3';
}else{
$fileLogin = 'login/sysLoginNoWS';
}
} else {
$fileLogin = 'login/sysLogin';
}
break;
case 'no':
$fileLogin = 'login/sysLoginNoWS';
if(SYS_SKIN == 'neoclassic'){
$fileLogin = 'login/sysLoginNoWSpm3';
}else{
$fileLogin = 'login/sysLoginNoWS';
}
break;
case 'yes':
$fileLogin = 'login/sysLogin';

3
workflow/engine/methods/setup/setupSchemas/app_cache_view.sql
View File

@@ -11,8 +11,9 @@ CREATE TABLE `APP_CACHE_VIEW`
`PRO_UID` VARCHAR(32) default '' NOT NULL,
`DEL_DELEGATE_DATE` DATETIME NOT NULL,
`DEL_INIT_DATE` DATETIME,
`DEL_TASK_DUE_DATE` DATETIME,
`DEL_FINISH_DATE` DATETIME,
`DEL_TASK_DUE_DATE` DATETIME,
`DEL_RISK_DATE` DATETIME,
`DEL_THREAD_STATUS` VARCHAR(32) default 'OPEN',
`APP_THREAD_STATUS` VARCHAR(32) default 'OPEN',
`APP_TITLE` VARCHAR(255) default '' NOT NULL,

6
workflow/engine/methods/setup/setupSchemas/app_cache_view_insert.sql
View File

@@ -13,8 +13,9 @@ INSERT INTO APP_CACHE_VIEW (
PRO_UID,
DEL_DELEGATE_DATE,
DEL_INIT_DATE,
DEL_TASK_DUE_DATE,
DEL_FINISH_DATE,
DEL_TASK_DUE_DATE,
DEL_RISK_DATE,
DEL_THREAD_STATUS,
APP_THREAD_STATUS,
APP_TITLE,
@@ -57,8 +58,9 @@ SELECT
APP_DELEGATION.PRO_UID,
substring(APP_DELEGATION.DEL_DELEGATE_DATE,1,19),
substring(APP_DELEGATION.DEL_INIT_DATE,1,19),
substring(APP_DELEGATION.DEL_TASK_DUE_DATE,1,19),
substring(APP_DELEGATION.DEL_FINISH_DATE,1,19),
substring(APP_DELEGATION.DEL_TASK_DUE_DATE,1,19),
substring(APP_DELEGATION.DEL_RISK_DATE,1,19),
APP_DELEGATION.DEL_THREAD_STATUS,
APP_THREAD.APP_THREAD_STATUS,
APP_TITLE.CON_VALUE AS APP_TITLE,

6
workflow/engine/methods/setup/setupSchemas/triggerAppDelegationInsert.sql
View File

@@ -55,8 +55,9 @@ BEGIN
PRO_UID,
DEL_DELEGATE_DATE,
DEL_INIT_DATE,
DEL_TASK_DUE_DATE,
DEL_FINISH_DATE,
DEL_TASK_DUE_DATE,
DEL_RISK_DATE,
DEL_THREAD_STATUS,
APP_THREAD_STATUS,
APP_TITLE,
@@ -88,8 +89,9 @@ BEGIN
NEW.PRO_UID,
NEW.DEL_DELEGATE_DATE,
NEW.DEL_INIT_DATE,
NEW.DEL_TASK_DUE_DATE,
NEW.DEL_FINISH_DATE,
NEW.DEL_TASK_DUE_DATE,
NEW.DEL_RISK_DATE,
NEW.DEL_THREAD_STATUS,
@APP_THREAD_STATUS,
@APP_TITLE,

3
workflow/engine/methods/setup/setupSchemas/triggerAppDelegationUpdate.sql
View File

@@ -53,8 +53,9 @@ BEGIN
PRO_UID = NEW.PRO_UID,
DEL_DELEGATE_DATE = NEW.DEL_DELEGATE_DATE,
DEL_INIT_DATE = NEW.DEL_INIT_DATE,
DEL_TASK_DUE_DATE = NEW.DEL_TASK_DUE_DATE,
DEL_FINISH_DATE = NEW.DEL_FINISH_DATE,
DEL_TASK_DUE_DATE = NEW.DEL_TASK_DUE_DATE,
DEL_RISK_DATE = NEW.DEL_RISK_DATE,
DEL_THREAD_STATUS = NEW.DEL_THREAD_STATUS,
APP_THREAD_STATUS = @APP_THREAD_STATUS,
APP_TITLE = @APP_TITLE,