Merge remote-tracking branch 'origin/bugfix/HOR-3670' into release/3.2.2

workflow/engine/PmBootstrap.php

@@ -1,5 +1,7 @@
 <?php
 //test
+use ProcessMaker\Core\System;
+
 class PmBootstrap extends Bootstrap
 {
     public $pmConfig = array();
@@ -25,7 +27,7 @@ class PmBootstrap extends Bootstrap
     {
         parent::configure();
 
-        $this->pmConfig = PmSystem::getSystemConfiguration();
+        $this->pmConfig = System::getSystemConfiguration();
 
         $e_all  = defined('E_DEPRECATED') ? E_ALL  & ~E_DEPRECATED : E_ALL;
         $e_all  = defined('E_STRICT')     ? $e_all & ~E_STRICT     : $e_all;
@@ -82,7 +84,7 @@ class PmBootstrap extends Bootstrap
         $this->autoloader->registerClass('publisher', PATH_GULLIVER . 'class.publisher');
         $this->autoloader->registerClass('templatePower', PATH_GULLIVER . 'class.templatePower');
         $this->autoloader->registerClass('xmlDocument', PATH_GULLIVER . 'class.xmlDocument');
-        $this->autoloader->registerClass('XmlForm_Field_XmlMenu', PATH_GULLIVER . 'class.xmlMenu');
+        $this->autoloader->registerClass('XmlFormFieldXmlMenu', PATH_GULLIVER . 'class.xmlMenu');
         $this->autoloader->registerClass('xmlform', PATH_GULLIVER . 'class.xmlform');
 
         $this->autoloader->registerClass('xmlformExtension', PATH_GULLIVER . 'class.xmlformExtension');
@@ -96,8 +98,8 @@ class PmBootstrap extends Bootstrap
         $this->autoloader->registerClass('headPublisher', PATH_GULLIVER . 'class.headPublisher');
         $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('XmlFormField*', PATH_GULLIVER . 'class.xmlform');
+        $this->autoloader->registerClass('ServerConf', PATH_CORE . 'classes/class.serverConfiguration');
     }
 
     /**

workflow/engine/bin/cron.php

@@ -1,4 +1,7 @@
 <?php
+
+use ProcessMaker\Core\System;
+
 require_once(__DIR__ . '/../../../bootstrap/autoload.php');
 try {
     //Set variables
@@ -77,7 +80,7 @@ try {
     $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
     //Load classes
 
-    $arraySystemConfiguration = PmSystem::getSystemConfiguration();
+    $arraySystemConfiguration = System::getSystemConfiguration();
 
     $e_all = (defined('E_DEPRECATED'))?            E_ALL  & ~E_DEPRECATED : E_ALL;
     $e_all = (defined('E_STRICT'))?                $e_all & ~E_STRICT     : $e_all;

workflow/engine/bin/cron_single.php

@@ -1,6 +1,7 @@
 <?php
 require_once(__DIR__ . '/../../../bootstrap/autoload.php');
 
+use ProcessMaker\Core\System;
 use ProcessMaker\Plugins\PluginRegistry;
 
 register_shutdown_function(
@@ -68,7 +69,7 @@ try {
 
     $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
 
-    $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', $workspace);
+    $arraySystemConfiguration = System::getSystemConfiguration('', '', $workspace);
 
     $e_all = (defined('E_DEPRECATED'))?            E_ALL  & ~E_DEPRECATED : E_ALL;
     $e_all = (defined('E_STRICT'))?                $e_all & ~E_STRICT     : $e_all;
@@ -333,7 +334,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");
@@ -980,7 +981,7 @@ function synchronizeGmailLabels()
         }
         $licensedFeatures = &PMLicensedFeatures::getSingleton();
         if ($licensedFeatures->verifyfeature('7qhYmF1eDJWcEdwcUZpT0k4S0xTRStvdz09')) {
-            $pmGoogle = new PMGoogleApi();
+            $pmGoogle = new PmGoogleApi();
             if ($pmGoogle->getServiceGmailStatus()) {
                 setExecutionMessage("Synchronize labels in Gmail");
                 $labGmail = new labelsGmail();

workflow/engine/bin/reindex_solr.php

@@ -26,6 +26,8 @@
 // php reindex_solr.php workspacename [reindexall|reindexmissing|optimizeindex] [-skip 1005] [-reindextrunksize 1000]
 // var_dump($argv);
 //(count ($argv) == 4) || ((count ($argv) == 5) && ($argv [3] != '-skip'))
+use ProcessMaker\Core\System;
+
 $commandLineSyntaxMsg = "Invalid command line arguments: \n " .
   "syntax: ".
   "php reindex_solr.php [workspace_name] [reindexall|reindexmissing|optimizeindex|reindexone|deleteindexone] [-skip {record_number}] [-reindextrunksize {trunk_size}] [-appuid {APP_UID}]\n" .
@@ -143,7 +145,7 @@ if (! defined ('SYS_SYS')) {
       // ****************************************
       // read initialize file
       require_once PATH_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.system.php';
-      $config = PmSystem::getSystemConfiguration ('', '', SYS_SYS);
+      $config = System::getSystemConfiguration ('', '', SYS_SYS);
       define ('MEMCACHED_ENABLED', $config ['memcached']);
       define ('MEMCACHED_SERVER', $config ['memcached_server']);
       define ('TIME_ZONE', $config ['time_zone']);
@@ -259,7 +261,7 @@ function processWorkspace()
 
   try {
 
-    if (($solrConf = PmSystem::solrEnv (SYS_SYS)) !== false) {
+    if (($solrConf = System::solrEnv (SYS_SYS)) !== false) {
       print "Solr Configuration file: " . PATH_DATA_SITE . "env.ini\n";
       print "solr_enabled: " . $solrConf ['solr_enabled'] . "\n";
       print "solr_host: " . $solrConf ['solr_host'] . "\n";

workflow/engine/bin/tasks/cliAddons.php

@@ -57,7 +57,7 @@ function run_addon_core_install($args)
         }
 
         ///////
-        $ws = new workspaceTools($workspace);
+        $ws = new WorkspaceTools($workspace);
         $ws->initPropel(false);
 
         require_once PATH_CORE . 'methods' . PATH_SEP . 'enterprise' . PATH_SEP . 'enterprise.php';
@@ -73,7 +73,7 @@ function run_addon_core_install($args)
         $addon->install();
 
         if ($addon->isCore()) {
-            $ws = new workspaceTools($workspace);
+            $ws = new WorkspaceTools($workspace);
             $ws->initPropel(false);
             $addon->setState("install-finish");
         } else {

workflow/engine/bin/tasks/cliCommon.php

@@ -1,6 +1,9 @@
 <?php
 
 /* Get the size of the terminal (only works on Linux, on Windows it's always 80) */
+
+use ProcessMaker\Core\System;
+
 preg_match_all("/rows.([0-9]+);.columns.([0-9]+);/", strtolower(exec('stty -a |grep columns')), $output);
 if (sizeof($output) == 3 && isset($output[2]) && isset($output[2][0])) {
     define("COLUMNS", $output[2][0]);

workflow/engine/bin/tasks/cliHotfix.php

@@ -22,7 +22,7 @@ function runHotfixInstall($command, $args)
         foreach ($arrayFile as $value) {
             $f = $value;
 
-            $result = workspaceTools::hotfixInstall($f);
+            $result = WorkspaceTools::hotfixInstall($f);
 
             CLI::logging($result["message"] . "\n");
         }

workflow/engine/bin/tasks/cliListIds.php

@@ -20,7 +20,7 @@ function cliListIds($command, $args)
             $workspace->dbInfo['DB_USER'],
             $workspace->dbInfo['DB_PASS']
         );
-        foreach (workspaceTools::$populateIdsQueries as $query) {
+        foreach (WorkspaceTools::$populateIdsQueries as $query) {
             echo ".";
             $dbh->query($query);
         }

workflow/engine/bin/tasks/cliUpgrade.php

@@ -25,6 +25,8 @@
  * @package workflow-engine-bin-tasks
  */
 
+use ProcessMaker\Core\System;
+
 CLI::taskName('upgrade');
 CLI::taskDescription("Upgrade workspaces.\n\n This command should be run after upgrading ProcessMaker to a new version so that all workspaces are also upgraded to the\n  new version.");
 
@@ -87,7 +89,7 @@ function run_upgrade($command, $args)
     }
     $flag = G::isPMUnderUpdating(1, $oneWorkspace);
     //start to upgrade
-    $checksum = PmSystem::verifyChecksum();
+    $checksum = System::verifyChecksum();
     if ($checksum === false) {
         CLI::logging(CLI::error("checksum.txt not found, integrity check is not possible") . "\n");
         if (!CLI::question("Integrity check failed, do you want to continue the upgrade?")) {
@@ -177,7 +179,7 @@ function run_upgrade($command, $args)
             }
         }
     } else {
-        CLI::logging('ProcessMaker ' . PmSystem::getVersion(). ' installed', PATH_DATA . 'log/upgrades.log');
+        CLI::logging('ProcessMaker ' . System::getVersion(). ' installed', PATH_DATA . 'log/upgrades.log');
     }
 
     //Safe upgrade for JavaScript files
