HOR-3670

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": {

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 );

workflow/engine/classes/AppSolr.php

@@ -10,11 +10,6 @@
 /**
  * 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
 {

workflow/engine/classes/ApplicationAppDataUnserializeException.php

@@ -1,16 +1,10 @@
 <?php
 /**
  * Invalid search text for Solr exception
- *
- * @author Herbert Saal Gutierrez
- *        
  */
 
 /**
  * Application APP_DATA could not be unserialized exception
- *
- * @category Colosa
- * @copyright Copyright (c) 2005-2012 Colosa Inc. (http://www.colosa.com)
  */
 class ApplicationAppDataUnserializeException extends Exception
 {

workflow/engine/classes/ApplicationWithCorruptDynaformException.php

@@ -8,11 +8,6 @@
 
 /**
  * Dynaform file corrupt
- *
- * @author Herbert Saal Gutierrez
- *
- * @category Colosa
- * @copyright Copyright (c) 2005-2012 Colosa Inc. (http://www.colosa.com)
  */
 class ApplicationWithCorruptDynaformException extends Exception
 {

workflow/engine/classes/PmSsoClass.php

@@ -3,12 +3,7 @@
  * class.pmSso.php
  *  
  */
- 
+class PmSsoClass extends PMPlugin {
-  
-/**
- * class.pmSso.php
- *  
- */  class pmSsoClass extends PMPlugin {
     function __construct() {
     }
 

workflow/engine/classes/PopupMenu.php

@@ -1,41 +1,16 @@
 <?php
 
 /**
- * class.popupMenu.php
+ * PopupMenu - PopupMenu
- *
- * @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 <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- *
- */
-
 /**
- * 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';
 
     /**

workflow/engine/classes/Processes.php

@@ -1,54 +1,6 @@
 <?php
-/**
- * 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 <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
 
-
+class Processes
-/**
- * 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 <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */class Processes
 {
 
     /**

workflow/engine/classes/PropelTable.php

@@ -1,50 +1,22 @@
 <?php
-/**
- * class.propelTable.php
- *
- * @package workflow.gulliver.system
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- * 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. <davidsantos@colosa.com> *
- * @access public
  * @package workflow.gulliver.system
  * dependencies TemplatePower Form XmlForm
  */
 
-
+
 /**
  * Class pagedTable
  *
- * @author David S. Callizaya S. <davidsantos@colosa.com> *
  * @access public
  * @package workflow.gulliver.system
  * dependencies TemplatePower Form XmlForm
- */class propelTable
+ */
+class PropelTable
 {
     public $xmlFormFile;
     public $currentPage;

workflow/engine/classes/ReplacementLogo.php

@@ -1,45 +1,15 @@
 <?php
 
-/**
- * class.replacementLogo.php
- *
- * @package workflow.engine.classes
- *
- * 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 <http://www.gnu.org/licenses/>.
- *
- * For more information, contact Colosa Inc, 2566 Le Jeune Rd.,
- * Coral Gables, FL, 33134, USA, or email info@colosa.com.
- */
-
 /**
  *
  * @package workflow.engine.classes
  */
-
+class ReplacementLogo
-
-/**
- *
- * @package workflow.engine.classes
- */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

workflow/engine/classes/XmlForm_Field_PopupOption.php

@@ -1,7 +1,7 @@
 <?php
 
 /**
- * class.popupMenu.php
+ * class.PopupMenu.php
  *
  * @package workflow.engine.ProcessMaker
  *
@@ -27,7 +27,7 @@
  */
 
 /**
- * popupMenu - popupMenu 
+ * PopupMenu - PopupMenu
 /**
  * XmlForm_Field_popupOption - XmlForm_Field_popupOption class
  *

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;

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 );
             }

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

workflow/engine/methods/services/ActionsByEmail.php

@@ -1,4 +1,5 @@
 <?php
+
 /*----------------------------------********---------------------------------*/
 if (isset($_GET['BROWSER_TIME_ZONE_OFFSET'])) {
     if (PMLicensedFeatures::getSingleton()->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) {

workflow/engine/methods/setup/replacementLogo.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * replacementLogo.php
+ * ReplacementLogo.php
  *
  * ProcessMaker Open Source Edition
  * Copyright (C) 2004 - 2008 Colosa Inc.23
@@ -38,17 +38,6 @@ try { //ini_set('display_errors','1');
 
     function changeNamelogo ($snameLogo)
     {
-        // The ereg_replace function has been DEPRECATED as of PHP 5.3.0.
-        // $snameLogo = ereg_replace("[áàâãª]","a",$snameLogo);
-        // $snameLogo = ereg_replace("[Ã<>ÀÂÃ]","A",$snameLogo);
-        // $snameLogo = ereg_replace("[Ã<>ÌÎ]","I",$snameLogo);
-        // $snameLogo = ereg_replace("[íìî]","i",$snameLogo);
-        // $snameLogo = ereg_replace("[éèê]","e",$snameLogo);
-        // $snameLogo = ereg_replace("[ÉÈÊ]","E",$snameLogo);
-        // $snameLogo = ereg_replace("[óòôõº]","o",$snameLogo);
-        // $snameLogo = ereg_replace("[ÓÒÔÕ]","O",$snameLogo);
-        // $snameLogo = ereg_replace("[úùû]","u",$snameLogo);
-        // $snameLogo = ereg_replace("[ÚÙÛ]","U",$snameLogo);
         $snameLogo = preg_replace( "/[áàâãª]/", "a", $snameLogo );
         $snameLogo = preg_replace( "/[Ã<>ÀÂÃ]/", "A", $snameLogo );
         $snameLogo = preg_replace( "/[Ã<>ÌÎ]/", "I", $snameLogo );

workflow/engine/skinEngine/skinEngine.php

@@ -782,7 +782,7 @@ class SkinEngine
       $smarty->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']:'');

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;

workflow/engine/src/ProcessMaker/Util/helpers.php

@@ -1,50 +1,44 @@
 <?php
-
+/**
+ * We will send a case note in the actions by email
+ * @param object $httpData
+ * @return void
+*/
 function postNote($httpData)
 {
-    //extract(getExtJSParams());
+    $appUid = (isset($httpData->appUid)) ? $httpData->appUid : '';
-    $appUid = (isset($httpData->appUid))? $httpData->appUid : '';
+    $usrUid = (isset($httpData->usrUid)) ? $httpData->usrUid : '';
-
-    $usrUid = (isset($httpData->usrUid))? $httpData->usrUid : '' ;
-
-    require_once ( "classes/model/AppNotes.php" );
-
     $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);

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 ='';