HOR-3670-HQ

update
2017-08-14 10:56:14 -04:00
parent 73031feb70
commit 1cd6309874
50 changed files with 741 additions and 875 deletions
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -919,7 +919,7 @@ class Bootstrap
            if (((in_array($browserName, $enabledBrowsers)) || (in_array('ALL', $enabledBrowsers))) && (!(in_array($browserName, $disabledBrowsers)))) {
                if ($cssFileInfo['__ATTRIBUTES__']['file'] == 'rtl.css') {

-                    $oServerConf = & serverConf::getSingleton();
+                    $oServerConf = & ServerConf::getSingleton();
                    if (!(defined('SYS_LANG'))) {
                        if (isset($_SERVER['HTTP_REFERER'])) {
                            $syss = explode('://', $_SERVER['HTTP_REFERER']);
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -1011,7 +1011,7 @@ class G

            if (((in_array($browserName, $enabledBrowsers)) || (in_array('ALL', $enabledBrowsers)))&&(!(in_array($browserName, $disabledBrowsers)))) {
                if ($cssFileInfo['__ATTRIBUTES__']['file'] == 'rtl.css') {
-                    $oServerConf =& serverConf::getSingleton();
+                    $oServerConf =& ServerConf::getSingleton();
                    if (!(defined('SYS_LANG'))) {
                        if (isset($_SERVER['HTTP_REFERER'])) {
                            $syss = explode('://', $_SERVER['HTTP_REFERER']);
--- a/gulliver/system/class.headPublisher.php
+++ b/gulliver/system/class.headPublisher.php
@@ -360,7 +360,7 @@ class headPublisher
        //$head .= $this->getExtJsStylesheets();
        $head .= $this->getExtJsScripts();
        $head .= $this->getExtJsVariablesScript();
-        $oServerConf = & serverConf::getSingleton();
+        $oServerConf = & ServerConf::getSingleton();
        if ($oServerConf->isRtl(SYS_LANG)) {
            $head = $head . "  <script type=\"text/javascript\" src=\"" . G::browserCacheFilesUrl("/js/ext/extjs_rtl.js") . "\"></script>\n";
        }
@@ -751,7 +751,7 @@ class headPublisher
        $views = array();
        $keyState = "extJsViewState";
        $prefixExtJs = "ys-";
-        $oServerConf = &serverConf::getSingleton();
+        $oServerConf = &ServerConf::getSingleton();
        $deleteCache = true;

        $sjson = $oServerConf->getProperty($keyState);
--- a/gulliver/system/class.wysiwygEditor.php
+++ b/gulliver/system/class.wysiwygEditor.php
@@ -76,7 +76,7 @@ class XmlForm_Field_WYSIWYG_EDITOR extends XmlForm_Field
    {
        $editorDefinition  = 'tinyMCE.baseURL = "/js/tinymce/jscripts/tiny_mce"; ';
        $editorDefinition .= 'var domainURL   = "/sys'.SYS_SYS.'/'.SYS_LANG.'/'.SYS_SKIN.'/"';
-        $serverConf =& serverConf::getSingleton();
+        $serverConf =& ServerConf::getSingleton();

        switch ($this->editorType){
            case 'EMAIL_TEMPLATE':
--- a/workflow/engine/PmBootstrap.php
+++ b/workflow/engine/PmBootstrap.php
@@ -97,7 +97,7 @@ class PmBootstrap extends Bootstrap
        $this->autoloader->registerClass('Xml_Node', PATH_GULLIVER . 'class.xmlDocument');
        $this->autoloader->registerClass('Xml_document', PATH_GULLIVER . 'class.xmlDocument');
        $this->autoloader->registerClass('XmlForm_Field_*', PATH_GULLIVER . 'class.xmlform');
-        $this->autoloader->registerClass('serverConf', PATH_CORE . 'classes/class.serverConfiguration');
+        $this->autoloader->registerClass('ServerConf', PATH_CORE . 'classes/class.serverConfiguration');
    }

    /**
--- a/workflow/engine/bin/cron_single.php
+++ b/workflow/engine/bin/cron_single.php
@@ -333,7 +333,7 @@ function resendEmails()
            $dateResend = date("Y-m-d H:i:s", $mktDateSystem - (7 * 24 * 60 * 60));
        }

-        $oSpool = new spoolRun();
+        $oSpool = new SpoolRun();
        $oSpool->resendEmails($dateResend, 1);

        saveLog("resendEmails", "action", "Resending Emails", "c");
--- a/workflow/engine/classes/Cases.php
+++ b/workflow/engine/classes/Cases.php
@@ -5503,7 +5503,7 @@ class Cases
            }

            if ($sTo != null) {
-                $oSpool = new spoolRun();
+                $oSpool = new SpoolRun();

                $oSpool->setConfig($dataLastEmail['configuration']);
                $oSpool->create(array(
--- a/workflow/engine/classes/EnterpriseClass.php
+++ b/workflow/engine/classes/EnterpriseClass.php
@@ -99,7 +99,7 @@ class EnterpriseClass extends PMPlugin

    public function enterpriseLimitCreateUser()
    {
-        $oServerConf = &serverConf::getSingleton();
+        $oServerConf = &ServerConf::getSingleton();
        $infoLicense =$oServerConf->getProperty('LICENSE_INFO');
        if (isset($infoLicense[SYS_SYS]['LIMIT_USERS'])) {
            $criteria = new Criteria('workflow');
--- a/workflow/engine/classes/Gzip_File.php
+++ b/workflow/engine/classes/Gzip_File.php
@@ -12,18 +12,13 @@
 * only if this copyright statement is not removed
 *--------------------------------------------------*/

-/**
- *
- * @package workflow.engine.classes
- */

 /**
 * This class is derived of the class archive, is employed to use archives .
 * gzip
- *
 * @package workflow.engine.classes
- *
- */class gzip_file extends TarFile
+ */
+class GzipFile extends TarFile
 {

    /**
--- a/workflow/engine/classes/PMPluginRegistry.php
+++ b/workflow/engine/classes/PMPluginRegistry.php
@@ -1100,7 +1100,7 @@ class PMPluginRegistry
    {
        try {
            $iPlugins = 0;
-            $oServerConf = & serverConf::getSingleton();
+            $oServerConf = & ServerConf::getSingleton();
            $oServerConf->addPlugin( SYS_SYS, $this->_aPluginDetails );
            foreach ($this->_aPluginDetails as $namespace => $detail) {
                if (isset( $detail->enabled ) && $detail->enabled) {
--- a/workflow/engine/classes/PmDynaform.php
+++ b/workflow/engine/classes/PmDynaform.php
@@ -33,7 +33,7 @@
        $this->context = \Bootstrap::getDefaultContextLog();
        $this->dataSources = array("database", "dataVariable");
        $this->pathRTLCss = '/lib/pmdynaform/build/css/PMDynaform-rtl.css';
-        $this->serverConf = &serverConf::getSingleton();
+        $this->serverConf = &ServerConf::getSingleton();
        $this->isRTL = ($this->serverConf->isRtl(SYS_LANG)) ? 'true' : 'false';
        $this->fields = $fields;
        $this->propertiesToExclude = array('dataVariable');
--- a/workflow/engine/classes/PmLicenseManager.php
+++ b/workflow/engine/classes/PmLicenseManager.php
@@ -18,7 +18,7 @@ use ProcessMaker\Plugins\PluginRegistry;

    public function __construct($flagActivatePlugins = true)
    {
-        $oServerConf = &serverConf::getSingleton();
+        $oServerConf = &ServerConf::getSingleton();
        $oServerConf->setProperty('LOGIN_NO_WS', true);

        //to do: this files probably needs to be in core, since they are GPL2
@@ -380,7 +380,7 @@ use ProcessMaker\Plugins\PluginRegistry;
            return false;
        } else {

-            $oServerConf = & serverConf::getSingleton ();
+            $oServerConf = & ServerConf::getSingleton ();
            $oServerConf->setProperty ( 'ACTIVE_LICENSE',array(SYS_SYS => $path));
            $this->saveDataLicense( $results, $path, $redirect );
            if ($redirect) {
--- a/workflow/engine/classes/PmSystem.php
+++ b/workflow/engine/classes/PmSystem.php
@@ -292,7 +292,7 @@ class PmSystem
     */
    public function getUpgradedFilesList ()
    {
-        $this->sFilesList = new gzip_file( $this->sFilename );
+        $this->sFilesList = new GzipFile( $this->sFilename );
        $this->sFilesList->set_options( array ('basedir' => dirname( $this->sFilename ),'overwrite' => 1
        ) );
        $this->sFilesList->extract_files();
--- a/workflow/engine/classes/Report.php
+++ b/workflow/engine/classes/Report.php
@@ -1,40 +1,9 @@
 <?php

-/**
- * class.report.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 <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.
- *
- */
-
 /**
 * Report - Report
-/**
- * Report - Report class
- *
- * @package workflow.engine.ProcessMaker
- * @author Everth S. Berrios Morales
- * @copyright 2008 COLOSA
- */class Report
+ */
+class Report
 {

    /**
--- a/workflow/engine/classes/ReportTables.php
+++ b/workflow/engine/classes/ReportTables.php
@@ -1,40 +1,9 @@
 <?php
-/**
- * class.reportTables.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 <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.
- *
- */
-

 /**
 * ReportTables - Report tables
-/**
- * ReportTables - Report tables class
- *
- * @package workflow.engine.ProcessMaker
- * @author Julio Cesar Laura Avenda<64>o
- * @copyright 2007 COLOSA
- */class ReportTables
+ */
+class ReportTables
 {
    private $aDef = array('mysql' => array('number' => 'DOUBLE', 'char' => 'VARCHAR(255)', 'text' => 'TEXT', 'date' => 'DATETIME'
    ), 'pgsql' => array('number' => 'DOUBLE', 'char' => 'VARCHAR(255)', 'text' => 'TEXT', 'date' => 'DATETIME'
--- a/workflow/engine/classes/ServerConf.php
+++ b/workflow/engine/classes/ServerConf.php
@@ -1,40 +1,9 @@
 <?php

-/**
- * class.serverConfiguration.php
- *
- * @package workflow.engine.ProcessMaker
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 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.
- */
-
 /**
 * ServerConfiguration - serverConf
-/**
- * ServerConfiguration - serverConf class
- *
- * @author Hugo Loza
- * @copyright 2010 COLOSA
- * @license GNU Affero General Public License
- * @package workflow.engine.ProcessMaker
- */class serverConf
+ */
+class ServerConf
 {

    private $_aProperties = array();
@@ -80,7 +49,7 @@
    public static function &getSingleton()
    {
        if (self::$instance == null) {
-            self::$instance = new serverConf();
+            self::$instance = new ServerConf();
            if ((file_exists(self::$instance->filePath)) && (filesize(self::$instance->filePath) > 0)) {
                self::$instance->unSerializeInstance(file_get_contents(self::$instance->filePath));
            }
@@ -108,7 +77,7 @@
    public function unSerializeInstance($serialized)
    {
        if (self::$instance == null) {
-            self::$instance = new serverConf();
+            self::$instance = new ServerConf();
        }

        if ($instance = unserialize($serialized)) {
@@ -272,8 +241,7 @@
                                $wsInfo = $this->aWSinfo[$file];
                            } else {
                                $wsInfo['num_processes'] = "not gathered yet";
-                                $wsInfo['num_cases'] = "not gathered yet";
-                                ;
+                                $wsInfo['num_cases'] = "not gathered yet";;
                                $wsInfo['num_users'] = "not gathered yet";
                            }
                            $wsArray[$file] = array('WSP_ID' => $file, 'WSP_NAME' => $file, 'WSP_STATUS' => $statusl, 'WSP_PROCESS_COUNT' => $wsInfo['num_processes'], 'WSP_CASES_COUNT' => $wsInfo['num_cases'], 'WSP_USERS_COUNT' => isset($wsInfo['num_users']) ? $wsInfo['num_users'] : "");
--- a/workflow/engine/classes/Sessions.php
+++ b/workflow/engine/classes/Sessions.php
@@ -28,13 +28,11 @@ require_once 'classes/model/Session.php';

 /**
 * Sessions - Sessions
-/**
+ * /**
 * Sessions - Sessions class
- *
 * @package workflow.engine.ProcessMaker
- * @author Everth S. Berrios Morales
- * @copyright 2008 COLOSA
- */class Sessions
+ */
+class Sessions
 {

    protected $tmpfile;
--- a/workflow/engine/classes/SpoolRun.php
+++ b/workflow/engine/classes/SpoolRun.php
@@ -1,30 +1,4 @@
 <?php
-/**
- * class.spool.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.
- *
- */
-
 /**
 * spoolRun - brief send email from the spool database, and see if we have all the addresses we send to.
 *
@@ -35,15 +9,9 @@
 */

 /**
- * LOG FIXES
- * =========
- *
- * 24-03-2010 Erik A.O. <erik@colosa.com>
- * class: the $ExceptionCode and $aWarnings 
-/**
- *
 * @package workflow.engine.ProcessMaker
- */class spoolRun
+ */
+class SpoolRun
 {
    public $config;
    private $fileData;
--- a/workflow/engine/classes/WorkspaceTools.php
+++ b/workflow/engine/classes/WorkspaceTools.php
@@ -3588,7 +3588,7 @@ class WorkspaceTools
        $conf = new Configurations();
        if (!$conf->exists('AUDIT_LOG', 'log')) {
            CLI::logging("> Updating Auditlog Config \n");
-            $oServerConf = &serverConf::getSingleton();
+            $oServerConf = &ServerConf::getSingleton();
            $sAudit = $oServerConf->getAuditLogProperty('AL_OPTION', $workspace);
            $conf->aConfig = ($sAudit == 1) ? 'true' : 'false';
            $conf->saveConfig('AUDIT_LOG', 'log');
--- a/workflow/engine/classes/WsBase.php
+++ b/workflow/engine/classes/WsBase.php
@@ -891,7 +891,7 @@ class WsBase
               $msgError = "The default configuration wasn't defined";
            }

-            $oSpool = new spoolRun();
+            $oSpool = new SpoolRun();

            $oSpool->setConfig($aSetup);

--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -181,7 +181,7 @@ class AppNotes extends BaseAppNotes
                $aUser = $oUser->load( $recipientUid );

                $sTo = ((($aUser['USR_FIRSTNAME'] != '') || ($aUser['USR_LASTNAME'] != '')) ? $aUser['USR_FIRSTNAME'] . ' ' . $aUser['USR_LASTNAME'] . ' ' : '') . '<' . $aUser['USR_EMAIL'] . '>';
-                $oSpool = new spoolRun();
+                $oSpool = new SpoolRun();

                $oSpool->setConfig($aConfiguration);
                $oSpool->create(
--- a/workflow/engine/classes/model/OutputDocument.php
+++ b/workflow/engine/classes/model/OutputDocument.php
@@ -885,7 +885,7 @@ class OutputDocument extends BaseOutputDocument
        $pdf->SetRightMargin($margins['right']);
        $pdf->SetAutoPageBreak(true, $margins['bottom']);

-        $oServerConf = &serverConf::getSingleton();
+        $oServerConf = &ServerConf::getSingleton();

        // set some language dependent data:
        $lg = array();
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -619,7 +619,7 @@ class adminProxy extends HttpProxyController
        $sBodyPre->assign('msg', $msg);
        $sBody = $sBodyPre->getOutputContent();

-        $oSpool = new spoolRun();
+        $oSpool = new SpoolRun();

        $oSpool->setConfig($aConfiguration);

@@ -1384,7 +1384,7 @@ class adminProxy extends HttpProxyController
        require_once (PATH_CONTROLLERS . "installer.php");
        $params = array ();

-        $oServerConf = &serverConf::getSingleton();
+        $oServerConf = &ServerConf::getSingleton();
        $pluginRegistry = PluginRegistry::loadSingleton();
        $licenseManager = &PmLicenseManager::getSingleton();

--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -133,7 +133,7 @@ class Home extends Controller
            }
        }

-        $oServerConf = & serverConf::getSingleton();
+        $oServerConf = & ServerConf::getSingleton();

        if ($oServerConf->isRtl( SYS_LANG )) {
            $swRtl = 1;
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -199,7 +199,7 @@ class Main extends Controller

        if (($nextBeatDate = $this->memcache->get( 'nextBeatDate' )) === false) {
            //get the serverconf singleton, and check if we can send the heartbeat
-            $oServerConf = & serverConf::getSingleton();
+            $oServerConf = & ServerConf::getSingleton();
            $sflag = $oServerConf->getHeartbeatProperty( 'HB_OPTION', 'HEART_BEAT_CONF' );
            $sflag = (trim( $sflag ) != '') ? $sflag : '1';
            //get date of next beat
@@ -305,7 +305,7 @@ class Main extends Controller
        $aField['LOGIN_VERIFY_MSG'] = G::loadTranslation( 'LOGIN_VERIFY_MSG' );

        //Get Server Configuration
-        $oServerConf = & serverConf::getSingleton();
+        $oServerConf = & ServerConf::getSingleton();

        $availableLangArray = $this->getLanguagesList();

@@ -515,7 +515,7 @@ class Main extends Controller

    private function getWorkspacesAvailable ()
    {
-        $oServerConf = & serverConf::getSingleton();
+        $oServerConf = & ServerConf::getSingleton();
        $dir = PATH_DB;
        $filesArray = array ();
        if (file_exists( $dir )) {
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -267,7 +267,7 @@ class pmTablesProxy extends HttpProxyController
                }

                if ($row->type == 'CLASSIC') {
-                    $rp = new reportTables();
+                    $rp = new ReportTables();
                    $rp->deleteReportTable( $row->id );
                    $count ++;
                } else {
--- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
@@ -194,7 +194,7 @@ if ($actionAjax == 'sendMailMessage_JXP') {

        $aSetup = PmSystem::getEmailConfiguration();

-        $oSpool = new spoolRun();
+        $oSpool = new SpoolRun();

        $oSpool->setConfig($aSetup);
        $oSpool->create( array ('msg_uid' => $data['MSG_UID'],'app_uid' => $data['APP_UID'],'del_index' => $data['DEL_INDEX'],'app_msg_type' => $data['APP_MSG_TYPE'],'app_msg_subject' => $data['APP_MSG_SUBJECT'],'app_msg_from' => $data['APP_MSG_FROM'],'app_msg_to' => $data['APP_MSG_TO'],'app_msg_body' => $data['APP_MSG_BODY'],'app_msg_cc' => $data['APP_MSG_CC'],'app_msg_bcc' => $data['APP_MSG_BCC'],'app_msg_attach' => $data['APP_MSG_ATTACH'],'app_msg_template' => $data['APP_MSG_TEMPLATE'],'app_msg_status' => 'pending'
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -805,7 +805,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
            $aSetup['MESS_RAUTH'] = 1;
        }

-        $oSpool = new spoolRun();
+        $oSpool = new SpoolRun();
        $oSpool->setConfig(
            array (
                'MESS_ENGINE' => $aSetup['MESS_ENGINE'],
--- a/workflow/engine/methods/cases/main_init.php
+++ b/workflow/engine/methods/cases/main_init.php
@@ -122,7 +122,7 @@ if (isset($_SESSION['__OPEN_APPLICATION_UID__'])) {
    }
 }

-$oServerConf = & serverConf::getSingleton();
+$oServerConf = & ServerConf::getSingleton();
 if ($oServerConf->isRtl( SYS_LANG )) {
    $regionTreePanel = 'east';
    $regionDebug = 'west';
--- a/workflow/engine/methods/install/heartbeatStatus.php
+++ b/workflow/engine/methods/install/heartbeatStatus.php
@@ -2,7 +2,7 @@

 try {
    if (isset( $_REQUEST['status'] )) {
-        $oServerConf = & serverConf::getSingleton();
+        $oServerConf = & ServerConf::getSingleton();
        /*you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace*/
        if ($_REQUEST['status']) {
            echo "ACTIVE (Thanks!)";
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -293,7 +293,7 @@ try {
    unset($_SESSION['FAILED_LOGINS']);

    // increment logins in heartbeat
-    $oServerConf =& serverConf::getSingleton();
+    $oServerConf =& ServerConf::getSingleton();
    $oServerConf->sucessfulLogin();

    // Assign the uid of user to userloggedobj
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -312,7 +312,7 @@ if ($version >= 3) {
 }

 //get the serverconf singleton, and check if we can send the heartbeat
-$oServerConf = & serverConf::getSingleton();
+$oServerConf = & ServerConf::getSingleton();
 $partnerFlag = (defined('PARTNER_FLAG')) ? PARTNER_FLAG : false;
 if (!$partnerFlag) {
    $sflag = $oServerConf->getHeartbeatProperty('HB_OPTION', 'HEART_BEAT_CONF');
--- a/workflow/engine/methods/login/retrivePassword.php
+++ b/workflow/engine/methods/login/retrivePassword.php
@@ -57,7 +57,7 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
  <a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
  </tr></tbody></table>";

-    $oSpool = new spoolRun();
+    $oSpool = new SpoolRun();

    $oSpool->setConfig($aSetup);
    $oSpool->create(array(
--- a/workflow/engine/methods/login/sysLogin.php
+++ b/workflow/engine/methods/login/sysLogin.php
@@ -86,7 +86,7 @@ function getLangFiles()

 function getWorkspacesAvailable()
 {
-    $oServerConf = & serverConf::getSingleton ();
+    $oServerConf = & ServerConf::getSingleton ();
    $dir = PATH_DB;
    $filesArray = array ();
    if (file_exists ($dir)) {
@@ -156,7 +156,7 @@ $version = isset($version[0]) ? intval($version[0]) : 0;
 switch (WS_IN_LOGIN) {
    case 'serverconf':
        //Get Server Configuration
-        $oServerConf = & serverConf::getSingleton ();
+        $oServerConf = & ServerConf::getSingleton ();
        if ($oServerConf->getProperty ('LOGIN_NO_WS')) {
            $fileLogin = $version >= 3 ? 'login/sysLoginNoWSpm3' : 'login/sysLoginNoWS';
        } else {
--- a/workflow/engine/methods/reportTables/reportTables_Ajax.php
+++ b/workflow/engine/methods/reportTables/reportTables_Ajax.php
@@ -267,7 +267,7 @@ switch ($action) {
    case 'delete':

        $rows = G::json_decode( $_REQUEST['rows'] );
-        $rp = new reportTables();
+        $rp = new ReportTables();
        $at = new AdditionalTables();

        try {
--- a/workflow/engine/methods/setup/auditLogConfigAjax.php
+++ b/workflow/engine/methods/setup/auditLogConfigAjax.php
@@ -4,7 +4,7 @@ global $G_TMP_MENU;
 switch ($_GET['action']) {
    case 'saveOption':
        try {
-            $oServerConf = & serverConf::getSingleton();
+            $oServerConf = & ServerConf::getSingleton();
            $response = new $oServerConf;
            $conf = new Configurations();
            /*you can use SYS_TEMP or SYS_SYS ON AUDIT_LOG_CONF to save for each workspace*/
--- a/workflow/engine/methods/setup/emailSystemCron.php
+++ b/workflow/engine/methods/setup/emailSystemCron.php
@@ -26,7 +26,7 @@ $G_SUB_MENU = 'setup';
 $G_ID_MENU_SELECTED = 'SETUP';
 $G_ID_SUB_MENU_SELECTED = 'MAILSYSTEM';

-$run = new spoolRun();
+$run = new SpoolRun();
 unset( $run );

 $Fields['MESSAGE'] = 'Hello world, this is my first email ... ';
--- a/workflow/engine/methods/setup/emails_Ajax.php
+++ b/workflow/engine/methods/setup/emails_Ajax.php
@@ -256,7 +256,7 @@ function sendTestMail ()
  <a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
  </tr></tbody></table>";

-    $oSpool = new spoolRun();
+    $oSpool = new SpoolRun();

    $passwd = $_POST['MESS_PASSWORD'];
    $passwdDec = G::decrypt( $passwd, 'EMAILENCRYPT' );
--- a/workflow/engine/methods/setup/loginSettings.php
+++ b/workflow/engine/methods/setup/loginSettings.php
@@ -27,7 +27,7 @@ $RBAC->requirePermissions( 'PM_SETUP' );
 $oConf = new Configurations();

 $oHeadPublisher = & headPublisher::getSingleton();
-$oServerConf = & serverConf::getSingleton();
+$oServerConf = & ServerConf::getSingleton();

 $oHeadPublisher->addExtJsScript( 'setup/loginSettings', true ); //adding a javascript file .js
 $oHeadPublisher->addContent( 'setup/loginSettings' ); //adding a html file  .html.
--- a/workflow/engine/methods/setup/main_init.php
+++ b/workflow/engine/methods/setup/main_init.php
@@ -93,7 +93,7 @@ $oHeadPublisher->assign( "tabActive", $tabActive );
 $oHeadPublisher->assign( "tabItems", $tabItems );
 $oHeadPublisher->assign( "_item_selected", (($adminSelected != null) ? $adminSelected : "") );

-$oServerConf = & serverConf::getSingleton();
+$oServerConf = & ServerConf::getSingleton();
 if ($oServerConf->isRtl( SYS_LANG )) {
    $regionTreePanel = 'east';
    $regionDebug = 'west';
--- a/workflow/engine/methods/setup/processHeartBeatAjax.php
+++ b/workflow/engine/methods/setup/processHeartBeatAjax.php
@@ -3,7 +3,7 @@
 switch ($_GET['action']) {
    case 'saveOption':
        try {
-            $oServerConf = & serverConf::getSingleton();
+            $oServerConf = & ServerConf::getSingleton();
            $response = new stdclass();
            /*you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace*/
            $oServerConf->unsetHeartbeatProperty( 'HB_BEAT_TYPE', 'HEART_BEAT_CONF' );
--- a/workflow/engine/methods/setup/processHeartBeatConfig.php
+++ b/workflow/engine/methods/setup/processHeartBeatConfig.php
@@ -25,7 +25,7 @@ global $RBAC;
 $RBAC->requirePermissions( 'PM_SETUP', 'PM_SETUP_HEART_BEAT');

 $oHeadPublisher = & headPublisher::getSingleton();
-$oServerConf = & serverConf::getSingleton();
+$oServerConf = & ServerConf::getSingleton();

 //you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace
 $sflag = $oServerConf->getHeartbeatProperty( 'HB_OPTION', 'HEART_BEAT_CONF' );
--- a/workflow/engine/methods/setup/processHeartBeatSave.php
+++ b/workflow/engine/methods/setup/processHeartBeatSave.php
@@ -6,7 +6,7 @@ if ($RBAC->userCanAccess( 'PM_SETUP' ) != 1 && $RBAC->userCanAccess( 'PM_SETUP_A
    die();
 }
 try {
-    $oServerConf = & serverConf::getSingleton();
+    $oServerConf = & ServerConf::getSingleton();
    /*you can use SYS_TEMP or SYS_SYS ON HEAR_BEAT_CONF to save for each workspace*/
    $sflag = $_POST['HB_OPTION'];
    $oServerConf->unsetHeartbeatProperty( 'HB_BEAT_TYPE', 'HEART_BEAT_CONF' );
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -229,7 +229,7 @@ class SkinEngine
  private function _extjs()
  {

-    $oServerConf    =& serverConf::getSingleton();
+    $oServerConf    =& ServerConf::getSingleton();
    $oHeadPublisher =& headPublisher::getSingleton();

    if( $oHeadPublisher->extJsInit === true){
@@ -303,7 +303,7 @@ class SkinEngine
        }
    }

-    $serverConf = &serverConf::getSingleton();
+    $serverConf = &ServerConf::getSingleton();

    if ($serverConf->isRtl(SYS_LANG)) {
        $dirBody = "dir=\"RTL\"";
@@ -551,7 +551,7 @@ class SkinEngine
  private function _mvc()
  {

-    $oServerConf =& serverConf::getSingleton();
+    $oServerConf =& ServerConf::getSingleton();
    $oHeadPublisher =& headPublisher::getSingleton();

    $smarty = new Smarty();
@@ -644,7 +644,7 @@ class SkinEngine

    //To setup en extJS Theme for this Skin

-    $oServerConf =& serverConf::getSingleton();
+    $oServerConf =& ServerConf::getSingleton();
    $extSkin = $oServerConf->getProperty("extSkin");

    if(!$extSkin) {
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -4,6 +4,7 @@ namespace ProcessMaker\BusinessModel;

 use ProcessMaker\Plugins\PluginRegistry;
 use PmDynaform;
+use SpoolRun;

 /**
 * Description of ActionsByEmailService
@@ -409,7 +410,7 @@ class ActionsByEmail
                }
                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \PmSystem::getEmailConfiguration();

-                $spool = new \spoolRun();
+                $spool = new SpoolRun();
                $spool->setConfig($aSetup);

                $spool->create(array(
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Consolidated.php
@@ -9,11 +9,8 @@ use ResultSet;
 use CaseConsolidatedCorePeer;
 use ContentPeer;
 use PmDynaform;
+use ReportTables;

-/**
- * @author Brayan Pereyra (Cochalo) <brayan@colosa.com>
- * @copyright Colosa - Bolivia
- */
 class Consolidated
 {
    /**
@@ -362,7 +359,7 @@ class Consolidated
            $filter = new \InputFilter();

            if ($sort != "") {
-                $reportTable = new \ReportTables();
+                $reportTable = new ReportTables();
                $arrayReportTableVar = $reportTable->getTableVars($tableUid);
                $tableName = $filter->validateInput($tableName);
                $sort = $filter->validateInput($sort);
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
@@ -1,8 +1,9 @@
 <?php
 namespace ProcessMaker\BusinessModel;
-use \G;
-use \Exception;
-use \Bootstrap;
+use G;
+use Exception;
+use Bootstrap;
+use SpoolRun;

 class EmailServer
 {
@@ -186,7 +187,7 @@ class EmailServer
            $sBodyPre->assign("msg", $msg);
            $sBody = $sBodyPre->getOutputContent();

-            $oSpool = new \spoolRun();
+            $oSpool = new SpoolRun();

            $oSpool->setConfig($aConfiguration);

--- a/workflow/engine/src/ProcessMaker/Project/Workflow.php
+++ b/workflow/engine/src/ProcessMaker/Project/Workflow.php
@@ -14,7 +14,7 @@ use \RoutePeer;
 use ProcessMaker\Util\Common;
 use ProcessMaker\Exception;
 use ProcessMaker\Util;
-
+use ReportTables;
 /**
 * Class Workflow
 *
@@ -594,7 +594,7 @@ class Workflow extends Handler
            $oSwimlaneElement = new \SwimlanesElements();
            $oConfiguration = new \Configuration();
            $oDbSource = new \DbSource();
-            $oReportTable = new \ReportTables();
+            $oReportTable = new ReportTables();
            $oCaseTracker = new \CaseTracker();
            $oCaseTrackerObject = new \CaseTrackerObject();

--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -247,7 +247,7 @@ use ProcessMaker\Plugins\PluginRegistry;
  // defining the serverConf singleton
  if (defined('PATH_DATA') && file_exists(PATH_DATA)) {
    //Instance Server Configuration Singleton
-    $oServerConf =& serverConf::getSingleton();
+    $oServerConf =& ServerConf::getSingleton();
  }

  // Call Gulliver Classes
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -506,7 +506,7 @@ define( 'SYS_URI', '/sys' . SYS_TEMP . '/' . SYS_LANG . '/' . SYS_SKIN . '/' );
 // defining the serverConf singleton
 if (defined( 'PATH_DATA' ) && file_exists( PATH_DATA )) {
    //Instance Server Configuration Singleton
-    $oServerConf = & serverConf::getSingleton();
+    $oServerConf = & ServerConf::getSingleton();
 }