@@ -219,10 +221,10 @@ function run_unify_database($args)
     if (sizeof($args) > 2) {
         $filename = array_pop($args);
         foreach ($args as $arg) {
-            $workspaces[] = new workspaceTools($arg);
+            $workspaces[] = new WorkspaceTools($arg);
         }
     } else if (sizeof($args) > 0) {
-        $workspace = new workspaceTools($args[0]);
+        $workspace = new WorkspaceTools($args[0]);
         $workspaces[] = $workspace;
     }
 

workflow/engine/bin/verify_solr.php

@@ -26,6 +26,8 @@
 // php reindex_solr.php workspacename [reindexall|reindexmissing|optimizeindex] [-skip 1005] [-reindextrunksize 1000]
 // var_dump($argv);
 //(count ($argv) == 4) || ((count ($argv) == 5) && ($argv [3] != '-skip'))
+use ProcessMaker\Core\System;
+
 $commandLineSyntaxMsg = "Invalid command line arguments: \n " .
   "Verify the list of cases comparing db vs solr lists by user if usr_uid is specify only verify one user otherwhise all users ".
   "syntax: ".
@@ -117,7 +119,7 @@ if (! defined ('SYS_SYS')) {
       // ****************************************
       // read initialize file
       require_once PATH_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'class.system.php';
-      $config = PmSystem::getSystemConfiguration ('', '', SYS_SYS);
+      $config = System::getSystemConfiguration ('', '', SYS_SYS);
       define ('MEMCACHED_ENABLED', $config ['memcached']);
       define ('MEMCACHED_SERVER', $config ['memcached_server']);
       define ('TIME_ZONE', $config ['time_zone']);
@@ -335,7 +337,7 @@ function displayMissingCases($aAppUidsDB, $aAppUidsSolr)
 
 function getListUids($usrUid, $action)
 {
-  if (($solrConf = PmSystem::solrEnv (SYS_SYS)) !== false) {
+  if (($solrConf = System::solrEnv (SYS_SYS)) !== false) {
 
     print "Solr Configuration file: " . PATH_DATA_SITE . "env.ini\n";
     print "solr_enabled: " . $solrConf ['solr_enabled'] . "\n";

workflow/engine/classes/ActionsByEmailCoreClass.php

@@ -1,7 +1,8 @@
 <?php
 
 
-class actionsByEmailCoreClass extends PMPlugin
+
+class ActionsByEmailCoreClass extends PMPlugin
 {
     public function __construct()
     {
@@ -170,7 +171,7 @@ class actionsByEmailCoreClass extends PMPlugin
                                     $field->label = '';
                                     $actionField = str_replace(array('@@', '@#', '@=', '@%', '@?', '@$'), '', $configuration['ABE_ACTION_FIELD']);
 
-                                    $obj = new pmDynaform($configuration['DYN_UID']);
+                                    $obj = new PmDynaform($configuration['DYN_UID']);
                                     $configuration['CURRENT_DYNAFORM'] = $configuration['DYN_UID'];
                                     $file = $obj->printPmDynaformAbe($configuration);
                                     $__ABE__ .= $file;
@@ -221,7 +222,7 @@ class actionsByEmailCoreClass extends PMPlugin
                                             }
                                         }
 
-                                        $obj = new pmDynaform($configuration['DYN_UID']);
+                                        $obj = new PmDynaform($configuration['DYN_UID']);
                                         $configuration['CURRENT_DYNAFORM'] = $configuration['DYN_UID'];
                                         $file = $obj->printPmDynaformAbe($configuration);
                                         $__ABE__ .= $file;
@@ -290,7 +291,7 @@ class actionsByEmailCoreClass extends PMPlugin
                                 }
                             }
 
-                            $wsBaseInstance = new wsBase();
+                            $wsBaseInstance = new WsBase();
                             $result = $wsBaseInstance->sendMessage(
                                 $data->APP_UID,
                                 $emailFrom,
@@ -333,4 +334,3 @@ class actionsByEmailCoreClass extends PMPlugin
         }
     }
 }
