From dad0f7d4e0358b9beb19c9bb9df5114dbfbee087 Mon Sep 17 00:00:00 2001 From: jennylee Date: Fri, 21 Nov 2014 16:31:23 -0400 Subject: [PATCH 1/3] PM-968 2nd estructure en Nuevas instalaciones. --- workflow/engine/controllers/installer.php | 18 ------------------ workflow/engine/methods/login/login.php | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index f37fdd816..a84927064 100755 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -928,24 +928,6 @@ class Installer extends Controller } } - //2nd STRUCTURE - $this->initPropel(true); - G::LoadClass("configuration"); - $conf = new Configurations(); - if (!$conf->exists("ENVIRONMENT_SETTINGS")) { - $conf->aConfig = array ("format" => '@userName (@firstName @lastName)', - "dateFormat" => 'd/m/Y', - "startCaseHideProcessInf" => false, - "casesListDateFormat" => 'Y-m-d H:i:s', - "casesListRowNumber" => 25, - "casesListRefreshTime" => 120 ); - $conf->saveConfig( 'ENVIRONMENT_SETTINGS', '' ); - } - $conf->setDirectoryStructureVer(2); - //$this->installLog( G::LoadTranslation('ID_INDEX_FILE_UPDATED', SYS_LANG, Array($indexFileUpdated, $sysConf['default_lang'],$sysConf['default_skin']))); - //CLI::logging(CLI::info("Version Directory Structure is 2 now.\n")); - - $this->installLog( G::LoadTranslation('ID_INDEX_FILE_UPDATED', SYS_LANG, Array($indexFileUpdated, $sysConf['default_lang'],$sysConf['default_skin']))); $this->installLog( G::LoadTranslation('ID_INSTALL_SUCESS') ); diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php index a9bd58187..eb9a46d7b 100755 --- a/workflow/engine/methods/login/login.php +++ b/workflow/engine/methods/login/login.php @@ -215,6 +215,20 @@ if ($flagGettingStarted == 0) { $oHeadPublisher->addScriptCode('var flagGettingStarted = 0;'); } +//2nd STRUCTURE +require_once ('classes/class.configuration.php'); +$conf = new Configurations(); +if (!$conf->exists("ENVIRONMENT_SETTINGS")) { + $conf->aConfig = array ("format" => '@userName (@firstName @lastName)', + "dateFormat" => 'd/m/Y', + "startCaseHideProcessInf" => false, + "casesListDateFormat" => 'Y-m-d H:i:s', + "casesListRowNumber" => 25, + "casesListRefreshTime" => 120 ); + $conf->saveConfig( 'ENVIRONMENT_SETTINGS', '' ); +} +$conf->setDirectoryStructureVer(2); + $dummy = ''; $oConf->loadConfig($dummy, 'ENVIRONMENT_SETTINGS', ''); From 3a3ec02573fb4b0e89a688e685f99449b2255eb8 Mon Sep 17 00:00:00 2001 From: jennylee Date: Tue, 25 Nov 2014 15:33:54 -0400 Subject: [PATCH 2/3] PM-968 2nd estructure en Nuevas instalaciones --- workflow/engine/data/mysql/insert.sql | 2 ++ workflow/engine/methods/login/login.php | 14 -------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/workflow/engine/data/mysql/insert.sql b/workflow/engine/data/mysql/insert.sql index e9432ef0b..49331b016 100755 --- a/workflow/engine/data/mysql/insert.sql +++ b/workflow/engine/data/mysql/insert.sql @@ -59753,3 +59753,5 @@ INSERT INTO DASHLET_INSTANCE (DAS_INS_UID,DAS_UID,DAS_INS_OWNER_TYPE,DAS_INS_OWN ('00000000000000000000000000000003','00000000000000000000000000000003','EVERYBODY','','','2011-12-05 00:00:00','2011-12-05 00:00:00',1), ('00000000000000000000000000000004','00000000000000000000000000000004','EVERYBODY','','a:2:{s:13:"DAS_INS_TITLE";s:15:"PM Plugins News";s:7:"DAS_URL";s:71:"http://license.processmaker.com/syspmLicenseSrv/en/green/services/rssAP";}','2012-04-16 00:00:00','2012-04-16 00:00:00',1); +INSERT INTO CONFIGURATION (CFG_UID,OBJ_UID,CFG_VALUE,PRO_UID,USR_UID,APP_UID) VALUES +('ENVIRONMENT_SETTINGS','','a:1:{s:18:"directoryStructure";i:2;}','','',''); diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php index eb9a46d7b..a9bd58187 100755 --- a/workflow/engine/methods/login/login.php +++ b/workflow/engine/methods/login/login.php @@ -215,20 +215,6 @@ if ($flagGettingStarted == 0) { $oHeadPublisher->addScriptCode('var flagGettingStarted = 0;'); } -//2nd STRUCTURE -require_once ('classes/class.configuration.php'); -$conf = new Configurations(); -if (!$conf->exists("ENVIRONMENT_SETTINGS")) { - $conf->aConfig = array ("format" => '@userName (@firstName @lastName)', - "dateFormat" => 'd/m/Y', - "startCaseHideProcessInf" => false, - "casesListDateFormat" => 'Y-m-d H:i:s', - "casesListRowNumber" => 25, - "casesListRefreshTime" => 120 ); - $conf->saveConfig( 'ENVIRONMENT_SETTINGS', '' ); -} -$conf->setDirectoryStructureVer(2); - $dummy = ''; $oConf->loadConfig($dummy, 'ENVIRONMENT_SETTINGS', ''); From 7542c27dad56ee658fcf4f20004ed9e9cb701e7a Mon Sep 17 00:00:00 2001 From: jennylee Date: Tue, 25 Nov 2014 16:27:27 -0400 Subject: [PATCH 3/3] PM-968 2nd estructure en Nuevas instalaciones Fixing a Warning message. --- workflow/engine/classes/class.configuration.php | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/classes/class.configuration.php b/workflow/engine/classes/class.configuration.php index 94d59a029..5ec6c2346 100755 --- a/workflow/engine/classes/class.configuration.php +++ b/workflow/engine/classes/class.configuration.php @@ -373,6 +373,7 @@ class Configurations // extends Configuration */ public function getFormats() { + $this->UserConfig = array(); if (!isset($this->UserConfig)) { $this->UserConfig = $this->getConfiguration("ENVIRONMENT_SETTINGS", ""); }