diff --git a/composer.json b/composer.json index 02583a6d0..8649c3174 100644 --- a/composer.json +++ b/composer.json @@ -80,7 +80,8 @@ "gulliver/includes/smarty_plugins/function.pmos.php", "thirdparty/pear/PEAR.php", "thirdparty/HTMLPurifier/HTMLPurifier.auto.php", - "workflow/engine/classes/class.pmFunctions.php" + "workflow/engine/classes/class.pmFunctions.php", + "workflow/engine/src/ProcessMaker/Util/helpers.php" ] }, "autoload-dev": { diff --git a/gulliver/system/class.publisher.php b/gulliver/system/class.publisher.php index a9010fff2..f0400afd0 100644 --- a/gulliver/system/class.publisher.php +++ b/gulliver/system/class.publisher.php @@ -355,7 +355,7 @@ class Publisher /* End Block */ /* Start Block: PagedTable Right Click */ - $pm = new popupMenu( 'gulliver/pagedTable_PopupMenu' ); + $pm = new PopupMenu( 'gulliver/pagedTable_PopupMenu' ); $pm->name = $oTable->id; $fields = array_keys( $oTable->fields ); foreach ($fields as $f) { @@ -430,7 +430,7 @@ class Publisher $_SESSION[$G_FORM->id] = $G_FORM->values; } - $oTable = new propelTable(); + $oTable = new PropelTable(); $oTable->template = $Part['Template']; $oTable->criteria = $Part['Content']; if (isset( $Part['ajaxServer'] ) && ($Part['ajaxServer'] !== '')) { @@ -461,7 +461,7 @@ class Publisher /* End Block */ /* Start Block: PagedTable Right Click */ - $pm = new popupMenu( 'gulliver/pagedTable_PopupMenu' ); + $pm = new PopupMenu( 'gulliver/pagedTable_PopupMenu' ); $sc = $pm->renderPopup( $oTable->id, $oTable->fields ); /* End Block */ //krumo ( $Part ); diff --git a/workflow/engine/classes/ActionsByEmailCoreClass.php b/workflow/engine/classes/ActionsByEmailCoreClass.php index 0c9b0996c..c0826a502 100644 --- a/workflow/engine/classes/ActionsByEmailCoreClass.php +++ b/workflow/engine/classes/ActionsByEmailCoreClass.php @@ -2,7 +2,7 @@ -class actionsByEmailCoreClass extends PMPlugin +class ActionsByEmailCoreClass extends PMPlugin { public function __construct() { diff --git a/workflow/engine/classes/AppDocumentDrive.php b/workflow/engine/classes/AppDocumentDrive.php index 7a79036ab..81d62ea9e 100644 --- a/workflow/engine/classes/AppDocumentDrive.php +++ b/workflow/engine/classes/AppDocumentDrive.php @@ -7,7 +7,8 @@ /** * Class InputDocumentDrive - */class AppDocumentDrive + */ +class AppDocumentDrive { /** * @var PmDrive $drive diff --git a/workflow/engine/classes/AppSolr.php b/workflow/engine/classes/AppSolr.php index 2cf504d1d..88678d95a 100644 --- a/workflow/engine/classes/AppSolr.php +++ b/workflow/engine/classes/AppSolr.php @@ -1,42 +1,4 @@ . - * - * For more information, contact Colosa Inc, 5304 Ventura Drive, - * Delray Beach, FL, 33484, USA, or email info@colosa.com. - * - */ - -require_once "classes/model/Application.php"; -require_once "classes/model/AppDelegation.php"; -require_once "classes/model/AppThread.php"; -require_once "classes/model/Content.php"; -require_once "classes/model/Users.php"; -require_once "classes/model/GroupUser.php"; -require_once "classes/model/Task.php"; -require_once "classes/model/TaskUser.php"; -require_once "classes/model/Dynaform.php"; -require_once "classes/model/ProcessVariables.php"; -require_once "entities/SolrRequestData.php"; -require_once "entities/SolrUpdateDocument.php"; -require_once "entities/AppSolrQueue.php"; -require_once "classes/model/AppSolrQueue.php"; - /** * Invalid search text for Solr exception @@ -48,12 +10,8 @@ require_once "classes/model/AppSolrQueue.php"; /** * Implementation to display application data in the PMOS2 grids using Solr * search service - * - * @author Herbert Saal Gutierrez - * @category Colosa - * @copyright Copyright (c) 2005-2011 Colosa Inc. (http://www.colosa.com) - * - */class AppSolr + */ +class AppSolr { private $_solrIsEnabled = false; private $_solrHost = ""; @@ -1516,7 +1474,7 @@ require_once "classes/model/AppSolrQueue.php"; $this->getBuilXMLDocTime += $this->afterBuilXMLDocTime - $this->afterPrepareApplicationDataDBTime; } } - catch ( ApplicationAPP_DATAUnserializeException $ex ) { + catch ( ApplicationAppDataUnserializeException $ex ) { // exception trying to get application information $fh = fopen("./SolrIndexErrors.txt", 'a') or die("can't open file to store Solr index errors."); fwrite($fh, date('Y-m-d H:i:s:u') . " " . $ex->getMessage()); @@ -1845,7 +1803,7 @@ require_once "classes/model/AppSolrQueue.php"; if (! $UnSerializedCaseData) { // error unserializing - throw new ApplicationAPP_DATAUnserializeException (date('Y-m-d H:i:s:u') . " Could not unserialize APP_DATA of APP_UID: " . $documentData ['APP_UID'] . "\n"); + throw new ApplicationAppDataUnserializeException (date('Y-m-d H:i:s:u') . " Could not unserialize APP_DATA of APP_UID: " . $documentData ['APP_UID'] . "\n"); } else { foreach ($UnSerializedCaseData as $k => $value) { diff --git a/workflow/engine/classes/ApplicationAPP_DATAUnserializeException.php b/workflow/engine/classes/ApplicationAPP_DATAUnserializeException.php deleted file mode 100644 index fa5b818db..000000000 --- a/workflow/engine/classes/ApplicationAPP_DATAUnserializeException.php +++ /dev/null @@ -1,70 +0,0 @@ -. - * - * For more information, contact Colosa Inc, 5304 Ventura Drive, - * Delray Beach, FL, 33484, USA, or email info@colosa.com. - * - */ - -require_once "classes/model/Application.php"; -require_once "classes/model/AppDelegation.php"; -require_once "classes/model/AppThread.php"; -require_once "classes/model/Content.php"; -require_once "classes/model/Users.php"; -require_once "classes/model/GroupUser.php"; -require_once "classes/model/Task.php"; -require_once "classes/model/TaskUser.php"; -require_once "classes/model/Dynaform.php"; -require_once "classes/model/ProcessVariables.php"; -require_once "entities/SolrRequestData.php"; -require_once "entities/SolrUpdateDocument.php"; -require_once "entities/AppSolrQueue.php"; -require_once "classes/model/AppSolrQueue.php"; - - -/** - * Invalid search text for Solr exception - * - * @author Herbert Saal Gutierrez - * - */ - -/** - * Application APP_DATA could not be unserialized exception - * - * @author Herbert Saal Gutierrez - * - * @category Colosa - * @copyright Copyright (c) 2005-2012 Colosa Inc. (http://www.colosa.com) - */class ApplicationAPP_DATAUnserializeException extends Exception -{ - // Redefine the exception so message isn't optional - public function __construct($message, $code = 0) - { - // some code - // make sure everything is assigned properly - parent::__construct ($message, $code); - } - - // custom string representation of object - public function __toString() - { - return __CLASS__ . ": [{$this->code}]: {$this->message}\n"; - } -} diff --git a/workflow/engine/classes/ApplicationAppDataUnserializeException.php b/workflow/engine/classes/ApplicationAppDataUnserializeException.php new file mode 100644 index 000000000..91a6a0356 --- /dev/null +++ b/workflow/engine/classes/ApplicationAppDataUnserializeException.php @@ -0,0 +1,24 @@ +code}]: {$this->message}\n"; + } +} diff --git a/workflow/engine/classes/ApplicationWithCorruptDynaformException.php b/workflow/engine/classes/ApplicationWithCorruptDynaformException.php index 4d80ec312..886ee4dae 100644 --- a/workflow/engine/classes/ApplicationWithCorruptDynaformException.php +++ b/workflow/engine/classes/ApplicationWithCorruptDynaformException.php @@ -1,43 +1,4 @@ . - * - * For more information, contact Colosa Inc, 5304 Ventura Drive, - * Delray Beach, FL, 33484, USA, or email info@colosa.com. - * - */ - -require_once "classes/model/Application.php"; -require_once "classes/model/AppDelegation.php"; -require_once "classes/model/AppThread.php"; -require_once "classes/model/Content.php"; -require_once "classes/model/Users.php"; -require_once "classes/model/GroupUser.php"; -require_once "classes/model/Task.php"; -require_once "classes/model/TaskUser.php"; -require_once "classes/model/Dynaform.php"; -require_once "classes/model/ProcessVariables.php"; -require_once "entities/SolrRequestData.php"; -require_once "entities/SolrUpdateDocument.php"; -require_once "entities/AppSolrQueue.php"; -require_once "classes/model/AppSolrQueue.php"; - - /** * Invalid search text for Solr exception * @@ -47,12 +8,8 @@ require_once "classes/model/AppSolrQueue.php"; /** * Dynaform file corrupt - * - * @author Herbert Saal Gutierrez - * - * @category Colosa - * @copyright Copyright (c) 2005-2012 Colosa Inc. (http://www.colosa.com) - */class ApplicationWithCorruptDynaformException extends Exception + */ +class ApplicationWithCorruptDynaformException extends Exception { // Redefine the exception so message isn't optional public function __construct($message, $code = 0) diff --git a/workflow/engine/classes/FileCache.php b/workflow/engine/classes/FileCache.php index bccc67c88..8d1b1b1ae 100644 --- a/workflow/engine/classes/FileCache.php +++ b/workflow/engine/classes/FileCache.php @@ -26,31 +26,7 @@ */ -/** - * class.memcached.php - * - * @package workflow.engine.ProcessMaker - * - * ProcessMaker Open Source Edition - * Copyright (C) 2004 - 2011 Colosa Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */class FileCache +class FileCache { function __construct ($dir) { diff --git a/workflow/engine/classes/Groups.php b/workflow/engine/classes/Groups.php index 595b739c9..8e721890e 100644 --- a/workflow/engine/classes/Groups.php +++ b/workflow/engine/classes/Groups.php @@ -1,34 +1,5 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ -require_once 'classes/model/Groupwf.php'; -require_once 'classes/model/GroupUser.php'; -require_once 'classes/model/Users.php'; - /** * Groups - Groups /** @@ -36,7 +7,8 @@ require_once 'classes/model/Users.php'; * * @package workflow.engine.ProcessMaker * @copyright 2007 COLOSA - */class Groups + */ +class Groups { /** diff --git a/workflow/engine/classes/GulliverBasePeer.php b/workflow/engine/classes/GulliverBasePeer.php index 2196741bf..ab6eb3ede 100644 --- a/workflow/engine/classes/GulliverBasePeer.php +++ b/workflow/engine/classes/GulliverBasePeer.php @@ -1,29 +1,4 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ require_once 'propel/util/BasePeer.php'; // The object @@ -33,7 +8,8 @@ require_once 'propel/util/BasePeer.php'; * * * @package workflow.engine.classes - */abstract class GulliverBasePeer + */ +abstract class GulliverBasePeer { /** diff --git a/workflow/engine/classes/PmSsoClass.php b/workflow/engine/classes/PmSsoClass.php index b76080080..dcc1fe6ea 100644 --- a/workflow/engine/classes/PmSsoClass.php +++ b/workflow/engine/classes/PmSsoClass.php @@ -3,12 +3,7 @@ * class.pmSso.php * */ - - -/** - * class.pmSso.php - * - */ class pmSsoClass extends PMPlugin { +class PmSsoClass extends PMPlugin { function __construct() { } diff --git a/workflow/engine/classes/PopupMenu.php b/workflow/engine/classes/PopupMenu.php index e0e97adb2..9c0112862 100644 --- a/workflow/engine/classes/PopupMenu.php +++ b/workflow/engine/classes/PopupMenu.php @@ -1,41 +1,16 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ - + * PopupMenu - PopupMenu /** - * popupMenu - popupMenu -/** - * popupMenu - popupMenu class + * PopupMenu - PopupMenu class * * @package workflow.engine.ProcessMaker * @copyright COLOSA - */class popupMenu extends form + */ +class PopupMenu extends form { - var $type = 'popupMenu'; + var $type = 'PopupMenu'; var $theme = 'processmaker'; /** diff --git a/workflow/engine/classes/Processes.php b/workflow/engine/classes/Processes.php index 8f8646aae..3c7b60397 100644 --- a/workflow/engine/classes/Processes.php +++ b/workflow/engine/classes/Processes.php @@ -1,54 +1,6 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ - -/** - * class.processes.php - * - * @package workflow.engine.ProcessMaker - * - * ProcessMaker Open Source Edition - * Copyright (C) 2004 - 2008 Colosa Inc.23 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */class Processes +class Processes { /** diff --git a/workflow/engine/classes/PropelTable.php b/workflow/engine/classes/PropelTable.php index e0d751de9..40383cd50 100644 --- a/workflow/engine/classes/PropelTable.php +++ b/workflow/engine/classes/PropelTable.php @@ -1,50 +1,22 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - * - */ use ProcessMaker\Plugins\PluginRegistry; /** * Class pagedTable - * - * @author David S. Callizaya S. * - * @access public * @package workflow.gulliver.system * dependencies TemplatePower Form XmlForm */ - + /** * Class pagedTable * - * @author David S. Callizaya S. * * @access public * @package workflow.gulliver.system * dependencies TemplatePower Form XmlForm - */class propelTable + */ +class PropelTable { public $xmlFormFile; public $currentPage; diff --git a/workflow/engine/classes/ReplacementLogo.php b/workflow/engine/classes/ReplacementLogo.php index 8c72ea09f..4a9d92d1a 100644 --- a/workflow/engine/classes/ReplacementLogo.php +++ b/workflow/engine/classes/ReplacementLogo.php @@ -1,45 +1,15 @@ . - * - * For more information, contact Colosa Inc, 2566 Le Jeune Rd., - * Coral Gables, FL, 33134, USA, or email info@colosa.com. - */ - /** * * @package workflow.engine.classes */ - - -/** - * - * @package workflow.engine.classes - */class replacementLogo +class ReplacementLogo { //var $dir=''; /** - * This function is the constructor of the replacementLogo class + * This function is the constructor of the ReplacementLogo class * param * * @return void diff --git a/workflow/engine/classes/XmlForm_Field_PopupOption.php b/workflow/engine/classes/XmlForm_Field_PopupOption.php index ffa02cade..929bc6dab 100644 --- a/workflow/engine/classes/XmlForm_Field_PopupOption.php +++ b/workflow/engine/classes/XmlForm_Field_PopupOption.php @@ -1,7 +1,7 @@ getRow(); $flagActionsByEmail = false; if($dataAbe['ABE_TYPE']!='' && $data->USR_UID!=''){ - $actionsByEmail = new actionsByEmailCoreClass(); + $actionsByEmail = new ActionsByEmailCoreClass(); $actionsByEmail->sendActionsByEmail($data, $dataAbe); } } diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index 17591826a..33fadfae5 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -790,7 +790,7 @@ class adminProxy extends HttpProxyController { $uplogo = PATH_TPL . 'setup' . PATH_SEP . 'uplogo.html'; $width = "100%"; - $upload = new replacementLogo(); + $upload = new ReplacementLogo(); $aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']); $sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']); $check = ''; @@ -1093,7 +1093,7 @@ class adminProxy extends HttpProxyController */ public function getNameCurrentLogo() { - $upload = new replacementLogo(); + $upload = new ReplacementLogo(); $aPhotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']); $sPhotoSelect = trim($aPhotoSelect['DEFAULT_LOGO_NAME']); return $sPhotoSelect; diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php index 4255bd3df..5ff4f9e25 100644 --- a/workflow/engine/controllers/main.php +++ b/workflow/engine/controllers/main.php @@ -465,7 +465,7 @@ class Main extends Controller if (defined( "SYS_SYS" )) { if (($aFotoSelect = $this->memcache->get( 'aFotoSelect' )) === false) { - $oLogoR = new replacementLogo(); + $oLogoR = new ReplacementLogo(); $aFotoSelect = $oLogoR->getNameLogo( (isset( $_SESSION['USER_LOGGED'] )) ? $_SESSION['USER_LOGGED'] : '' ); $this->memcache->set( 'aFotoSelect', $aFotoSelect, 1 * 3600 ); } diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php index ab16993d0..b8f568d49 100644 --- a/workflow/engine/methods/login/login.php +++ b/workflow/engine/methods/login/login.php @@ -131,7 +131,7 @@ if (isset ($_SESSION['USER_LOGGED'])) { $licensedFeatures = & PMLicensedFeatures::getSingleton(); if ($licensedFeatures->verifyfeature('x4TTzlISnp2K2tnSTJoMC8rTDRMTjlhMCtZeXV0QnNCLzU=')) { //Check in SSO class - $oSso = new pmSsoClass(); + $oSso = new PmSsoClass(); $res = $oSso->ssocVerifyUser(); if($res){ // Start new session diff --git a/workflow/engine/methods/services/ActionsByEmail.php b/workflow/engine/methods/services/ActionsByEmail.php index 5ef64e439..0b74dd7f2 100644 --- a/workflow/engine/methods/services/ActionsByEmail.php +++ b/workflow/engine/methods/services/ActionsByEmail.php @@ -1,4 +1,5 @@ verifyfeature('zLhSk5TeEQrNFI2RXFEVktyUGpnczV1WEJNWVp6cjYxbTU3R29mVXVZNWhZQT0=')) { @@ -54,8 +55,6 @@ if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) { $dataResponses['ABE_RES_MESSAGE'] = ''; try { - require_once 'classes/model/AbeResponses.php'; - $abeAbeResponsesInstance = new AbeResponses(); $dataResponses['ABE_RES_UID'] = $abeAbeResponsesInstance->createOrUpdate($dataResponses); } catch (Exception $e) { diff --git a/workflow/engine/methods/setup/replacementLogo.php b/workflow/engine/methods/setup/replacementLogo.php index 3ca46fffa..82b94d3a2 100644 --- a/workflow/engine/methods/setup/replacementLogo.php +++ b/workflow/engine/methods/setup/replacementLogo.php @@ -1,6 +1,6 @@ assign('tpl_menu', PATH_TEMPLATE . 'menu.html'); $smarty->assign('tpl_submenu', PATH_TEMPLATE . 'submenu.html'); - $oLogoR = new replacementLogo(); + $oLogoR = new ReplacementLogo(); if(defined("SYS_SYS")){ $aFotoSelect = $oLogoR->getNameLogo((isset($_SESSION['USER_LOGGED']))?$_SESSION['USER_LOGGED']:''); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php index 4a66a77bd..da74ca677 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php @@ -670,7 +670,7 @@ class ActionsByEmail //SSO if (\PMLicensedFeatures::getSingleton()->verifyfeature('x4TTzlISnp2K2tnSTJoMC8rTDRMTjlhMCtZeXV0QnNCLzU=')) { - $sso = new \pmSsoClass(); + $sso = new \PmSsoClass(); if ($sso->ssocVerifyUser()) { global $RBAC; diff --git a/workflow/engine/classes/class.actionsByEmailUtils.php b/workflow/engine/src/ProcessMaker/Util/helpers.php similarity index 73% rename from workflow/engine/classes/class.actionsByEmailUtils.php rename to workflow/engine/src/ProcessMaker/Util/helpers.php index ce242fc39..8896de766 100644 --- a/workflow/engine/classes/class.actionsByEmailUtils.php +++ b/workflow/engine/src/ProcessMaker/Util/helpers.php @@ -1,50 +1,44 @@ appUid))? $httpData->appUid : ''; - - $usrUid = (isset($httpData->usrUid))? $httpData->usrUid : '' ; - - require_once ( "classes/model/AppNotes.php" ); - + $appUid = (isset($httpData->appUid)) ? $httpData->appUid : ''; + $usrUid = (isset($httpData->usrUid)) ? $httpData->usrUid : ''; $appNotes = new AppNotes(); $noteContent = addslashes($httpData->noteText); - $result = $appNotes->postNewNote($appUid, $usrUid, $noteContent, false); - //return true; - //die(); //send the response to client @ini_set('implicit_flush', 1); ob_start(); - //echo G::json_encode($result); @ob_flush(); @flush(); @ob_end_flush(); ob_implicit_flush(1); - //return true; + //send notification in background $noteRecipientsList = array(); $oCase = new Cases(); - $p = $oCase->getUsersParticipatedInCase($appUid); - foreach ($p['array'] as $key => $userParticipated) { $noteRecipientsList[] = $key; } $noteRecipients = implode(",", $noteRecipientsList); - $appNotes->sendNoteNotification($appUid, $usrUid, $noteContent, $noteRecipients); - } +/** + * We will get to the abeRequest data from actions by email + * @param string $AbeRequestsUid + * @return array $abeRequests + */ function loadAbeRequest($AbeRequestsUid) { - require_once 'classes/model/AbeRequests.php'; - $criteria = new Criteria(); $criteria->add(AbeRequestsPeer::ABE_REQ_UID, $AbeRequestsUid); $resultRequests = AbeRequestsPeer::doSelectRS($criteria); @@ -55,10 +49,13 @@ function loadAbeRequest($AbeRequestsUid) return $abeRequests; } +/** + * We will get the AbeConfiguration by actions by email + * @param string $AbeConfigurationUid + * @return array $abeConfiguration + */ function loadAbeConfiguration($AbeConfigurationUid) { - require_once 'classes/model/AbeConfiguration.php'; - $criteria = new Criteria(); $criteria->add(AbeConfigurationPeer::ABE_UID, $AbeConfigurationUid); $result = AbeConfigurationPeer::doSelectRS($criteria); @@ -69,10 +66,14 @@ function loadAbeConfiguration($AbeConfigurationUid) return $abeConfiguration; } +/** + * We will update the request by actions by email + * @param array $data + * @return void + * @throws Exception + */ function uploadAbeRequest($data) { - require_once 'classes/model/AbeRequests.php'; - try { $abeRequestsInstance = new AbeRequests(); $abeRequestsInstance->createOrUpdate($data); diff --git a/workflow/engine/templates/setup/uplogo.php b/workflow/engine/templates/setup/uplogo.php index a19dbe42c..bc698c3a2 100644 --- a/workflow/engine/templates/setup/uplogo.php +++ b/workflow/engine/templates/setup/uplogo.php @@ -33,7 +33,7 @@ try { $template->assign ('WIDTH_PANEL' ,$width); $template->assign ('WIDTH_PANEL_20' ,$width-20); - $upload = new replacementLogo(); + $upload = new ReplacementLogo(); $aFotoSelect = $upload->getNameLogo($_SESSION['USER_LOGGED']); $sFotoSelect = trim($aFotoSelect['DEFAULT_LOGO_NAME']); $check ='';