-

workflow/engine/classes/AppDocumentDrive.php

@@ -1,13 +1,17 @@
 <?php
 
 
+/**
+ * Class InputDocumentDrive
+ */
+
 /**
  * Class InputDocumentDrive
  */
 class AppDocumentDrive
 {
     /**
-     * @var PMDrive $drive
+     * @var PmDrive $drive
      */
     private $drive;
     /**
@@ -28,7 +32,7 @@ class AppDocumentDrive
      */
     public function __construct()
     {
-        $this->drive = new PMDrive();
+        $this->drive = new PmDrive();
         $status = $this->drive->getServiceDriveStatus();
         $status = !empty($status) ? ($status == 1 ? true : false): false;
         $this->usersEmail = '';

workflow/engine/classes/ApplicationAppDataUnserializeException.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Invalid search text for Solr exception
+ */
+
+/**
+ * Application APP_DATA could not be unserialized exception
+ */
+class ApplicationAppDataUnserializeException 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";
+  }
+}

workflow/engine/classes/ApplicationWithCorruptDynaformException.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Invalid search text for Solr exception
+ *
+ * @author Herbert Saal Gutierrez
+ *        
+ */
+
+/**
+ * Dynaform file corrupt
+ */
+class ApplicationWithCorruptDynaformException 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";
+  }
+}

workflow/engine/classes/ApplicationWithoutDelegationRecordsException.php

@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * Application without Delegations exception
+ */
+class ApplicationWithoutDelegationRecordsException 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";
+    }
+}

workflow/engine/classes/Applications.php

@@ -2,6 +2,7 @@
 
 use ProcessMaker\Plugins\PluginRegistry;
 
+
 class Applications
 {
     /**
@@ -1213,4 +1214,3 @@ class Applications
         return $steps;
     }
 }
-

workflow/engine/classes/BzipFile.php

@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * This class is derived from the class archive, is employed to use files .bzip
+ */
+class BzipFile extends TarFile
+{
+
+    /**
+     * This function is the constructor of the class bzip_file
+     *
+     * @param string $name
+     * @return void
+     */
+    public function BzipFile($name)
+    {
+        $this->tar_file($name);
+        $this->options['type'] = "bzip";
+    }
+
+    /**
+     * This function is employed to create files .
+     * bzip
+     *
+     * @return boolean
+     */
+    public function create_bzip()
+    {
+        if ($this->options['inmemory'] == 0) {
+            $pwd = getcwd();
+            chdir($this->options['basedir']);
+            if ($fp = bzopen($this->options['name'], "wb")) {
+                fseek($this->archive, 0);
+                while ($temp = fread($this->archive, 1048576)) {
+                    bzwrite($fp, $temp);
+                }
+                bzclose($fp);
+                chdir($pwd);
+            } else {
+                $this->error[] = "Could not open {$this->options['name']} for writing.";
+                chdir($pwd);
+                return 0;
+            }
+        } else {
+            $this->archive = bzcompress($this->archive, $this->options['level']);
+        }
+        return 1;
+    }
+
+    /**
+     * This function open a archive of the class bzip_file
+     *
+     * @return void
+     */
+    public function open_archive()
+    {
+        return @bzopen($this->options['name'], "rb");
+    }
+}

workflow/engine/classes/CLI.php

@@ -31,7 +31,11 @@
  *
  * @package workflow.engine.classes
  */
-class CLI
+
+/**
+ *
+ * @package workflow.engine.classes
+ */class CLI
 {
     public static $tasks = array ();
     public static $currentTask = null;
@@ -384,4 +388,3 @@ EOT;
         }
     }
 }
-

workflow/engine/classes/Configurations.php

@@ -1,57 +1,14 @@
 <?php
 
-
-/**
- * class.configuration.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.
- *
- */
-//
-// It works with the table CONFIGURATION in a WF dataBase
-// Copyright (C) 2007 COLOSA
-// License: LGPL, see LICENSE
-////////////////////////////////////////////////////
-
-
-/**
- * ProcessConfiguration - ProcessConfiguration class
- *
- * @author David S. Callizaya S.
- * @copyright 2007 COLOSA
- */
-require_once 'classes/model/Configuration.php';
-
 /**
+ * ProcessConfiguration - ProcessConfiguration
  * Extends Configuration
  *
- *
- * @copyright 2007 COLOSA
  * @version Release: @package_version@
  * @package workflow.engine.ProcessMaker
  */
 class Configurations // extends Configuration
 {
-
     public $aConfig        = array();
     private $Configuration = null;
     private $UserConfig    = null;
@@ -81,16 +38,16 @@ class Configurations // extends Configuration
                 $this->arrayClone($object[$k], $cloneObject[$k]);
             }
         } else {
-            if (is_object( $object )) {
+            if (is_object($object)) {
             } else {
                 $cloneObject = null;
             }
         }
     }
 
-    public function exists($cfgID,$objID='')
+    public function exists($cfgID, $objID='')
     {
-        return $this->Configuration->exists($cfgID,$objID,'','','');
+        return $this->Configuration->exists($cfgID, $objID, '', '', '');
     }
 
     /**
@@ -169,7 +126,6 @@ class Configurations // extends Configuration
         try {
             $this->Fields = $this->Configuration->load($cfg, $obj, $pro, $usr, $app);
         } catch (Exception $e) {
-
         } // the configuration does not exist
 
 
@@ -178,7 +134,7 @@ class Configurations // extends Configuration
         }
 
         if (!is_array($this->aConfig)) {
-            $this->aConfig = Array();
+            $this->aConfig = array();
         }
 
         return $this->aConfig;
@@ -325,8 +281,8 @@ class Configurations // extends Configuration
             $theFormat = $this->UserConfig['format'];
             $fname = $oUser->getUsrFirstname();
             $lname = $oUser->getUsrLastname();
-            if (strpos($theFormat, ',') !== false && ( trim($fname) == '' || trim($lname) == '')) {
-              $theFormat = str_replace(',', '', $theFormat);
+            if (strpos($theFormat, ',') !== false && (trim($fname) == '' || trim($lname) == '')) {
+                $theFormat = str_replace(',', '', $theFormat);
             }
 
             $aux = str_replace('@userName', trim($username), $theFormat);
@@ -537,15 +493,15 @@ class Configurations // extends Configuration
 
     public function getUserNameFormats()
     {
-        $formats[] = Array('id' => '@firstName @lastName', //the id , don't translate
+        $formats[] = array('id' => '@firstName @lastName', //the id , don't translate
             'name' => G::loadTranslation('ID_USERNAME_FORMAT_1')  //label displayed, can be translated
         );
-        $formats[] = Array('id' => '@firstName @lastName (@userName)', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_2'));
-        $formats[] = Array('id' => '@userName', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_3'));
-        $formats[] = Array('id' => '@userName (@firstName @lastName)', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_4'));
-        $formats[] = Array('id' => '@lastName @firstName', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_5'));
-        $formats[] = Array('id' => '@lastName, @firstName', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_6'));
-        $formats[] = Array('id' => '@lastName, @firstName (@userName)', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_7'));
+        $formats[] = array('id' => '@firstName @lastName (@userName)', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_2'));
+        $formats[] = array('id' => '@userName', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_3'));
+        $formats[] = array('id' => '@userName (@firstName @lastName)', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_4'));
+        $formats[] = array('id' => '@lastName @firstName', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_5'));
+        $formats[] = array('id' => '@lastName, @firstName', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_6'));
+        $formats[] = array('id' => '@lastName, @firstName (@userName)', 'name' => G::loadTranslation('ID_USERNAME_FORMAT_7'));
 
         return $formats;
     }
@@ -560,9 +516,9 @@ class Configurations // extends Configuration
         $creationDateMask = ($creationDateMask == '') ? $dateFormat : $creationDateMask;
         if ($creationDateMask != '') {
             if (strpos($dateTime, ' ') !== false) {
-                list ($date, $time) = explode(' ', $dateTime);
-                list ($y, $m, $d) = explode('-', $date);
-                list ($h, $i, $s) = explode(':', $time);
+                list($date, $time) = explode(' ', $dateTime);
+                list($y, $m, $d) = explode('-', $date);
+                list($h, $i, $s) = explode(':', $time);
                 $newCreation = '';
                 $maskTime = array('d' => '%d', 'D' => '%A', 'j' => '%d', 'l' => '%A', 'G' => '%I', 'g' => '%i', 'N' => '%u', 'S' => '%d', 'w' => '%w', 'z' => '%j', 'W' => '%W', 'F' => '%B', 'm' => '%m', 'M' => '%B', 'n' => '%m', 'o' => '%Y', 'Y' => '%Y', 'y' => '%g', 'a' => '%p', 'A' => '%p', 'g' => '%I', 'G' => '%H', 'h' => '%I', 'H' => '%H', 'i' => '%M', 's' => '%S');
                 $creationDateMask = trim($creationDateMask);
@@ -589,9 +545,9 @@ class Configurations // extends Configuration
                 if (G::toLower(PHP_OS) == 'linux' || G::toLower(PHP_OS) == 'darwin') {
                     if (SYS_LANG == 'es') {
                         $langLocate = 'es_ES';
-                    } else if (strlen(SYS_LANG) > 2) {
+                    } elseif (strlen(SYS_LANG) > 2) {
                         $langLocate = str_replace('-', '_', SYS_LANG);
-                    } else if ($location != '') {
+                    } elseif ($location != '') {
                         $langLocate = SYS_LANG.'_'.$location;
                     } else {
                         $langLocate = 'en_US';
@@ -1006,4 +962,3 @@ class Configurations // extends Configuration
         return $ver;
     }
 }
-

workflow/engine/classes/ConsolidatedCases.php

@@ -1,5 +1,6 @@
 <?php
 
+
 class ConsolidatedCases
 {
     private $existTable;
@@ -51,7 +52,7 @@ class ConsolidatedCases
         $oReportTables = new ReportTables();
         $oReportTables->deleteAllReportVars($_POST['form']['REP_TAB_UID']);
 
-        $pmDyna = new pmDynaform(array());
+        $pmDyna = new PmDynaform(array());
         $pmDyna->fields["CURRENT_DYNAFORM"] = $DynUid;
         $dataDyna = $pmDyna->getDynaform();
         $json = G::json_decode($dataDyna["DYN_CONTENT"]);

workflow/engine/classes/Dashboards.php

@@ -1,16 +1,11 @@
 <?php
 
+
 class Dashboards
 {
 	public function getListDashboards ($start=0, $limit=20, $sort='', $dir='DESC', $search='')
     {
-        require_once 'classes/model/Dashboard.php';
-        require_once 'classes/model/DashboardIndicator.php';
-        require_once 'classes/model/Users.php';
-        require_once 'classes/model/Groupwf.php';
-        require_once 'classes/model/DashboardDasInd.php';
 
-        
         $limit_size = isset($limit) ? $limit: 20;
         $start = isset($_REQUEST['start']) ? $_REQUEST['start'] : 0;
         $limit = isset($_REQUEST['limit']) ? $_REQUEST['limit'] : $limit_size;

workflow/engine/classes/DashletOpenVsCompleted.php

@@ -1,8 +1,7 @@
 <?php
 
-require_once 'classes/interfaces/dashletInterface.php';
 
-class dashletOpenVSCompleted implements DashletInterface
+class DashletOpenVsCompleted implements DashletInterface
 {
 
     const version = '1.0';
@@ -275,7 +274,7 @@ class dashletOpenVSCompleted implements DashletInterface
 
     public function render ($width = 300)
     {
-        $g = new pmGauge();
+        $g = new PmGauge();
         $g->w = $width;
         $g->value = $this->value;
 

workflow/engine/classes/DashletProcessMakerCommunity.php

@@ -1,8 +1,8 @@
 <?php
 
-require_once 'classes/interfaces/dashletInterface.php';
 
-class dashletProcessMakerCommunity implements DashletInterface
+
+class DashletProcessMakerCommunity implements DashletInterface
 {
 
     const version = '1.0';