diff --git a/framework/src/Maveriks/WebApplication.php b/framework/src/Maveriks/WebApplication.php
index 9aaeaa8d5..8625042a5 100644
--- a/framework/src/Maveriks/WebApplication.php
+++ b/framework/src/Maveriks/WebApplication.php
@@ -285,7 +285,7 @@ class WebApplication
         Services\Api::setWorkspace(SYS_SYS);
         $cacheDir = defined("PATH_WORKSPACE") ? PATH_WORKSPACE : (defined("PATH_C")? PATH_C: sys_get_temp_dir());
 
-        $sysConfig = \PMSystem::getSystemConfiguration();
+        $sysConfig = \PmSystem::getSystemConfiguration();
 
         \Luracast\Restler\Defaults::$cacheDirectory = $cacheDir;
         $productionMode = (bool) !(isset($sysConfig["service_api_debug"]) && $sysConfig["service_api_debug"]);
@@ -445,7 +445,7 @@ class WebApplication
         define("PATH_CONTROLLERS", PATH_CORE . "controllers" . PATH_SEP);
         define("PATH_SERVICES_REST", PATH_CORE . "services" . PATH_SEP . "rest" . PATH_SEP);
 
-        $arraySystemConfiguration = \PMSystem::getSystemConfiguration();
+        $arraySystemConfiguration = \PmSystem::getSystemConfiguration();
 
         ini_set('date.timezone', $arraySystemConfiguration['time_zone']); //Set Time Zone
 
@@ -493,7 +493,7 @@ class WebApplication
             exit(0);
         }
 
-        $arraySystemConfiguration = \PMSystem::getSystemConfiguration('', '', SYS_SYS);
+        $arraySystemConfiguration = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
         //Do not change any of these settings directly, use env.ini instead
         ini_set('display_errors', $arraySystemConfiguration['display_errors']);
diff --git a/gulliver/system/class.bootstrap.php b/gulliver/system/class.bootstrap.php
index d05379ae4..267c84725 100644
--- a/gulliver/system/class.bootstrap.php
+++ b/gulliver/system/class.bootstrap.php
@@ -20,7 +20,7 @@ class Bootstrap
 
     public static function getSystemConfiguration($globalIniFile = '', $wsIniFile = '', $wsName = '')
     {
-        return PMSystem::getSystemConfiguration($globalIniFile, $wsIniFile, $wsName);
+        return PmSystem::getSystemConfiguration($globalIniFile, $wsIniFile, $wsName);
     }
 
     //below this line, still not approved methods
@@ -983,7 +983,7 @@ class Bootstrap
      */
     public function getCheckSum($files)
     {
-        $key = PMSystem::getVersion();
+        $key = PmSystem::getVersion();
 
         if (!is_array($files)) {
             $tmp = $files;
@@ -1876,7 +1876,7 @@ class Bootstrap
         /* Fix to prevent use uxs skin outside siplified interface,
           because that skin is not compatible with others interfaces */
         if ($args['SYS_SKIN'] == 'uxs' && $args['SYS_COLLECTION'] != 'home' && $args['SYS_COLLECTION'] != 'cases') {
-            $config = PMSystem::getSystemConfiguration();
+            $config = PmSystem::getSystemConfiguration();
             $args['SYS_SKIN'] = $config['default_skin'];
         }
 
diff --git a/gulliver/system/class.codeScanner.php b/gulliver/system/class.codeScanner.php
index affd4826d..51b4a40ea 100644
--- a/gulliver/system/class.codeScanner.php
+++ b/gulliver/system/class.codeScanner.php
@@ -29,7 +29,7 @@ class CodeScanner
                         $workspace = new workspaceTools($option);
 
                         if ($workspace->workspaceExists()) {
-                            $arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', $workspace->name);
+                            $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', $workspace->name);
                             $flag = (int)($arraySystemConfiguration['enable_blacklist']) == 1;
                         }
                         break;
diff --git a/gulliver/system/class.g.php b/gulliver/system/class.g.php
index af2371508..aafb65c86 100644
--- a/gulliver/system/class.g.php
+++ b/gulliver/system/class.g.php
@@ -883,7 +883,7 @@ class G
         /* Fix to prevent use uxs skin outside siplified interface,
         because that skin is not compatible with others interfaces*/
         if ($args['SYS_SKIN'] == 'uxs' && $args['SYS_COLLECTION'] != 'home' && $args['SYS_COLLECTION'] != 'cases') {
-            $config = PMSystem::getSystemConfiguration();
+            $config = PmSystem::getSystemConfiguration();
             $args['SYS_SKIN'] = $config['default_skin'];
         }
 
@@ -4636,7 +4636,7 @@ class G
      */
     public function getCheckSum ($files)
     {
-        $key = PMSystem::getVersion();
+        $key = PmSystem::getVersion();
 
         if (! is_array( $files )) {
             $tmp = $files;
@@ -5267,7 +5267,7 @@ class G
 
     public static function browserCacheFilesGetUid()
     {
-        $sysConf = PMSystem::getSystemConfiguration(PATH_CONFIG . "env.ini");
+        $sysConf = PmSystem::getSystemConfiguration(PATH_CONFIG . "env.ini");
 
         return (isset($sysConf["browser_cache_files_uid"]))? $sysConf["browser_cache_files_uid"] : null;
     }
@@ -5392,7 +5392,7 @@ class G
      */
     public static function log($message, $pathData = PATH_DATA, $file = 'cron.log')
     {
-        $config = PMSystem::getSystemConfiguration();
+        $config = PmSystem::getSystemConfiguration();
 
 
         $oLogger = Logger::getSingleton($pathData, PATH_SEP, $file);
diff --git a/gulliver/system/class.soapNtlm.php b/gulliver/system/class.soapNtlm.php
index 131d9f5f5..fc5e04aa3 100644
--- a/gulliver/system/class.soapNtlm.php
+++ b/gulliver/system/class.soapNtlm.php
@@ -1,305 +1,305 @@
-<?php
-
-/**
- * class.soapNtlm.php
- *
- * @package 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.
- *
- */
-/* SOAP NTLM
- * This class is used to extend SoapClient native PHP
- * to allow NTLM authentication throw soap connection
- */
-
-/**
- *
- * @package gulliver.system
- */
-class soapNtlm
-{
-    private $path;
-    private $mode;
-    private $options;
-    private $opened_path;
-    private $buffer;
-    private $pos;
-
-    public function getuser ()
-    {
-        return "";
-    }
-
-    public function getpassword ()
-    {
-        return "";
-    }
-
-    /**
-     * Open the stream
-     *
-     * @param unknown_type $path
-     * @param unknown_type $mode
-     * @param unknown_type $options
-     * @param unknown_type $opened_path
-     * @return unknown
-     */
-    public function stream_open ($path, $mode, $options, $opened_path)
-    {
-        //echo "[NTLMStream::stream_open] $path , mode=$mode <br>";
-        //G::pr($options);
-        $this->path = $path;
-        $this->mode = $mode;
-        $this->options = $options;
-        $this->opened_path = $opened_path;
-        $this->createBuffer( $this->path );
-        return true;
-    }
-
-    /**
-     * Close the stream
-     */
-    public function stream_close ()
-    {
-        //echo "[NTLMStream::stream_close] <br>";
-        curl_close( $this->ch );
-    }
-
-    /**
-     * Read the stream
-     *
-     * @param int $count number of bytes to read
-     * @return content from pos to count
-     */
-    public function stream_read ($count)
-    {
-        //echo "[NTLMStream::stream_read] $count <br>";
-        if (strlen( $this->buffer ) == 0) {
-            return false;
-        }
-        $read = substr( $this->buffer, $this->pos, $count );
-        $this->pos += $count;
-        return $read;
-    }
-
-    /**
-     * write the stream
-     *
-     * @param int $count number of bytes to read
-     * @return content from pos to count
-     */
-    public function stream_write ($data)
-    {
-        //echo "[NTLMStream::stream_write] <br>";
-        if (strlen( $this->buffer ) == 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *
-     * @return true if eof else false
-     */
-    public function stream_eof ()
-    {
-        //echo "[NTLMStream::stream_eof] ";
-        if ($this->pos > strlen( $this->buffer )) {
-            //echo "true <br>";
-            return true;
-        }
-        //echo "false <br>";
-        return false;
-    }
-
-    /**
-     *
-     * @return int the position of the current read pointer
-     */
-    public function stream_tell ()
-    {
-        //echo "[NTLMStream::stream_tell] <br>";
-        return $this->pos;
-    }
-
-    /**
-     * Flush stream data
-     */
-    public function stream_flush ()
-    {
-        //echo "[NTLMStream::stream_flush] <br>";
-        $this->buffer = null;
-        $this->pos = null;
-    }
-
-    /**
-     * Stat the file, return only the size of the buffer
-     *
-     * @return array stat information
-     */
-    public function stream_stat ()
-    {
-        //echo "[NTLMStream::stream_stat] <br>";
-        $this->createBuffer( $this->path );
-        $stat = array ('size' => strlen( $this->buffer ));
-        return $stat;
-    }
-
-    /**
-     * Stat the url, return only the size of the buffer
-     *
-     * @return array stat information
-     */
-    public function url_stat ($path, $flags)
-    {
-        //G::pr($this->options);
-        //echo "[NTLMStream::url_stat] -> $path <br>";
-        $this->createBuffer( $path );
-        $stat = array ('size' => strlen( $this->buffer ));
-        return $stat;
-    }
-
-    /**
-     * Create the buffer by requesting the url through cURL
-     *
-     * @param unknown_type $path
-     */
-    private function createBuffer ($path)
-    {
-
-        $filter = new InputFilter();
-        $path = $filter->xssFilterHard($path, "url");
-        if ($this->buffer) {
-            return;
-        }
-
-        //echo "[NTLMStream::createBuffer] create buffer from : $path <br>";
-        $this->ch = curl_init( $path );
-        curl_setopt( $this->ch, CURLOPT_RETURNTRANSFER, true );
-        curl_setopt( $this->ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
-        curl_setopt( $this->ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM );
-        //curl_setopt($this->ch, CURLOPT_USERPWD, $this->options['auth']); // Hugo's code
-        curl_setopt( $this->ch, CURLOPT_USERPWD, $this->getuser() . ':' . $this->getpassword() ); // Ankit's code
-        //Apply proxy settings
-        if (class_exists( 'System' )) {
-            $sysConf = PMSystem::getSystemConfiguration();
-            $sysConf = $filter->xssFilterHard($sysConf);
-            if ($sysConf['proxy_host'] != '') {
-                curl_setopt( $this->ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
-                if ($sysConf['proxy_port'] != '') {
-                    curl_setopt( $this->ch, CURLOPT_PROXYPORT, $sysConf['proxy_port'] );
-                }
-                if ($sysConf['proxy_user'] != '') {
-                    curl_setopt( $this->ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : '') );
-                }
-                curl_setopt( $this->ch, CURLOPT_HTTPHEADER, array ('Expect:') );
-            }
-        }
-        $this->buffer = curl_exec( $this->ch );
-        $buffer = $filter->xssFilterHard($this->buffer);
-        echo $buffer;
-        //echo "[NTLMStream::createBuffer] buffer size : " . strlen($this->buffer) . "bytes<br>";
-        $this->pos = 0;
-    }
-
-}
-
-class NTLMSoapClient extends SoapClient
-{
-    function __doRequest ($request, $location, $action, $version, $one_way = 0)
-    {
-        $headers = array ('Method: POST','Connection: Keep-Alive','User-Agent: PHP-SOAP-CURL','Content-Type: text/xml; charset=utf-8','SOAPAction: "' . $action . '"');
-
-        $this->__last_request_headers = $headers;
-        $ch = curl_init( $location );
-        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
-        curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
-        curl_setopt( $ch, CURLOPT_POST, true );
-        curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
-        curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, false );
-        curl_setopt( $ch, CURLOPT_POSTFIELDS, $request );
-        curl_setopt( $ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
-        curl_setopt( $ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM );
-        //curl_setopt($ch, CURLOPT_USERPWD, $this->options['auth']); //Hugo's Code
-        curl_setopt( $ch, CURLOPT_USERPWD, $this->user . ':' . $this->password ); //Ankit's Code
-
-        //Apply proxy settings
-        if (class_exists( 'System' )) {
-            $sysConf = PMSystem::getSystemConfiguration();
-            if ($sysConf['proxy_host'] != '') {
-                curl_setopt( $ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
-                if ($sysConf['proxy_port'] != '') {
-                    curl_setopt( $ch, CURLOPT_PROXYPORT, $sysConf['proxy_port'] );
-                }
-                if ($sysConf['proxy_user'] != '') {
-                    curl_setopt( $ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : '') );
-                }
-                curl_setopt( $ch, CURLOPT_HTTPHEADER, array ('Expect:'
-                ) );
-            }
-        }
-        $response = curl_exec( $ch );
-        return $response;
-    }
-
-    function __getLastRequestHeaders ()
-    {
-        return implode( "\n", $this->__last_request_headers ) . "\n";
-    }
-
-}
-
-class PMServiceNTLMSoapClient extends NTLMSoapClient
-{
-    protected $user;
-    protected $password;
-
-    function setAuthClient ($auth)
-    {
-        $authInfo = explode( ":", $auth );
-        $this->user = $authInfo[0];
-        $this->password = $authInfo[1];
-    }
-}
-
-class PMServiceProviderNTLMStream extends soapNtlm
-{
-    protected static $user;
-    protected static $password;
-
-    public function getuser ()
-    {
-        return self::$user;
-    }
-
-    public function getpassword ()
-    {
-        return self::$password;
-    }
-
-    static function setAuthStream ($auth)
-    {
-        $authInfo = explode( ":", $auth );
-        self::$user = $authInfo[0];
-        self::$password = $authInfo[1];
-    }
-}
-
+<?php
+
+/**
+ * class.soapNtlm.php
+ *
+ * @package 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.
+ *
+ */
+/* SOAP NTLM
+ * This class is used to extend SoapClient native PHP
+ * to allow NTLM authentication throw soap connection
+ */
+
+/**
+ *
+ * @package gulliver.system
+ */
+class soapNtlm
+{
+    private $path;
+    private $mode;
+    private $options;
+    private $opened_path;
+    private $buffer;
+    private $pos;
+
+    public function getuser ()
+    {
+        return "";
+    }
+
+    public function getpassword ()
+    {
+        return "";
+    }
+
+    /**
+     * Open the stream
+     *
+     * @param unknown_type $path
+     * @param unknown_type $mode
+     * @param unknown_type $options
+     * @param unknown_type $opened_path
+     * @return unknown
+     */
+    public function stream_open ($path, $mode, $options, $opened_path)
+    {
+        //echo "[NTLMStream::stream_open] $path , mode=$mode <br>";
+        //G::pr($options);
+        $this->path = $path;
+        $this->mode = $mode;
+        $this->options = $options;
+        $this->opened_path = $opened_path;
+        $this->createBuffer( $this->path );
+        return true;
+    }
+
+    /**
+     * Close the stream
+     */
+    public function stream_close ()
+    {
+        //echo "[NTLMStream::stream_close] <br>";
+        curl_close( $this->ch );
+    }
+
+    /**
+     * Read the stream
+     *
+     * @param int $count number of bytes to read
+     * @return content from pos to count
+     */
+    public function stream_read ($count)
+    {
+        //echo "[NTLMStream::stream_read] $count <br>";
+        if (strlen( $this->buffer ) == 0) {
+            return false;
+        }
+        $read = substr( $this->buffer, $this->pos, $count );
+        $this->pos += $count;
+        return $read;
+    }
+
+    /**
+     * write the stream
+     *
+     * @param int $count number of bytes to read
+     * @return content from pos to count
+     */
+    public function stream_write ($data)
+    {
+        //echo "[NTLMStream::stream_write] <br>";
+        if (strlen( $this->buffer ) == 0) {
+            return false;
+        }
+        return true;
+    }
+
+    /**
+     *
+     * @return true if eof else false
+     */
+    public function stream_eof ()
+    {
+        //echo "[NTLMStream::stream_eof] ";
+        if ($this->pos > strlen( $this->buffer )) {
+            //echo "true <br>";
+            return true;
+        }
+        //echo "false <br>";
+        return false;
+    }
+
+    /**
+     *
+     * @return int the position of the current read pointer
+     */
+    public function stream_tell ()
+    {
+        //echo "[NTLMStream::stream_tell] <br>";
+        return $this->pos;
+    }
+
+    /**
+     * Flush stream data
+     */
+    public function stream_flush ()
+    {
+        //echo "[NTLMStream::stream_flush] <br>";
+        $this->buffer = null;
+        $this->pos = null;
+    }
+
+    /**
+     * Stat the file, return only the size of the buffer
+     *
+     * @return array stat information
+     */
+    public function stream_stat ()
+    {
+        //echo "[NTLMStream::stream_stat] <br>";
+        $this->createBuffer( $this->path );
+        $stat = array ('size' => strlen( $this->buffer ));
+        return $stat;
+    }
+
+    /**
+     * Stat the url, return only the size of the buffer
+     *
+     * @return array stat information
+     */
+    public function url_stat ($path, $flags)
+    {
+        //G::pr($this->options);
+        //echo "[NTLMStream::url_stat] -> $path <br>";
+        $this->createBuffer( $path );
+        $stat = array ('size' => strlen( $this->buffer ));
+        return $stat;
+    }
+
+    /**
+     * Create the buffer by requesting the url through cURL
+     *
+     * @param unknown_type $path
+     */
+    private function createBuffer ($path)
+    {
+
+        $filter = new InputFilter();
+        $path = $filter->xssFilterHard($path, "url");
+        if ($this->buffer) {
+            return;
+        }
+
+        //echo "[NTLMStream::createBuffer] create buffer from : $path <br>";
+        $this->ch = curl_init( $path );
+        curl_setopt( $this->ch, CURLOPT_RETURNTRANSFER, true );
+        curl_setopt( $this->ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+        curl_setopt( $this->ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM );
+        //curl_setopt($this->ch, CURLOPT_USERPWD, $this->options['auth']); // Hugo's code
+        curl_setopt( $this->ch, CURLOPT_USERPWD, $this->getuser() . ':' . $this->getpassword() ); // Ankit's code
+        //Apply proxy settings
+        if (class_exists( 'System' )) {
+            $sysConf = PmSystem::getSystemConfiguration();
+            $sysConf = $filter->xssFilterHard($sysConf);
+            if ($sysConf['proxy_host'] != '') {
+                curl_setopt( $this->ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
+                if ($sysConf['proxy_port'] != '') {
+                    curl_setopt( $this->ch, CURLOPT_PROXYPORT, $sysConf['proxy_port'] );
+                }
+                if ($sysConf['proxy_user'] != '') {
+                    curl_setopt( $this->ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : '') );
+                }
+                curl_setopt( $this->ch, CURLOPT_HTTPHEADER, array ('Expect:') );
+            }
+        }
+        $this->buffer = curl_exec( $this->ch );
+        $buffer = $filter->xssFilterHard($this->buffer);
+        echo $buffer;
+        //echo "[NTLMStream::createBuffer] buffer size : " . strlen($this->buffer) . "bytes<br>";
+        $this->pos = 0;
+    }
+
+}
+
+class NTLMSoapClient extends SoapClient
+{
+    function __doRequest ($request, $location, $action, $version, $one_way = 0)
+    {
+        $headers = array ('Method: POST','Connection: Keep-Alive','User-Agent: PHP-SOAP-CURL','Content-Type: text/xml; charset=utf-8','SOAPAction: "' . $action . '"');
+
+        $this->__last_request_headers = $headers;
+        $ch = curl_init( $location );
+        curl_setopt( $ch, CURLOPT_RETURNTRANSFER, true );
+        curl_setopt( $ch, CURLOPT_HTTPHEADER, $headers );
+        curl_setopt( $ch, CURLOPT_POST, true );
+        curl_setopt( $ch, CURLOPT_SSL_VERIFYPEER, false );
+        curl_setopt( $ch, CURLOPT_SSL_VERIFYHOST, false );
+        curl_setopt( $ch, CURLOPT_POSTFIELDS, $request );
+        curl_setopt( $ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1 );
+        curl_setopt( $ch, CURLOPT_HTTPAUTH, CURLAUTH_NTLM );
+        //curl_setopt($ch, CURLOPT_USERPWD, $this->options['auth']); //Hugo's Code
+        curl_setopt( $ch, CURLOPT_USERPWD, $this->user . ':' . $this->password ); //Ankit's Code
+
+        //Apply proxy settings
+        if (class_exists( 'System' )) {
+            $sysConf = PmSystem::getSystemConfiguration();
+            if ($sysConf['proxy_host'] != '') {
+                curl_setopt( $ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
+                if ($sysConf['proxy_port'] != '') {
+                    curl_setopt( $ch, CURLOPT_PROXYPORT, $sysConf['proxy_port'] );
+                }
+                if ($sysConf['proxy_user'] != '') {
+                    curl_setopt( $ch, CURLOPT_PROXYUSERPWD, $sysConf['proxy_user'] . ($sysConf['proxy_pass'] != '' ? ':' . $sysConf['proxy_pass'] : '') );
+                }
+                curl_setopt( $ch, CURLOPT_HTTPHEADER, array ('Expect:'
+                ) );
+            }
+        }
+        $response = curl_exec( $ch );
+        return $response;
+    }
+
+    function __getLastRequestHeaders ()
+    {
+        return implode( "\n", $this->__last_request_headers ) . "\n";
+    }
+
+}
+
+class PMServiceNTLMSoapClient extends NTLMSoapClient
+{
+    protected $user;
+    protected $password;
+
+    function setAuthClient ($auth)
+    {
+        $authInfo = explode( ":", $auth );
+        $this->user = $authInfo[0];
+        $this->password = $authInfo[1];
+    }
+}
+
+class PMServiceProviderNTLMStream extends soapNtlm
+{
+    protected static $user;
+    protected static $password;
+
+    public function getuser ()
+    {
+        return self::$user;
+    }
+
+    public function getpassword ()
+    {
+        return self::$password;
+    }
+
+    static function setAuthStream ($auth)
+    {
+        $authInfo = explode( ":", $auth );
+        self::$user = $authInfo[0];
+        self::$password = $authInfo[1];
+    }
+}
+
diff --git a/workflow/engine/PmBootstrap.php b/workflow/engine/PmBootstrap.php
index 9281cd4cf..8b5336a63 100644
--- a/workflow/engine/PmBootstrap.php
+++ b/workflow/engine/PmBootstrap.php
@@ -25,7 +25,7 @@ class PmBootstrap extends Bootstrap
     {
         parent::configure();
 
-        $this->pmConfig = PMSystem::getSystemConfiguration();
+        $this->pmConfig = PmSystem::getSystemConfiguration();
 
         $e_all  = defined('E_DEPRECATED') ? E_ALL  & ~E_DEPRECATED : E_ALL;
         $e_all  = defined('E_STRICT')     ? $e_all & ~E_STRICT     : $e_all;
diff --git a/workflow/engine/bin/cron.php b/workflow/engine/bin/cron.php
index b75192e7e..8db5a180c 100644
--- a/workflow/engine/bin/cron.php
+++ b/workflow/engine/bin/cron.php
@@ -77,7 +77,7 @@ try {
     $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
     //Load classes
 
-    $arraySystemConfiguration = PMSystem::getSystemConfiguration();
+    $arraySystemConfiguration = PmSystem::getSystemConfiguration();
 
     $e_all = (defined('E_DEPRECATED'))?            E_ALL  & ~E_DEPRECATED : E_ALL;
     $e_all = (defined('E_STRICT'))?                $e_all & ~E_STRICT     : $e_all;
diff --git a/workflow/engine/bin/cron_single.php b/workflow/engine/bin/cron_single.php
index 0595f7e73..407db80b6 100644
--- a/workflow/engine/bin/cron_single.php
+++ b/workflow/engine/bin/cron_single.php
@@ -64,7 +64,7 @@ try {
 
     $classLoader->addModelClassPath(PATH_TRUNK . 'workflow' . PATH_SEP . 'engine' . PATH_SEP . 'classes' . PATH_SEP . 'model' . PATH_SEP);
 
-    $arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', $workspace);
+    $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', $workspace);
 
     $e_all = (defined('E_DEPRECATED'))?            E_ALL  & ~E_DEPRECATED : E_ALL;
     $e_all = (defined('E_STRICT'))?                $e_all & ~E_STRICT     : $e_all;
diff --git a/workflow/engine/bin/reindex_solr.php b/workflow/engine/bin/reindex_solr.php
index ae15d4a98..dfd040ca4 100644
--- a/workflow/engine/bin/reindex_solr.php
+++ b/workflow/engine/bin/reindex_solr.php
@@ -144,7 +144,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 = PmSystem::getSystemConfiguration ('', '', SYS_SYS);
       define ('MEMCACHED_ENABLED', $config ['memcached']);
       define ('MEMCACHED_SERVER', $config ['memcached_server']);
       define ('TIME_ZONE', $config ['time_zone']);
@@ -260,7 +260,7 @@ function processWorkspace()
 
   try {
 
-    if (($solrConf = PMSystem::solrEnv (SYS_SYS)) !== false) {
+    if (($solrConf = PmSystem::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";
diff --git a/workflow/engine/bin/tasks/cliCommon.php b/workflow/engine/bin/tasks/cliCommon.php
index f75c4b0a7..c902dcf9d 100644
--- a/workflow/engine/bin/tasks/cliCommon.php
+++ b/workflow/engine/bin/tasks/cliCommon.php
@@ -47,7 +47,7 @@ function get_workspaces_from_args($args, $includeAll = true) {
     $workspaces[] = new workspaceTools($arg);
   }
   if (empty($workspaces) && $includeAll) {
-    $workspaces = PMSystem::listWorkspaces();
+    $workspaces = PmSystem::listWorkspaces();
   }
   return $workspaces;
 }
diff --git a/workflow/engine/bin/tasks/cliUpgrade.php b/workflow/engine/bin/tasks/cliUpgrade.php
index 3afba3da3..934c0ff56 100644
--- a/workflow/engine/bin/tasks/cliUpgrade.php
+++ b/workflow/engine/bin/tasks/cliUpgrade.php
@@ -87,7 +87,7 @@ function run_upgrade($command, $args)
     }
     $flag = G::isPMUnderUpdating(1, $oneWorkspace);
     //start to upgrade
-    $checksum = PMSystem::verifyChecksum();
+    $checksum = PmSystem::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 +177,7 @@ function run_upgrade($command, $args)
             }
         }
     } else {
-        CLI::logging('ProcessMaker ' . PMSystem::getVersion(). ' installed', PATH_DATA . 'log/upgrades.log');
+        CLI::logging('ProcessMaker ' . PmSystem::getVersion(). ' installed', PATH_DATA . 'log/upgrades.log');
     }
 
     //Safe upgrade for JavaScript files
diff --git a/workflow/engine/bin/verify_solr.php b/workflow/engine/bin/verify_solr.php
index dbe0352aa..e146ab9e1 100644
--- a/workflow/engine/bin/verify_solr.php
+++ b/workflow/engine/bin/verify_solr.php
@@ -119,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 = PmSystem::getSystemConfiguration ('', '', SYS_SYS);
       define ('MEMCACHED_ENABLED', $config ['memcached']);
       define ('MEMCACHED_SERVER', $config ['memcached_server']);
       define ('TIME_ZONE', $config ['time_zone']);
@@ -337,7 +337,7 @@ function displayMissingCases($aAppUidsDB, $aAppUidsSolr)
 
 function getListUids($usrUid, $action)
 {
-  if (($solrConf = PMSystem::solrEnv (SYS_SYS)) !== false) {
+  if (($solrConf = PmSystem::solrEnv (SYS_SYS)) !== false) {
 
     print "Solr Configuration file: " . PATH_DATA_SITE . "env.ini\n";
     print "solr_enabled: " . $solrConf ['solr_enabled'] . "\n";
diff --git a/workflow/engine/classes/PMSystem.php b/workflow/engine/classes/PmSystem.php
similarity index 97%
rename from workflow/engine/classes/PMSystem.php
rename to workflow/engine/classes/PmSystem.php
index 91c6214dc..509d40e4e 100644
--- a/workflow/engine/classes/PMSystem.php
+++ b/workflow/engine/classes/PmSystem.php
@@ -1,42 +1,15 @@
 <?php
 
 /**
- * upgrade_System.php
+ * class Processmaker System for workflow mantanance routines
  *
- * @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.
- *
- */
-
-/**
- * class system for workflow mantanance routines
- *
- * author Erik A.O.<erik@colosa.com>
  * date May 12th, 2010
  *
  * @package workflow.engine.classes
  *
  */
 
-class PMSystem
+class PmSystem
 {
     public $sFilename;
     public $sFilesList;
@@ -232,7 +205,7 @@ class PMSystem
         $Fields['IP'] = isset($ipe[0]) ? $ipe[0] : ''; //lookup($ipe[0]);
 
 
-        $Fields['PLUGINS_LIST'] = PMSystem::getPlugins();
+        $Fields['PLUGINS_LIST'] = PmSystem::getPlugins();
 
         return $Fields;
     }
@@ -723,7 +696,7 @@ class PMSystem
      */
     public static function getSystemSchema ()
     {
-        return PMSystem::getSchema( PATH_TRUNK . "workflow/engine/config/schema.xml" );
+        return PmSystem::getSchema( PATH_TRUNK . "workflow/engine/config/schema.xml" );
     }
 
     /**
@@ -733,7 +706,7 @@ class PMSystem
      */
     public static function getSystemSchemaRbac ()
     {
-    	return PMSystem::getSchema( PATH_TRUNK . "rbac/engine/config/schema.xml" );
+    	return PmSystem::getSchema( PATH_TRUNK . "rbac/engine/config/schema.xml" );
     }
 
     /**
@@ -748,7 +721,7 @@ class PMSystem
         $filter = new InputFilter();
         $pathFile = $filter->xssFilterHard(PATH_PLUGINS . $pluginName . "/config/schema.xml", 'path');
         if (file_exists( $pathFile )) {
-            return PMSystem::getSchema( $pathFile );
+            return PmSystem::getSchema( $pathFile );
         } else {
             return false;
         }
@@ -1231,9 +1204,9 @@ class PMSystem
     public static function solrEnv ($sysName = '')
     {
         if (empty( $sysName )) {
-            $conf = PMSystem::getSystemConfiguration();
+            $conf = PmSystem::getSystemConfiguration();
         } else {
-            $conf = PMSystem::getSystemConfiguration( '', '', $sysName );
+            $conf = PmSystem::getSystemConfiguration( '', '', $sysName );
         }
 
         if (! isset( $conf['solr_enabled'] ) || ! isset( $conf['solr_host'] ) || ! isset( $conf['solr_instance'] )) {
@@ -1251,7 +1224,7 @@ class PMSystem
     public static function getInstance()
     {
         if (is_null(self::$instance)) {
-            self::$instance = new PMSystem();
+            self::$instance = new PmSystem();
         }
 
         return self::$instance;
diff --git a/workflow/engine/classes/class.Upgrade.php b/workflow/engine/classes/class.Upgrade.php
index 1512442bb..7d2df591e 100644
--- a/workflow/engine/classes/class.Upgrade.php
+++ b/workflow/engine/classes/class.Upgrade.php
@@ -123,7 +123,7 @@ class Upgrade
             G::rm_dir(PATH_C);
             mkdir(PATH_C, 0777, true);
         }
-        $workspaces = PMSystem::listWorkspaces();
+        $workspaces = PmSystem::listWorkspaces();
         $count = count($workspaces);
         $first = true;
         $num = 0;
diff --git a/workflow/engine/classes/class.case.php b/workflow/engine/classes/class.case.php
index 7d7342ec7..4feec1018 100644
--- a/workflow/engine/classes/class.case.php
+++ b/workflow/engine/classes/class.case.php
@@ -42,7 +42,7 @@ class Cases
     public function __construct()
     {
         //get Solr initialization variables
-        if (($solrConf = PMSystem::solrEnv()) !== false) {
+        if (($solrConf = PmSystem::solrEnv()) !== false) {
             $this->appSolr = new AppSolr($solrConf['solr_enabled'], $solrConf['solr_host'], $solrConf['solr_instance']);
         }
     }
diff --git a/workflow/engine/classes/class.dashletRssReader.php b/workflow/engine/classes/class.dashletRssReader.php
index d1ff36974..567a45b0a 100644
--- a/workflow/engine/classes/class.dashletRssReader.php
+++ b/workflow/engine/classes/class.dashletRssReader.php
@@ -54,7 +54,7 @@ class dashletRssReader implements DashletInterface
         curl_setopt( $pCurl, CURLOPT_VERBOSE, false );
 
         //Apply proxy settings
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt( $pCurl, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/class.enterpriseUtils.php b/workflow/engine/classes/class.enterpriseUtils.php
index 85f543bde..0a2832651 100644
--- a/workflow/engine/classes/class.enterpriseUtils.php
+++ b/workflow/engine/classes/class.enterpriseUtils.php
@@ -40,7 +40,7 @@ class EnterpriseUtils
                 curl_setopt($ch, CURLOPT_VERBOSE, true);
 
                 //Apply proxy settings
-                $sysConf = PMSystem::getSystemConfiguration();
+                $sysConf = PmSystem::getSystemConfiguration();
                 if (isset($sysConf['proxy_host'])) {
                     if ($sysConf['proxy_host'] != '') {
                         curl_setopt($ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
diff --git a/workflow/engine/classes/class.license.lib.php b/workflow/engine/classes/class.license.lib.php
index 7f1171ce3..8ae5a9be0 100644
--- a/workflow/engine/classes/class.license.lib.php
+++ b/workflow/engine/classes/class.license.lib.php
@@ -236,7 +236,7 @@ class padl
         }
 
         // Proxy settings
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             if (!is_array($params['http'])) {
                 $params['http'] = array();
diff --git a/workflow/engine/classes/class.patch.php b/workflow/engine/classes/class.patch.php
index 9a46bb96b..4976a0535 100644
--- a/workflow/engine/classes/class.patch.php
+++ b/workflow/engine/classes/class.patch.php
@@ -30,7 +30,7 @@ class p11835 extends patch
         $rs->next();
         while($row = $rs->getRow()) {
             if ($row ['Field'] == "TAS_GROUP_VARIABLE") {
-                $version = PMSystem::getVersion ();
+                $version = PmSystem::getVersion ();
                 $version = explode('-',$version);
                 if ($version[0] == '2.5.1') {
                     echo "Version " . $version[0] . " Patch\n";
@@ -98,7 +98,7 @@ class p11835 extends patch
         $arrayHotfix = $conf->getConfiguration("HOTFIX", "");
         $arrayHotfix = (is_array($arrayHotfix))? $arrayHotfix : array($arrayHotfix);
         
-        $pmVersion = self::pmVersion(PMSystem::getVersion()) . "";
+        $pmVersion = self::pmVersion(PmSystem::getVersion()) . "";
         
         if (($pmVersion == "2.5.2.4" || $pmVersion == "2.8") && !in_array("15394", $arrayHotfix)) {
             $cnn = Propel::getConnection("workflow");
diff --git a/workflow/engine/classes/class.pluginRegistry.php b/workflow/engine/classes/class.pluginRegistry.php
index cdd0aecfd..79026e308 100644
--- a/workflow/engine/classes/class.pluginRegistry.php
+++ b/workflow/engine/classes/class.pluginRegistry.php
@@ -596,7 +596,7 @@ class PMPluginRegistry
 
     public function uninstallPluginWorkspaces ($arrayPlugin)
     {
-        $workspace = PMSystem::listWorkspaces();
+        $workspace = PmSystem::listWorkspaces();
 
         foreach ($workspace as $indexWS => $ws) {
             $wsPathDataSite = PATH_DATA . "sites" . PATH_SEP . $ws->name . PATH_SEP;
@@ -1640,7 +1640,7 @@ class PMPluginRegistry
             if (isset($pluginDetails->aWorkspaces) && is_array($pluginDetails->aWorkspaces) && count($pluginDetails->aWorkspaces) > 0) {
                 $arrayWorkspace = array();
 
-                foreach (PMSystem::listWorkspaces() as $value) {
+                foreach (PmSystem::listWorkspaces() as $value) {
                     $workspaceTools = $value;
 
                     $arrayWorkspace[] = $workspaceTools->name;
diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index 1f6ecac62..3bc58a7ae 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -1059,7 +1059,7 @@ class pmDynaform
         $javascript = "
             <script type=\"text/javascript\">
                 var jsondata = " . G::json_encode($json) . ";
-                var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";
+                var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";
                 var pm_run_outside_main_app = \"\";
                 var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\";
                 var __DynaformName__ = \"" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "\";
@@ -1120,7 +1120,7 @@ class pmDynaform
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" .
@@ -1199,7 +1199,7 @@ class pmDynaform
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . $this->json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = '" . $this->fields["PM_RUN_OUTSIDE_MAIN_APP"] . "';\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = '" . $this->record["PRO_UID"] . "_" . $this->record["DYN_UID"] . "';\n" .
@@ -1256,7 +1256,7 @@ class pmDynaform
         $javascrip = "
         <script type=\"text/javascript\">
             var jsondata = " . G::json_encode($json) . ";
-            var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";
+            var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";
             var pm_run_outside_main_app = null;
             var dyn_uid = \"" . $this->fields["CURRENT_DYNAFORM"] . "\";
             var __DynaformName__ = \"" . $this->fields["PRO_UID"] . "_" . $this->fields["CURRENT_DYNAFORM"] . "\";
@@ -1300,7 +1300,7 @@ class pmDynaform
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = null;\n" .
@@ -1342,7 +1342,7 @@ class pmDynaform
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $this->fields["CURRENT_DYNAFORM"] . "';\n" .
                 "var __DynaformName__ = null;\n" .
@@ -1384,7 +1384,7 @@ class pmDynaform
                 "var pathRTLCss = '" . $this->pathRTLCss . "';\n" .
                 "var delIndex = " . (isset($this->fields["DEL_INDEX"]) ? $this->fields["DEL_INDEX"] : "0") . ";\n" .
                 "var jsonData = " . $this->json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var leaveCaseWarning = " . $this->getLeaveCaseWarning() . ";\n" .
                 $js .
                 "</script>";
@@ -1406,7 +1406,7 @@ class pmDynaform
         $javascrip = "" .
                 "<script type='text/javascript'>\n" .
                 "var jsondata = " . G::json_encode($json) . ";\n" .
-                "var httpServerHostname = \"" . PMSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
+                "var httpServerHostname = \"" . PmSystem::getHttpServerHostnameRequestsFrontEnd() . "\";\n" .
                 "var pm_run_outside_main_app = null;\n" .
                 "var dyn_uid = '" . $currentDynaform . "';\n" .
                 "var __DynaformName__ = null;\n" .
diff --git a/workflow/engine/classes/class.pmFunctions.php b/workflow/engine/classes/class.pmFunctions.php
index 2cb94f932..e06e49940 100644
--- a/workflow/engine/classes/class.pmFunctions.php
+++ b/workflow/engine/classes/class.pmFunctions.php
@@ -241,7 +241,7 @@ function executeQuery ($SqlStatement, $DBConnectionUID = 'workflow', $aParameter
     $aContext = \Bootstrap::getDefaultContextLog();
     $con = Propel::getConnection( $DBConnectionUID );
     $con->begin();
-    $blackList = PMSystem::getQueryBlackList();
+    $blackList = PmSystem::getQueryBlackList();
     $aListQueries = explode('|', $blackList['queries']);
     $aListAllTables = explode(
         '|',
@@ -905,7 +905,7 @@ function WSProcessList ()
 //private function to get current email configuration
 function getEmailConfiguration ()
 {
-    return PMSystem::getEmailConfiguration();
+    return PmSystem::getEmailConfiguration();
 }
 
 /**
diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php
index 313f302c9..832254742 100644
--- a/workflow/engine/classes/class.processes.php
+++ b/workflow/engine/classes/class.processes.php
@@ -5771,7 +5771,7 @@ class Processes
         $endpoint = PML_WSDL_URL;
         $sessionId = '';
         $proxy = array();
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
             if ($sysConf['proxy_port'] != '') {
@@ -5813,7 +5813,7 @@ class Processes
         ini_set("soap.wsdl_cache_enabled", "0"); // enabling WSDL cache
         try {
             $proxy = array();
-            $sysConf = PMSystem::getSystemConfiguration();
+            $sysConf = PmSystem::getSystemConfiguration();
             if ($sysConf['proxy_host'] != '') {
                 $proxy['proxy_host'] = $sysConf['proxy_host'];
                 if ($sysConf['proxy_port'] != '') {
@@ -5845,7 +5845,7 @@ class Processes
 
         $endpoint = PML_WSDL_URL;
         $proxy = array();
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
 
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
@@ -5922,7 +5922,7 @@ class Processes
 
         $endpoint = PML_WSDL_URL;
         $proxy = array();
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/class.solr.php b/workflow/engine/classes/class.solr.php
index 4b4fe992c..5e5698f67 100644
--- a/workflow/engine/classes/class.solr.php
+++ b/workflow/engine/classes/class.solr.php
@@ -93,7 +93,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handlerTotal, CURLOPT_RETURNTRANSFER, true);
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handlerTotal, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -176,7 +176,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_RETURNTRANSFER, true);
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -227,7 +227,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_POSTFIELDS, $solrUpdateDocument->document); // data
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -275,7 +275,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_POSTFIELDS, "<commit/>"); // data
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -324,7 +324,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_POSTFIELDS, "<rollback/>"); // data
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -373,7 +373,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_POSTFIELDS, "<optimize/>"); // data
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -417,7 +417,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_RETURNTRANSFER, true);
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -504,7 +504,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_POSTFIELDS, "<delete><query>*:*</query></delete>"); // data
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -555,7 +555,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_POSTFIELDS, "<delete><query>" . $idQuery . "</query></delete>"); // data
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
@@ -640,7 +640,7 @@ class BpmnEngine_SearchIndexAccess_Solr
     curl_setopt ($handler, CURLOPT_RETURNTRANSFER, true);
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
       curl_setopt($handler, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
       if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/class.spool.php b/workflow/engine/classes/class.spool.php
index f619a6c46..567dc7e09 100644
--- a/workflow/engine/classes/class.spool.php
+++ b/workflow/engine/classes/class.spool.php
@@ -590,7 +590,7 @@ class spoolRun
      */
     public function resendEmails ($dateResend = null, $cron = 0)
     {
-        $aConfiguration = PMSystem::getEmailConfiguration();
+        $aConfiguration = PmSystem::getEmailConfiguration();
 
         if (!isset($aConfiguration["MESS_ENABLED"])) {
             $aConfiguration["MESS_ENABLED"] = '0';
diff --git a/workflow/engine/classes/class.webdav.php b/workflow/engine/classes/class.webdav.php
index 377573207..a6983f278 100644
--- a/workflow/engine/classes/class.webdav.php
+++ b/workflow/engine/classes/class.webdav.php
@@ -742,7 +742,7 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
         if (is_dir($path)) {
             $query = "DELETE FROM properties WHERE path LIKE '" . $this->_slashify($options["path"]) . "%'";
             mysql_query($query);
-            PMSystem::rm("-rf $path");
+            PmSystem::rm("-rf $path");
         } else {
             unlink($path);
         }
@@ -845,7 +845,7 @@ class ProcessMakerWebDav extends HTTP_WebDAV_Server
             mysql_query($query);
         } else {
             if (is_dir($source)) {
-                $files = PMSystem::find($source);
+                $files = PmSystem::find($source);
                 $files = array_reverse($files);
             } else {
                 $files = array($source
diff --git a/workflow/engine/classes/class.wsBase.php b/workflow/engine/classes/class.wsBase.php
index 890ff420e..bdb1f9cae 100644
--- a/workflow/engine/classes/class.wsBase.php
+++ b/workflow/engine/classes/class.wsBase.php
@@ -290,7 +290,7 @@ class wsBase
         try {
             $solrEnabled = 0;
 
-            if (($solrEnv = PMSystem::solrEnv()) !== false) {
+            if (($solrEnv = PmSystem::solrEnv()) !== false) {
 
                 $appSolr = new AppSolr(
                     $solrEnv["solr_enabled"],
@@ -893,7 +893,7 @@ class wsBase
                     }
                 }
 
-                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : PMSystem::getEmailConfiguration();
+                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : PmSystem::getEmailConfiguration();
 
                 if (!isset($aSetup['MESS_ENABLED'])) {
                     $aSetup['MESS_ENABLED'] = 1;
@@ -902,7 +902,7 @@ class wsBase
                 }
             } else {
             /*----------------------------------********---------------------------------*/
-                $aSetup = PMSystem::getEmailConfiguration();
+                $aSetup = PmSystem::getEmailConfiguration();
             /*----------------------------------********---------------------------------*/
             }
             /*----------------------------------********---------------------------------*/
@@ -2846,7 +2846,7 @@ class wsBase
             $result->status_code = 0;
             $result->message = G::loadTranslation( 'ID_SUCESSFUL' );
             $result->timestamp = date( 'Y-m-d H:i:s' );
-            $result->version = PMSystem::getVersion();
+            $result->version = PmSystem::getVersion();
             $result->operatingSystem = $redhat;
             $result->webServer = getenv( 'SERVER_SOFTWARE' );
             $result->serverName = getenv( 'SERVER_NAME' );
diff --git a/workflow/engine/classes/class.wsTools.php b/workflow/engine/classes/class.wsTools.php
index a5b54212d..bee233b1d 100644
--- a/workflow/engine/classes/class.wsTools.php
+++ b/workflow/engine/classes/class.wsTools.php
@@ -488,7 +488,7 @@ class workspaceTools
 
         $language = new Language();
 
-        foreach (PMSystem::listPoFiles() as $poFile) {
+        foreach (PmSystem::listPoFiles() as $poFile) {
             $poName = basename($poFile);
             $names = explode(".", basename($poFile));
             $extension = array_pop($names);
@@ -840,8 +840,8 @@ class workspaceTools
      */
     public function upgradePluginsDatabase()
     {
-        foreach (PMSystem::getPlugins() as $pluginName) {
-            $pluginSchema = PMSystem::getPluginSchema($pluginName);
+        foreach (PmSystem::getPlugins() as $pluginName) {
+            $pluginSchema = PmSystem::getPluginSchema($pluginName);
             if ($pluginSchema !== false) {
                 CLI::logging("Updating plugin " . CLI::info($pluginName) . "\n");
                 $this->upgradeSchema($pluginSchema);
@@ -860,8 +860,8 @@ class workspaceTools
         $this->initPropel(true);
         p11835::$dbAdapter = $this->dbAdapter;
         p11835::isApplicable();
-        $systemSchema = PMSystem::getSystemSchema($this->dbAdapter);
-        $systemSchemaRbac = PMSystem::getSystemSchemaRbac($this->dbAdapter);// get the Rbac Schema
+        $systemSchema = PmSystem::getSystemSchema($this->dbAdapter);
+        $systemSchemaRbac = PmSystem::getSystemSchemaRbac($this->dbAdapter);// get the Rbac Schema
         $this->registerSystemTables(array_merge($systemSchema,$systemSchemaRbac));
         $this->upgradeSchema($systemSchema);
         $this->upgradeSchema($systemSchemaRbac, false, true, $onedb); // perform Upgrade to Rbac
@@ -889,7 +889,7 @@ class workspaceTools
 
             $emailSever = new \ProcessMaker\BusinessModel\EmailServer();
 
-            $emailConfiguration = PMSystem::getEmailConfiguration();
+            $emailConfiguration = PmSystem::getEmailConfiguration();
 
             if (!empty($emailConfiguration)) {
                 $arrayData["MESS_ENGINE"] = $emailConfiguration["MESS_ENGINE"];
@@ -984,7 +984,7 @@ class workspaceTools
 
         if (!$onedb) {
             if($rbac){
-                $rename = PMSystem::verifyRbacSchema($workspaceSchema);
+                $rename = PmSystem::verifyRbacSchema($workspaceSchema);
                 if (count($rename) > 0) {
                     foreach ($rename as $tableName) {
                         $oDataBase->executeQuery($oDataBase->generateRenameTableSQL($tableName));
@@ -993,7 +993,7 @@ class workspaceTools
             }
         }
         $workspaceSchema = $this->getSchema($rbac);
-        $changes = PMSystem::compareSchema($workspaceSchema, $schema);
+        $changes = PmSystem::compareSchema($workspaceSchema, $schema);
 
         $changed = (count($changes['tablesToAdd']) > 0 || count($changes['tablesToAlter']) > 0 || count($changes['tablesWithNewIndex']) > 0 || count($changes['tablesToAlterIndex']) > 0);
 
@@ -1132,7 +1132,7 @@ class workspaceTools
      */
     public function getMetadata()
     {
-        $Fields = array_merge(PMSystem::getSysInfo(), $this->getDBInfo());
+        $Fields = array_merge(PmSystem::getSysInfo(), $this->getDBInfo());
         $Fields['WORKSPACE_NAME'] = $this->name;
 
         if (isset($this->dbHost)) {
@@ -1168,7 +1168,7 @@ class workspaceTools
      */
     public static function printSysInfo()
     {
-        $fields = PMSystem::getSysInfo();
+        $fields = PmSystem::getSysInfo();
 
         $info = array(
             'ProcessMaker Version' => $fields['PM_VERSION'],
@@ -1650,7 +1650,7 @@ class workspaceTools
             throw new Exception("Workspace $srcWorkspace not found in backup");
         }
 
-        $version = PMSystem::getVersion();
+        $version = PmSystem::getVersion();
         $pmVersion = (preg_match("/^([\d\.]+).*$/", $version, $arrayMatch)) ? $arrayMatch[1] : ""; //Otherwise: Branch master
 
         CLI::logging(CLI::warning("
@@ -1910,7 +1910,7 @@ class workspaceTools
 
     public function backupLogFiles()
     {
-        $config = PMSystem::getSystemConfiguration();
+        $config = PmSystem::getSystemConfiguration();
 
         clearstatcache();
         $path = PATH_DATA . "log" . PATH_SEP;
@@ -1942,7 +1942,7 @@ class workspaceTools
                 $envFile = PATH_CONFIG . 'env.ini';
                 $skin ='neoclassic';
                 if (file_exists($envFile) ) {
-                    $sysConf = PMSystem::getSystemConfiguration($envFile);
+                    $sysConf = PmSystem::getSystemConfiguration($envFile);
                     $lang = $sysConf['default_lang'];
                     $skin = $sysConf['default_skin'];
                 }
@@ -3507,7 +3507,7 @@ class workspaceTools
 
     public function migrateIteeToDummytask($workspaceName){
         $this->initPropel(true);
-        $arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', $workspaceName);
+        $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', $workspaceName);
         $conf = new Configurations();
         \G::$sysSys = $workspaceName;
         \G::$pathDataSite = PATH_DATA . "sites" . PATH_SEP . \G::$sysSys . PATH_SEP;
diff --git a/workflow/engine/classes/model/AddonsManager.php b/workflow/engine/classes/model/AddonsManager.php
index ae9e24f22..4762cda5e 100644
--- a/workflow/engine/classes/model/AddonsManager.php
+++ b/workflow/engine/classes/model/AddonsManager.php
@@ -163,7 +163,7 @@ class AddonsManager extends BaseAddonsManager
     public function getInstalledVersion()
     {
         if ($this->isCore()) {
-            return (EnterpriseUtils::pmVersion(PMSystem::getVersion()));
+            return (EnterpriseUtils::pmVersion(PmSystem::getVersion()));
         } else {
             if ($this->isPlugin()) {
                 if (!$this->isInstalled()) {
@@ -251,7 +251,7 @@ class AddonsManager extends BaseAddonsManager
         );
 
         // Proxy settings
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             if (!is_array($option['http'])) {
                 $option['http'] = array();
diff --git a/workflow/engine/classes/model/AddonsStore.php b/workflow/engine/classes/model/AddonsStore.php
index 38e725cea..bab75fa2e 100644
--- a/workflow/engine/classes/model/AddonsStore.php
+++ b/workflow/engine/classes/model/AddonsStore.php
@@ -494,7 +494,7 @@ class AddonsStore extends BaseAddonsStore
                     "header" => "Content-type: application/x-www-form-urlencoded\r\n",
                     "content" => http_build_query(
                         array(
-                            "pmVersion" => PMSystem::getVersion(),
+                            "pmVersion" => PmSystem::getVersion(),
                             "version" => STORE_VERSION
                         )
                     )
@@ -502,7 +502,7 @@ class AddonsStore extends BaseAddonsStore
             );
 
             // Proxy settings
-            $sysConf = PMSystem::getSystemConfiguration();
+            $sysConf = PmSystem::getSystemConfiguration();
             if (isset($sysConf['proxy_host'])) {
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
diff --git a/workflow/engine/classes/model/AppNotes.php b/workflow/engine/classes/model/AppNotes.php
index 84ea81f17..8d72cc384 100644
--- a/workflow/engine/classes/model/AppNotes.php
+++ b/workflow/engine/classes/model/AppNotes.php
@@ -148,7 +148,7 @@ class AppNotes extends BaseAppNotes
     {
         try {
 
-            $aConfiguration = PMSystem::getEmailConfiguration();
+            $aConfiguration = PmSystem::getEmailConfiguration();
 
             $msgError = "";
             if (! isset( $aConfiguration['MESS_ENABLED'] ) || $aConfiguration['MESS_ENABLED'] != '1') {
diff --git a/workflow/engine/classes/model/Language.php b/workflow/engine/classes/model/Language.php
index c8d1d4954..481ca6b16 100644
--- a/workflow/engine/classes/model/Language.php
+++ b/workflow/engine/classes/model/Language.php
@@ -355,7 +355,7 @@ class Language extends BaseLanguage
         $sLanguage = $langRecord['LAN_NAME'];
 
         //setting headers
-        $poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . PMSystem::getVersion() );
+        $poFile->addHeader( 'Project-Id-Version', 'ProcessMaker ' . PmSystem::getVersion() );
         $poFile->addHeader( 'POT-Creation-Date', '' );
         $poFile->addHeader( 'PO-Revision-Date', date( 'Y-m-d H:i:s' ) );
         $poFile->addHeader( 'Last-Translator', '' );
diff --git a/workflow/engine/classes/triggers/api/class.zimbraApi.php b/workflow/engine/classes/triggers/api/class.zimbraApi.php
index 5e47a7d22..0a564f8b7 100644
--- a/workflow/engine/classes/triggers/api/class.zimbraApi.php
+++ b/workflow/engine/classes/triggers/api/class.zimbraApi.php
@@ -195,7 +195,7 @@ class Zimbra
         curl_setopt($this->_curl, CURLOPT_SSL_VERIFYHOST, false);
 
         //Apply proxy settings
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             curl_setopt($this->_curl, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/triggers/class.pmSugarFunctions.php b/workflow/engine/classes/triggers/class.pmSugarFunctions.php
index ae693db82..077883651 100644
--- a/workflow/engine/classes/triggers/class.pmSugarFunctions.php
+++ b/workflow/engine/classes/triggers/class.pmSugarFunctions.php
@@ -1,518 +1,518 @@
-<?php
-
-/**
- * class.pmSugar.pmFunctions.php
- *
- * ProcessMaker Open Source Edition
- * Copyright (C) 2004 - 2008 Colosa Inc.
- * *
- */
-
-////////////////////////////////////////////////////
-// pmSugar PM Functions
-//
-// Copyright (C) 2007 COLOSA
-//
-// License: LGPL, see LICENSE
-////////////////////////////////////////////////////
-
-
-function getSoapClientOptions ()
-{
-    $options = array ('trace' => 1);
-
-    //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
-    if ($sysConf['proxy_host'] != '') {
-        $options['proxy_host'] = $sysConf['proxy_host'];
-        if ($sysConf['proxy_port'] != '') {
-            $options['proxy_port'] = $sysConf['proxy_port'];
-        }
-        if ($sysConf['proxy_user'] != '') {
-            $options['proxy_login'] = $sysConf['proxy_user'];
-        }
-        if ($sysConf['proxy_pass'] != '') {
-            $options['proxy_password'] = $sysConf['proxy_pass'];
-        }
-    }
-
-    return $options;
-}
-
-/**
- * This collection of triggers allows to interact by getting and sending information to SugarCRM
- * @class pmSugar
- *
- * @name Sugar CRM Triggers
- * @icon /images/triggers/icon_SugarCRM.gif
- * @className class.pmSugar.pmFunctions.php
- */
-
-function sugarLogin ($sugarSoap, $user, $password)
-{
-    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
-    $auth_array = array ('user_auth' => array ('user_name' => $user,'password' => G::encryptOld( $password ),'version' => '1.0') );
-    $login_results = $client->__SoapCall( 'login', $auth_array );
-    $session_id = $login_results->id;
-    $user_guid = $client->__SoapCall( 'get_user_id', array ($session_id) );
-    return $session_id;
-}
-
-function objectToArray ($object)
-{
-    if (! is_object( $object ) && ! is_array( $object )) {
-        return $object;
-    }
-    if (is_object( $object )) {
-        $object = get_object_vars( $object );
-    }
-    return array_map( "objectToArray", $object );
-}
-
-/**
- *
- * @method
- *
- * Gets SugarCRM entry using get_entry web service.
- *
- * @name GetSugarEntry
- * @label Get SugarCRM Entry
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl [^]
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $module | The name of the module from which to retrieve records.
- * @param string | $id | The SugarBean’s ID.
- * @param string | $selectedFields | Optional. The list of fields to be returned in the results.
- * @param string | $linkNameToFieldsArray | A list of link names and the fields to be returned for each link name.
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarEntries | Sugar Entries (array or object) |
- *
- */
-
-function GetSugarEntry ($sugarSoap, $user, $password, $module, $id, $selectFields, $linkNameToFieldsArray, $resultType = 'array')
-{
-    $sessionId = sugarLogin( $sugarSoap, $user, $password );
-    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
-    $request_array = array ('session' => $sessionId,'module_name' => $module,'id' => $id,'select_fields' => $select_fields,'link_name_to_fields_array' => $linkNameToFieldsArray);
-    $sugarEntry = $client->__SoapCall( 'get_entry', $request_array );
-
-    if ($resultType == 'array') {
-        $sugarEntry = objectToArray( $sugarEntry );
-    }
-
-    return $sugarEntry;
-}
-
-/**
- *
- * @method
- *
- * Gets SugarCRM entries from the indicated module.
- *
- * @name GetSugarEntries
- * @label Get SugarCRM Entries
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $module | Module
- * @param string | $query | Query
- * @param string | $orderBy | Order By
- * @param string | $selectedFields | Selected Fields
- * @param string | $maxResults=50 | Max Results
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarEntries | Sugar Entries (array or object) |
- *
- */
-
-function GetSugarEntries ($sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
-{
-    $sessionId = sugarLogin( $sugarSoap, $user, $password );
-    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
-    $request_array = array ('session' => $sessionId,'module_name' => $module,'query' => $query,'order_by' => $orderBy,'offset' => "",'select_fields' => "",'max_result' => $maxResults);
-    $sugarEntriesO = $client->__SoapCall( 'get_entry_list', $request_array );
-
-    switch ($resultType) {
-        case 'array':
-            $sugarEntries = objectToArray( $sugarEntriesO );
-            break;
-        case 'object':
-            $sugarEntries = $sugarEntriesO;
-            break;
-        default:
-            $sugarEntries = objectToArray( $sugarEntries );
-    }
-
-    return $sugarEntries;
-
-}
-
-/**
- *
- * @method
- *
- * Gets SugarCRM entries from the Calls module
- *
- * @name GetSugarCalls
- * @label Gets SugarCRM entries from the Calls module
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $query | Query
- * @param string | $orderBy | Order By
- * @param string | $selectedFields | Selected Fields
- * @param string | $maxResults=50 | Max Results
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarCalls | Sugar Calls (array or object) |
- *
- */
-
-function GetSugarCalls ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
-{
-    $module = "Calls";
-    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
-}
-
-/**
- *
- * @method
- *
- * Gets SugarCRM entries from the Leads module.
- *
- * @name GetSugarLeads
- * @label Gets SugarCRM entries from the Leads module.
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $query | Query
- * @param string | $orderBy | Order By
- * @param string | $selectedFields | Selected Fields
- * @param string | $maxResults=50 | Max Results
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarLeads | Sugar Leads (array or object) |
- *
- */
-
-function GetSugarLeads ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
-{
-    $module = "Leads";
-    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
-}
-
-/**
- *
- * @method
- *
- * Gets SugarCRM entries from the Contacts module.
- *
- * @name GetSugarContacts
- * @label Gets SugarCRM entries from the Contacts module.
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $query | Query
- * @param string | $orderBy | Order By
- * @param string | $selectedFields | Selected Fields
- * @param string | $maxResults=50 | Max Results
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarContacts | Sugar Contacts (array or object) |
- *
- */
-
-function GetSugarContacts ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
-{
-    $module = "Contacts";
-    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
-}
-
-/**
- *
- * @method
- *
- * Gets SugarCRM entries from the Opportunities module.
- *
- * @name GetSugarOpportunities
- * @label Gets SugarCRM entries from the Opportunities module.
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $query | Query
- * @param string | $orderBy | Order By
- * @param string | $selectedFields | Selected Fields
- * @param string | $maxResults=50 | Max Results
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarAccount | Sugar Opportunities (array or object) |
- *
- */
-
-function GetSugarOpportunities ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
-{
-    $module = "Opportunities";
-    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
-}
-
-/**
- *
- * @method
- *
- * Gets SugarCRM entries from the Account module.
- *
- * @name GetSugarAccount
- * @label Gets SugarCRM entries from the Account module.
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $query | Query
- * @param string | $orderBy | Order By
- * @param string | $selectedFields | Selected Fields
- * @param string | $maxResults=50 | Max Results
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarAccount | Sugar Opportunities (array or object) |
- *
- */
-
-function GetSugarAccount ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
-{
-    $module = "Accounts";
-    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
-}
-
-/**
- *
- * @method
- *
- * Creates SugarCRM entries from the Account module.
- *
- * @name CreateSugarAccount
- *
- * @label Creates SugarCRM entries from the Account module.
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $name | Account name
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarAccount | Sugar Opportunities (array or object) |
- *
- */
-function CreateSugarAccount ($sugarSoap, $user, $password, $name, $resultType = "array")
-{
-
-    $module = "Accounts";
-    $sessionId = sugarLogin( $sugarSoap, $user, $password );
-    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
-    $request_array = array ('session' => $sessionId,'module_name' => $module,'name_value_list' => array (array ("name" => 'name',"value" => $name)));
-    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
-    $account_id = $sugarEntriesO->id;
-
-    switch ($resultType) {
-        case 'array':
-            $sugarEntries = objectToArray( $sugarEntriesO );
-            break;
-        case 'object':
-            $sugarEntries = $sugarEntries;
-            break;
-        default:
-            $sugarEntries = objectToArray( $sugarEntries );
-    }
-    //return $sugarEntries;
-    return $account_id;
-}
-
-/**
- *
- * @method
- *
- * Creates SugarCRM entries from the Contacts module
- *
- * @name CreateSugarContact
- *
- * @label Creates SugarCRM entries from the Contacts module
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $first_name | First Name
- * @param string | $last_name | Last Name
- * @param string | $email | Email
- * @param string | $title | Title
- * @param string | $phone | Phone Work
- * @param string | $account_id | Valid id account
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarContact | Sugar Opportunities (array or object) |
- *
- */
-function CreateSugarContact ($sugarSoap, $user, $password, $first_name, $last_name, $email, $title, $phone, $account_id, $resultType = "array")
-{
-    $module = "Contacts";
-    /*    $aValue =  array(
-        array("name" => 'id',           "value" => G::generateUniqueID()),
-        array("name" => 'first_name',   "value" => $first_name),
-        array("name" => 'last_name',    "value" => $last_name),
-    );
-    */
-    $sessionId = sugarLogin( $sugarSoap, $user, $password );
-    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
-
-    $request_array = array ('session' => $sessionId,'module_name' => $module,array (array ("name" => 'first_name',"value" => $first_name
-    ),array ("name" => 'last_name',"value" => $last_name
-    ),array ("name" => 'email1',"value" => $email
-    ),array ("name" => 'title',"value" => $title
-    ),array ("name" => 'phone_work',"value" => $phone
-    ),
-    //   array("name" => 'account_id',"value" => '8cd10a60-101f-4363-1e0b-4cfd4106bd7e')
-    array ("name" => 'account_id',"value" => $account_id
-    )));
-
-    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
-
-    switch ($resultType) {
-        case 'array':
-            $sugarEntries = objectToArray( $sugarEntriesO );
-            break;
-        case 'object':
-            $sugarEntries = $sugarEntries;
-            break;
-        default:
-            $sugarEntries = objectToArray( $sugarEntries );
-    }
-    return $sugarEntries;
-}
-
-/**
- *
- * @method
- *
- * Creates SugarCRM entries from the Opportunities module.
- *
- * @name CreateSugarOpportunity
- *
- * @label Creates SugarCRM entries from the Opportunities module.
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $name | Name
- * @param string | $account_id | Valid id account
- * @param string | $amount | Amount
- * @param string | $date_closed | Date Closed
- * @param string | $sales_stage | Prospecting, Qualification, Needs Analysis, Value Proposition, Id. Decision Makers, Perception Analysis, Proposal/Price Quote, Negotiation/Review, Closed Won, Closed Lost
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarOpportunity | Sugar Opportunities (array or object) |
- *
- */
-function CreateSugarOpportunity ($sugarSoap, $user, $password, $name, $account_id, $amount, $date_closed, $sales_stage, $resultType = "array")
-{
-    // * @param string | $account_id | Account Id
-    $module = "Opportunities";
-
-    /*  $aValue =  array(
-        array("name" => 'id',           "value" => G::generateUniqueID()),
-        array("name" => 'name',         "value" => $name),
-        array("name" => 'account_name', "value" => $account_name),
-        array("name" => 'amount',       "value" => $amount),
-        array("name" => 'date_closed',  "value" => $date_closed),
-        array("name" => 'sales_stage',  "value" => $sales_stage)
-        );*/
-
-    $sessionId = sugarLogin( $sugarSoap, $user, $password );
-    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
-
-    $request_array = array ('session' => $sessionId,'module_name' => $module,'name_value_list' => array (array ('name' => 'name','value' => $name
-    ),array ("name" => 'account_id',"value" => $account_id
-    ),array ('name' => 'amount','value' => $amount
-    ),array ('name' => 'date_closed','value' => $date_closed
-    ),array ('name' => 'sales_stage','value' => $sales_stage
-    )
-    )
-    );
-
-    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
-
-    switch ($resultType) {
-        case 'array':
-            $sugarEntries = objectToArray( $sugarEntriesO );
-            break;
-        case 'object':
-            $sugarEntries = $sugarEntries;
-            break;
-        default:
-            $sugarEntries = objectToArray( $sugarEntries );
-    }
-    return $sugarEntries;
-}
-
-/**
- *
- * @method
- *
- * Creates SugarCRM entries from the Leads module
- *
- * @name CreateSugarLeads
- *
- * @label Creates SugarCRM entries from the Leads module
- *
- * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
- * @param string | $user | User
- * @param string | $password | Password
- * @param string | $first_name | First Name
- * @param string | $last_name | Last Name
- * @param string | $email | Email
- * @param string | $title | Title
- * @param string | $phone | Phone Work
- * @param string | $account_id | Valid id account
- * @param string | $resultType=array | Result type (array or object)
- *
- * @return array/object | $sugarContact | Sugar Opportunities (array or object) |
- *
- */
-function CreateSugarLeads ($sugarSoap, $user, $password, $first_name, $last_name, $email, $title, $phone, $account_id, $resultType = "array")
-{
-
-    $module = "Leads";
-    $sessionId = sugarLogin( $sugarSoap, $user, $password );
-    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
-
-    $request_array = array ('session' => $sessionId,'module_name' => $module,array (array ("name" => 'first_name',"value" => $first_name
-    ),array ("name" => 'last_name',"value" => $last_name
-    ),array ("name" => 'email1',"value" => $email
-    ),array ("name" => 'title',"value" => $title
-    ),array ("name" => 'phone_work',"value" => $phone
-    ),
-    //   array("name" => 'account_id',"value" => '8cd10a60-101f-4363-1e0b-4cfd4106bd7e')
-    array ("name" => 'account_id',"value" => $account_id
-    )
-    )
-    );
-
-    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
-
-    switch ($resultType) {
-        case 'array':
-            $sugarEntries = objectToArray( $sugarEntriesO );
-            break;
-        case 'object':
-            $sugarEntries = $sugarEntries;
-            break;
-        default:
-            $sugarEntries = objectToArray( $sugarEntries );
-    }
-    return $sugarEntries;
-}
-
+<?php
+
+/**
+ * class.pmSugar.pmFunctions.php
+ *
+ * ProcessMaker Open Source Edition
+ * Copyright (C) 2004 - 2008 Colosa Inc.
+ * *
+ */
+
+////////////////////////////////////////////////////
+// pmSugar PM Functions
+//
+// Copyright (C) 2007 COLOSA
+//
+// License: LGPL, see LICENSE
+////////////////////////////////////////////////////
+
+
+function getSoapClientOptions ()
+{
+    $options = array ('trace' => 1);
+
+    //Apply proxy settings
+    $sysConf = PmSystem::getSystemConfiguration();
+    if ($sysConf['proxy_host'] != '') {
+        $options['proxy_host'] = $sysConf['proxy_host'];
+        if ($sysConf['proxy_port'] != '') {
+            $options['proxy_port'] = $sysConf['proxy_port'];
+        }
+        if ($sysConf['proxy_user'] != '') {
+            $options['proxy_login'] = $sysConf['proxy_user'];
+        }
+        if ($sysConf['proxy_pass'] != '') {
+            $options['proxy_password'] = $sysConf['proxy_pass'];
+        }
+    }
+
+    return $options;
+}
+
+/**
+ * This collection of triggers allows to interact by getting and sending information to SugarCRM
+ * @class pmSugar
+ *
+ * @name Sugar CRM Triggers
+ * @icon /images/triggers/icon_SugarCRM.gif
+ * @className class.pmSugar.pmFunctions.php
+ */
+
+function sugarLogin ($sugarSoap, $user, $password)
+{
+    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
+    $auth_array = array ('user_auth' => array ('user_name' => $user,'password' => G::encryptOld( $password ),'version' => '1.0') );
+    $login_results = $client->__SoapCall( 'login', $auth_array );
+    $session_id = $login_results->id;
+    $user_guid = $client->__SoapCall( 'get_user_id', array ($session_id) );
+    return $session_id;
+}
+
+function objectToArray ($object)
+{
+    if (! is_object( $object ) && ! is_array( $object )) {
+        return $object;
+    }
+    if (is_object( $object )) {
+        $object = get_object_vars( $object );
+    }
+    return array_map( "objectToArray", $object );
+}
+
+/**
+ *
+ * @method
+ *
+ * Gets SugarCRM entry using get_entry web service.
+ *
+ * @name GetSugarEntry
+ * @label Get SugarCRM Entry
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl [^]
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $module | The name of the module from which to retrieve records.
+ * @param string | $id | The SugarBean’s ID.
+ * @param string | $selectedFields | Optional. The list of fields to be returned in the results.
+ * @param string | $linkNameToFieldsArray | A list of link names and the fields to be returned for each link name.
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarEntries | Sugar Entries (array or object) |
+ *
+ */
+
+function GetSugarEntry ($sugarSoap, $user, $password, $module, $id, $selectFields, $linkNameToFieldsArray, $resultType = 'array')
+{
+    $sessionId = sugarLogin( $sugarSoap, $user, $password );
+    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
+    $request_array = array ('session' => $sessionId,'module_name' => $module,'id' => $id,'select_fields' => $select_fields,'link_name_to_fields_array' => $linkNameToFieldsArray);
+    $sugarEntry = $client->__SoapCall( 'get_entry', $request_array );
+
+    if ($resultType == 'array') {
+        $sugarEntry = objectToArray( $sugarEntry );
+    }
+
+    return $sugarEntry;
+}
+
+/**
+ *
+ * @method
+ *
+ * Gets SugarCRM entries from the indicated module.
+ *
+ * @name GetSugarEntries
+ * @label Get SugarCRM Entries
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $module | Module
+ * @param string | $query | Query
+ * @param string | $orderBy | Order By
+ * @param string | $selectedFields | Selected Fields
+ * @param string | $maxResults=50 | Max Results
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarEntries | Sugar Entries (array or object) |
+ *
+ */
+
+function GetSugarEntries ($sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
+{
+    $sessionId = sugarLogin( $sugarSoap, $user, $password );
+    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
+    $request_array = array ('session' => $sessionId,'module_name' => $module,'query' => $query,'order_by' => $orderBy,'offset' => "",'select_fields' => "",'max_result' => $maxResults);
+    $sugarEntriesO = $client->__SoapCall( 'get_entry_list', $request_array );
+
+    switch ($resultType) {
+        case 'array':
+            $sugarEntries = objectToArray( $sugarEntriesO );
+            break;
+        case 'object':
+            $sugarEntries = $sugarEntriesO;
+            break;
+        default:
+            $sugarEntries = objectToArray( $sugarEntries );
+    }
+
+    return $sugarEntries;
+
+}
+
+/**
+ *
+ * @method
+ *
+ * Gets SugarCRM entries from the Calls module
+ *
+ * @name GetSugarCalls
+ * @label Gets SugarCRM entries from the Calls module
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $query | Query
+ * @param string | $orderBy | Order By
+ * @param string | $selectedFields | Selected Fields
+ * @param string | $maxResults=50 | Max Results
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarCalls | Sugar Calls (array or object) |
+ *
+ */
+
+function GetSugarCalls ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
+{
+    $module = "Calls";
+    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
+}
+
+/**
+ *
+ * @method
+ *
+ * Gets SugarCRM entries from the Leads module.
+ *
+ * @name GetSugarLeads
+ * @label Gets SugarCRM entries from the Leads module.
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $query | Query
+ * @param string | $orderBy | Order By
+ * @param string | $selectedFields | Selected Fields
+ * @param string | $maxResults=50 | Max Results
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarLeads | Sugar Leads (array or object) |
+ *
+ */
+
+function GetSugarLeads ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
+{
+    $module = "Leads";
+    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
+}
+
+/**
+ *
+ * @method
+ *
+ * Gets SugarCRM entries from the Contacts module.
+ *
+ * @name GetSugarContacts
+ * @label Gets SugarCRM entries from the Contacts module.
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $query | Query
+ * @param string | $orderBy | Order By
+ * @param string | $selectedFields | Selected Fields
+ * @param string | $maxResults=50 | Max Results
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarContacts | Sugar Contacts (array or object) |
+ *
+ */
+
+function GetSugarContacts ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
+{
+    $module = "Contacts";
+    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
+}
+
+/**
+ *
+ * @method
+ *
+ * Gets SugarCRM entries from the Opportunities module.
+ *
+ * @name GetSugarOpportunities
+ * @label Gets SugarCRM entries from the Opportunities module.
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $query | Query
+ * @param string | $orderBy | Order By
+ * @param string | $selectedFields | Selected Fields
+ * @param string | $maxResults=50 | Max Results
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarAccount | Sugar Opportunities (array or object) |
+ *
+ */
+
+function GetSugarOpportunities ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
+{
+    $module = "Opportunities";
+    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
+}
+
+/**
+ *
+ * @method
+ *
+ * Gets SugarCRM entries from the Account module.
+ *
+ * @name GetSugarAccount
+ * @label Gets SugarCRM entries from the Account module.
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $query | Query
+ * @param string | $orderBy | Order By
+ * @param string | $selectedFields | Selected Fields
+ * @param string | $maxResults=50 | Max Results
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarAccount | Sugar Opportunities (array or object) |
+ *
+ */
+
+function GetSugarAccount ($sugarSoap, $user, $password, $query, $orderBy, $selectedFields, $maxResults, $resultType = "array")
+{
+    $module = "Accounts";
+    return GetSugarEntries( $sugarSoap, $user, $password, $module, $query, $orderBy, $selectedFields, $maxResults, $resultType );
+}
+
+/**
+ *
+ * @method
+ *
+ * Creates SugarCRM entries from the Account module.
+ *
+ * @name CreateSugarAccount
+ *
+ * @label Creates SugarCRM entries from the Account module.
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $name | Account name
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarAccount | Sugar Opportunities (array or object) |
+ *
+ */
+function CreateSugarAccount ($sugarSoap, $user, $password, $name, $resultType = "array")
+{
+
+    $module = "Accounts";
+    $sessionId = sugarLogin( $sugarSoap, $user, $password );
+    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
+    $request_array = array ('session' => $sessionId,'module_name' => $module,'name_value_list' => array (array ("name" => 'name',"value" => $name)));
+    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
+    $account_id = $sugarEntriesO->id;
+
+    switch ($resultType) {
+        case 'array':
+            $sugarEntries = objectToArray( $sugarEntriesO );
+            break;
+        case 'object':
+            $sugarEntries = $sugarEntries;
+            break;
+        default:
+            $sugarEntries = objectToArray( $sugarEntries );
+    }
+    //return $sugarEntries;
+    return $account_id;
+}
+
+/**
+ *
+ * @method
+ *
+ * Creates SugarCRM entries from the Contacts module
+ *
+ * @name CreateSugarContact
+ *
+ * @label Creates SugarCRM entries from the Contacts module
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $first_name | First Name
+ * @param string | $last_name | Last Name
+ * @param string | $email | Email
+ * @param string | $title | Title
+ * @param string | $phone | Phone Work
+ * @param string | $account_id | Valid id account
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarContact | Sugar Opportunities (array or object) |
+ *
+ */
+function CreateSugarContact ($sugarSoap, $user, $password, $first_name, $last_name, $email, $title, $phone, $account_id, $resultType = "array")
+{
+    $module = "Contacts";
+    /*    $aValue =  array(
+        array("name" => 'id',           "value" => G::generateUniqueID()),
+        array("name" => 'first_name',   "value" => $first_name),
+        array("name" => 'last_name',    "value" => $last_name),
+    );
+    */
+    $sessionId = sugarLogin( $sugarSoap, $user, $password );
+    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
+
+    $request_array = array ('session' => $sessionId,'module_name' => $module,array (array ("name" => 'first_name',"value" => $first_name
+    ),array ("name" => 'last_name',"value" => $last_name
+    ),array ("name" => 'email1',"value" => $email
+    ),array ("name" => 'title',"value" => $title
+    ),array ("name" => 'phone_work',"value" => $phone
+    ),
+    //   array("name" => 'account_id',"value" => '8cd10a60-101f-4363-1e0b-4cfd4106bd7e')
+    array ("name" => 'account_id',"value" => $account_id
+    )));
+
+    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
+
+    switch ($resultType) {
+        case 'array':
+            $sugarEntries = objectToArray( $sugarEntriesO );
+            break;
+        case 'object':
+            $sugarEntries = $sugarEntries;
+            break;
+        default:
+            $sugarEntries = objectToArray( $sugarEntries );
+    }
+    return $sugarEntries;
+}
+
+/**
+ *
+ * @method
+ *
+ * Creates SugarCRM entries from the Opportunities module.
+ *
+ * @name CreateSugarOpportunity
+ *
+ * @label Creates SugarCRM entries from the Opportunities module.
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $name | Name
+ * @param string | $account_id | Valid id account
+ * @param string | $amount | Amount
+ * @param string | $date_closed | Date Closed
+ * @param string | $sales_stage | Prospecting, Qualification, Needs Analysis, Value Proposition, Id. Decision Makers, Perception Analysis, Proposal/Price Quote, Negotiation/Review, Closed Won, Closed Lost
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarOpportunity | Sugar Opportunities (array or object) |
+ *
+ */
+function CreateSugarOpportunity ($sugarSoap, $user, $password, $name, $account_id, $amount, $date_closed, $sales_stage, $resultType = "array")
+{
+    // * @param string | $account_id | Account Id
+    $module = "Opportunities";
+
+    /*  $aValue =  array(
+        array("name" => 'id',           "value" => G::generateUniqueID()),
+        array("name" => 'name',         "value" => $name),
+        array("name" => 'account_name', "value" => $account_name),
+        array("name" => 'amount',       "value" => $amount),
+        array("name" => 'date_closed',  "value" => $date_closed),
+        array("name" => 'sales_stage',  "value" => $sales_stage)
+        );*/
+
+    $sessionId = sugarLogin( $sugarSoap, $user, $password );
+    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
+
+    $request_array = array ('session' => $sessionId,'module_name' => $module,'name_value_list' => array (array ('name' => 'name','value' => $name
+    ),array ("name" => 'account_id',"value" => $account_id
+    ),array ('name' => 'amount','value' => $amount
+    ),array ('name' => 'date_closed','value' => $date_closed
+    ),array ('name' => 'sales_stage','value' => $sales_stage
+    )
+    )
+    );
+
+    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
+
+    switch ($resultType) {
+        case 'array':
+            $sugarEntries = objectToArray( $sugarEntriesO );
+            break;
+        case 'object':
+            $sugarEntries = $sugarEntries;
+            break;
+        default:
+            $sugarEntries = objectToArray( $sugarEntries );
+    }
+    return $sugarEntries;
+}
+
+/**
+ *
+ * @method
+ *
+ * Creates SugarCRM entries from the Leads module
+ *
+ * @name CreateSugarLeads
+ *
+ * @label Creates SugarCRM entries from the Leads module
+ *
+ * @param string | $sugarSoap | Sugar SOAP URL | http://www.example.com/sugar/soap.php?wsdl
+ * @param string | $user | User
+ * @param string | $password | Password
+ * @param string | $first_name | First Name
+ * @param string | $last_name | Last Name
+ * @param string | $email | Email
+ * @param string | $title | Title
+ * @param string | $phone | Phone Work
+ * @param string | $account_id | Valid id account
+ * @param string | $resultType=array | Result type (array or object)
+ *
+ * @return array/object | $sugarContact | Sugar Opportunities (array or object) |
+ *
+ */
+function CreateSugarLeads ($sugarSoap, $user, $password, $first_name, $last_name, $email, $title, $phone, $account_id, $resultType = "array")
+{
+
+    $module = "Leads";
+    $sessionId = sugarLogin( $sugarSoap, $user, $password );
+    $client = new SoapClient( $sugarSoap, getSoapClientOptions() );
+
+    $request_array = array ('session' => $sessionId,'module_name' => $module,array (array ("name" => 'first_name',"value" => $first_name
+    ),array ("name" => 'last_name',"value" => $last_name
+    ),array ("name" => 'email1',"value" => $email
+    ),array ("name" => 'title',"value" => $title
+    ),array ("name" => 'phone_work',"value" => $phone
+    ),
+    //   array("name" => 'account_id',"value" => '8cd10a60-101f-4363-1e0b-4cfd4106bd7e')
+    array ("name" => 'account_id',"value" => $account_id
+    )
+    )
+    );
+
+    $sugarEntriesO = $client->__SoapCall( 'set_entry', $request_array );
+
+    switch ($resultType) {
+        case 'array':
+            $sugarEntries = objectToArray( $sugarEntriesO );
+            break;
+        case 'object':
+            $sugarEntries = $sugarEntries;
+            break;
+        default:
+            $sugarEntries = objectToArray( $sugarEntries );
+    }
+    return $sugarEntries;
+}
+
diff --git a/workflow/engine/classes/triggers/class.pmTalendFunctions.php b/workflow/engine/classes/triggers/class.pmTalendFunctions.php
index c16bda6ae..340d9a1ed 100644
--- a/workflow/engine/classes/triggers/class.pmTalendFunctions.php
+++ b/workflow/engine/classes/triggers/class.pmTalendFunctions.php
@@ -47,7 +47,7 @@ function executeTalendWebservice ($wsdl, $message, $params = array())
     ) );
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
         curl_setopt( $client, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : '') );
         if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/classes/triggers/class.pmTrZimbra.php b/workflow/engine/classes/triggers/class.pmTrZimbra.php
index 29840efed..2873a5258 100644
--- a/workflow/engine/classes/triggers/class.pmTrZimbra.php
+++ b/workflow/engine/classes/triggers/class.pmTrZimbra.php
@@ -402,7 +402,7 @@ function uploadZimbraFile($ServerUrl, $username, $preAuthKey, $folderName, $file
     curl_setopt ($ch, CURLOPT_HTTPHEADER,$header_array);
 
     //Apply proxy settings
-    $sysConf = PMSystem::getSystemConfiguration();
+    $sysConf = PmSystem::getSystemConfiguration();
     if ($sysConf['proxy_host'] != '') {
         curl_setopt($ch, CURLOPT_PROXY, $sysConf['proxy_host'] . ($sysConf['proxy_port'] != '' ? ':' . $sysConf['proxy_port'] : ''));
         if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/controllers/admin.php b/workflow/engine/controllers/admin.php
index 4b5c183cd..f743e064a 100644
--- a/workflow/engine/controllers/admin.php
+++ b/workflow/engine/controllers/admin.php
@@ -1,346 +1,346 @@
-<?php
-
-/**
- * Admin controller
- *
- * @access public
- */
-class Admin extends Controller
-{
-    /**
-     * UX - User experience
-     */
-
-    public $debug = true;
-
-    public function system ()
-    {
-        global $RBAC;
-        $RBAC->requirePermissions( 'PM_SETUP' );
-        require_once PATH_CONTROLLERS . 'main.php';
-
-        $skinsList = PMSystem::getSkingList();
-        foreach ($skinsList['skins'] as $key => $value) {
-            if ($value['SKIN_WORKSPACE'] != 'Global') {
-                unset( $skinsList['skins'][$key] );
-            }
-        }
-        $skins = array ();
-        $mainController = new Main();
-        $languagesList = $mainController->getLanguagesList();
-        $languagesList[] = array ("", G::LoadTranslation("ID_USE_LANGUAGE_URL"));
-        $sysConf = PMSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
-
-        foreach ($skinsList['skins'] as $skin) {
-            $skins[] = array ($skin['SKIN_FOLDER_ID'],$skin['SKIN_NAME']);
-        }
-
-        $this->includeExtJS( 'admin/system' );
-
-        // $c = new Configurations();
-        // $configPage = $c->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
-        // $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
-        if (isset($sysConf["session.gc_maxlifetime"])) {
-            $sysConf["session_gc_maxlifetime"] = $sysConf["session.gc_maxlifetime"];
-        } else {
-            $sysConf["session_gc_maxlifetime"] = ini_get('session.gc_maxlifetime');
-        }
-
-        $this->setJSVar( 'skinsList', $skins );
-        $this->setJSVar( 'languagesList', $languagesList );
-        $this->setJSVar('timeZonesList', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers()));
-        $this->setJSVar( 'sysConf', $sysConf );
-
-        G::RenderPage( 'publish', 'extJs' );
-    }
-
-    public function uxList ()
-    {
-        global $RBAC;
-        $RBAC->requirePermissions( 'PM_SETUP' );
-        require_once PATH_CONTROLLERS . 'adminProxy.php';
-        $this->includeExtJS( 'admin/uxUsersList' );
-
-        $c = new Configurations();
-        $configPage = $c->getConfiguration( 'usersList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
-
-        $this->setJSVar( 'CONFIG', $Config );
-        $this->setJSVar( 'FORMATS', $c->getFormats() );
-        $this->setJSVar( 'uxTypes', AdminProxy::getUxTypesList( 'list' ) );
-
-        G::RenderPage( 'publish', 'extJs' );
-    }
-
-    /**
-     * CALENDAR
-     * getting default list
-     *
-     * @param string $httpData->PRO_UID (opional)
-     */
-    public function calendarEdit ($httpData)
-    {
-        global $RBAC;
-        //$RBAC->requirePermissions('PM_SETUP_ADVANCE');
-
-        $CalendarUid = str_replace( '"', '', isset( $_GET['id'] ) ? $_GET['id'] : G::GenerateUniqueID() );
-        $calendarObj = new Calendar();
-
-        if ((isset( $_GET['id'] )) && ($_GET['id'] != "")) {
-            $fields = $calendarObj->getCalendarInfoE( $CalendarUid );
-            $fields['OLD_NAME'] = $fields['CALENDAR_NAME'];
-        }
-        // For a new Calendar
-        if (! isset( $fields['CALENDAR_UID'] )) {
-            $fields['CALENDAR_UID'] = $CalendarUid;
-            $fields['OLD_NAME'] = '';
-
-            //Default Business Hour
-            $fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_DAY'] = 7;
-            $fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_START'] = "09:00";
-            $fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_END'] = "17:00";
-        }
-        // Copy Calendar
-        if ((isset( $_GET['cp'] )) && ($_GET['cp'] == 1)) {
-            $fields['CALENDAR_UID'] = G::GenerateUniqueID();
-            $fields['CALENDAR_NAME'] = G::LoadTranslation( "ID_COPY_OF" ) . " " . $fields['CALENDAR_NAME'];
-            $fields['OLD_NAME'] = $fields['CALENDAR_NAME'];
-        }
-
-        $c = new Configurations();
-        $configPage = $c->getConfiguration( 'additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
-
-        $this->includeExtJS( 'admin/calendarEdit' );
-        $this->setView( 'admin/calendarEdit' );
-        $businessDayArray = array ();
-
-        for ($i = 0; $i < sizeof( $fields['BUSINESS_DAY'] ); $i ++) {
-            $businessDayArray[$i] = $fields['BUSINESS_DAY'][$i + 1];
-        }
-
-        $fields['BUSINESS_DAY'] = $businessDayArray;
-        //validating if the calendar is new, it means that we don't have the $_GET array
-        $fields['HOLIDAY'] = (isset( $_GET['id'] ) && $_GET['id'] != '') ? $fields['HOLIDAY'] : array ();
-        $holidayArray = array ();
-        for ($i = 0; $i < sizeof( $fields['HOLIDAY'] ); $i ++) {
-            $holidayArray[$i] = $fields['HOLIDAY'][$i + 1];
-
-        }
-
-        $_GET['id'] = (isset( $_GET['id'] ) && $_GET['id'] != '') ? $_GET['id'] : '';
-        $fields['HOLIDAY'] = $holidayArray;
-        $fields['NEWCALENDAR'] = 'NO';
-        if (isset( $_GET['id'] ) && $_GET['id'] == '') {
-            $fields['CALENDAR_UID'] = G::GenerateUniqueID();
-            $fields['NEWCALENDAR'] = 'YES';
-        }
-        $this->setJSVar( 'CALENDAR_UID', $fields['CALENDAR_UID'] );
-        $this->setJSVar( 'fields', $fields );
-
-        G::RenderPage( 'publish', 'extJs' );
-    }
-
-    /**
-     * getting email configuration
-     * @autor Alvaro <alvaro@colosa.com>
-     */
-    public function emails ()
-    {
-        global $RBAC;
-
-        $RBAC->requirePermissions( 'PM_SETUP_ADVANCE' );
-        $this->includeExtJS( 'admin/emails' );
-        //render content
-        G::RenderPage( 'publish', 'extJs' );
-    }
-
-    /**
-     * getting default list
-     *
-     * @param string $httpData->PRO_UID (opional)
-     */
-    public function pmLogo ($httpData)
-    {
-        global $RBAC;
-        $RBAC->requirePermissions( 'PM_SETUP_ADVANCE', 'PM_SETUP_LOGO');
-
-        $c = new Configurations();
-        $configPage = $c->getConfiguration( 'additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
-        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
-
-        $this->includeExtJS( 'admin/pmLogo' );
-        $this->setView( 'admin/pmLogo' );
-
-        //assigning js variables
-        $this->setJSVar( 'FORMATS', $c->getFormats() );
-        $this->setJSVar( 'CONFIG', $Config );
-        $this->setJSVar( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
-
-        if (isset( $_SESSION['_cache_pmtables'] )) {
-            unset( $_SESSION['_cache_pmtables'] );
-        }
-
-        if (isset( $_SESSION['ADD_TAB_UID'] )) {
-            unset( $_SESSION['ADD_TAB_UID'] );
-        }
-        //render content
-        G::RenderPage( 'publish', 'extJs' );
-    }
-
-    public function maintenance()
-    {
-        $this->setView('admin/maintenance');
-        $this->render('extJs');
-    }
-
-    function getSystemInfo ()
-    {
-        $this->setResponseType( 'json' );
-        $infoList = $this->_getSystemInfo();
-        $data = array ();
-
-        foreach ($infoList as $row) {
-            $data[] = array ('label' => $row[0],'value' => $row[1],'section' => $row[2]
-            );
-        }
-        return $data;
-    }
-
-    private function _getSystemInfo ()
-    {
-
-        if (getenv( 'HTTP_CLIENT_IP' )) {
-            $ip = getenv( 'HTTP_CLIENT_IP' );
-        } else {
-            if (getenv( 'HTTP_X_FORWARDED_FOR' )) {
-                $ip = getenv( 'HTTP_X_FORWARDED_FOR' );
-            } else {
-                $ip = getenv( 'REMOTE_ADDR' );
-            }
-        }
-
-        $redhat = '';
-        if (file_exists( '/etc/redhat-release' )) {
-            $fnewsize = filesize( '/etc/redhat-release' );
-            $fp = fopen( '/etc/redhat-release', 'r' );
-            $redhat = trim( fread( $fp, $fnewsize ) );
-            fclose( $fp );
-        }
-
-        $redhat .= " (" . PHP_OS . ")";
-        if (defined( "DB_HOST" )) {
-            $dbNetView = new NET( DB_HOST );
-            $dbNetView->loginDbServer( DB_USER, DB_PASS );
-
-            $dbConns = new dbConnections( '' );
-            $availdb = '';
-            foreach ($dbConns->getDbServicesAvailables() as $key => $val) {
-                if ($availdb != '') {
-                    $availdb .= ', ';
-                }
-                $availdb .= $val['name'];
-            }
-
-            try {
-                $sMySQLVersion = $dbNetView->getDbServerVersion( DB_ADAPTER );
-            } catch (Exception $oException) {
-                $sMySQLVersion = '?????';
-            }
-        }
-
-
-        if (file_exists(PATH_HTML . "lib/versions")) {
-            $versions = json_decode(file_get_contents(PATH_HTML . "lib/versions"), true);
-            $pmuiVer = $versions["pmui_ver"];
-            $mafeVer = $versions["mafe_ver"];
-            $pmdynaformVer = $versions["pmdynaform_ver"];
-        } else {
-            $pmuiVer = $mafeVer = $pmdynaformVer = "(unknown)";
-        }
-
-        $sysSection = G::loadTranslation('ID_SYSTEM_INFO' );
-        $pmSection = G::LoadTranslation('ID_PROCESS_INFORMATION');
-
-        $properties = array ();
-        $ee = class_exists( 'pmLicenseManager' ) ? " - Enterprise Edition" : '';
-        $systemName = 'ProcessMaker';
-        if (defined('SYSTEM_NAME')) {
-            $systemName = SYSTEM_NAME;
-        }
-        $properties[] = array ($systemName. ' Ver.', PMSystem::getVersion() . $ee, $pmSection);
-        $properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
-        $properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
-        $properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);
-
-        if (file_exists(PATH_DATA. 'log/upgrades.log')) {
-            $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), '<a href="#" onclick="showUpgradedLogs(); return false;">' . G::LoadTranslation( 'ID_UPGRADE_VIEW_LOG') . '</a>' ,$pmSection);
-        } else {
-            $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), G::LoadTranslation( 'ID_UPGRADE_NEVER_UPGRADE') ,$pmSection);
-        }
-
-        $properties[] = array (G::LoadTranslation('ID_OPERATING_SYSTEM') ,$redhat,$sysSection
-        );
-        $properties[] = array (G::LoadTranslation('ID_TIME_ZONE') ,(defined( 'TIME_ZONE' )) ? TIME_ZONE : "Unknown",$sysSection
-        );
-        $properties[] = array (G::LoadTranslation('ID_WEB_SERVER') ,getenv( 'SERVER_SOFTWARE' ),$sysSection
-        );
-        $properties[] = array (G::LoadTranslation('ID_SERVER_NAME') ,getenv( 'SERVER_NAME' ),$pmSection
-        );
-        $properties[] = array (G::LoadTranslation('ID_SERVER_IP') ,$this->lookup( $ip ),$sysSection
-        );
-        $properties[] = array (G::LoadTranslation('ID_PHP_VERSION') ,phpversion(),$sysSection
-        );
-
-        if (defined( "DB_HOST" )) {
-            $properties[] = array (G::LoadTranslation('ID_DATABASE') ,$dbNetView->dbName( DB_ADAPTER ) . ' (Version ' . $sMySQLVersion . ')',$pmSection
-            );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,DB_HOST,$pmSection
-            );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,DB_NAME,$pmSection
-            );
-            $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,$availdb,$sysSection
-            );
-        } else {
-            $properties[] = array (G::LoadTranslation('ID_DATABASE') ,"Not defined",$pmSection
-            );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,"Not defined",$pmSection
-            );
-            $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,"Not defined",$pmSection
-            );
-            $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,"Not defined",$sysSection
-            );
-        }
-
-        $properties[] = array ( G::LoadTranslation('ID_WORKSPACE') ,defined( "SYS_SYS" ) ? SYS_SYS : "Not defined",$pmSection
-        );
-
-        $properties[] = array ( G::LoadTranslation('ID_SERVER_PROTOCOL') ,getenv( 'SERVER_PROTOCOL' ),$sysSection
-        );
-        $properties[] = array ( G::LoadTranslation('ID_SERVER_PORT') ,getenv( 'SERVER_PORT' ),$sysSection
-        );
-        //$sysSection[] = array('Remote Host', getenv ('REMOTE_HOST'), $sysSection);
-        $properties[] = array ( G::LoadTranslation('ID_SERVER_NAME') , getenv( 'SERVER_ADDR' ),$sysSection
-        );
-        $properties[] = array ( G::LoadTranslation('ID_USER_BROWSER') , getenv( 'HTTP_USER_AGENT' ),$sysSection
-        );
-
-        return $properties;
-    }
-
-    private function lookup ($target)
-    {
-        global $ntarget;
-        $msg = $target . ' => ';
-        //if (eregi ('[a-zA-Z]', $target))
-        if (preg_match( '[a-zA-Z]', $target )) {
-            //Made compatible to PHP 5.3
-            $ntarget = gethostbyname( $target );
-        } else {
-            $ntarget = gethostbyaddr( $target );
-        }
-        $msg .= $ntarget;
-        return ($msg);
-    }
-}
-
+<?php
+
+/**
+ * Admin controller
+ *
+ * @access public
+ */
+class Admin extends Controller
+{
+    /**
+     * UX - User experience
+     */
+
+    public $debug = true;
+
+    public function system ()
+    {
+        global $RBAC;
+        $RBAC->requirePermissions( 'PM_SETUP' );
+        require_once PATH_CONTROLLERS . 'main.php';
+
+        $skinsList = PmSystem::getSkingList();
+        foreach ($skinsList['skins'] as $key => $value) {
+            if ($value['SKIN_WORKSPACE'] != 'Global') {
+                unset( $skinsList['skins'][$key] );
+            }
+        }
+        $skins = array ();
+        $mainController = new Main();
+        $languagesList = $mainController->getLanguagesList();
+        $languagesList[] = array ("", G::LoadTranslation("ID_USE_LANGUAGE_URL"));
+        $sysConf = PmSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
+
+        foreach ($skinsList['skins'] as $skin) {
+            $skins[] = array ($skin['SKIN_FOLDER_ID'],$skin['SKIN_NAME']);
+        }
+
+        $this->includeExtJS( 'admin/system' );
+
+        // $c = new Configurations();
+        // $configPage = $c->getConfiguration('usersList', 'pageSize','',$_SESSION['USER_LOGGED']);
+        // $Config['pageSize'] = isset($configPage['pageSize']) ? $configPage['pageSize'] : 20;
+        if (isset($sysConf["session.gc_maxlifetime"])) {
+            $sysConf["session_gc_maxlifetime"] = $sysConf["session.gc_maxlifetime"];
+        } else {
+            $sysConf["session_gc_maxlifetime"] = ini_get('session.gc_maxlifetime');
+        }
+
+        $this->setJSVar( 'skinsList', $skins );
+        $this->setJSVar( 'languagesList', $languagesList );
+        $this->setJSVar('timeZonesList', array_map(function ($value) { return [$value, $value]; }, DateTimeZone::listIdentifiers()));
+        $this->setJSVar( 'sysConf', $sysConf );
+
+        G::RenderPage( 'publish', 'extJs' );
+    }
+
+    public function uxList ()
+    {
+        global $RBAC;
+        $RBAC->requirePermissions( 'PM_SETUP' );
+        require_once PATH_CONTROLLERS . 'adminProxy.php';
+        $this->includeExtJS( 'admin/uxUsersList' );
+
+        $c = new Configurations();
+        $configPage = $c->getConfiguration( 'usersList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+
+        $this->setJSVar( 'CONFIG', $Config );
+        $this->setJSVar( 'FORMATS', $c->getFormats() );
+        $this->setJSVar( 'uxTypes', AdminProxy::getUxTypesList( 'list' ) );
+
+        G::RenderPage( 'publish', 'extJs' );
+    }
+
+    /**
+     * CALENDAR
+     * getting default list
+     *
+     * @param string $httpData->PRO_UID (opional)
+     */
+    public function calendarEdit ($httpData)
+    {
+        global $RBAC;
+        //$RBAC->requirePermissions('PM_SETUP_ADVANCE');
+
+        $CalendarUid = str_replace( '"', '', isset( $_GET['id'] ) ? $_GET['id'] : G::GenerateUniqueID() );
+        $calendarObj = new Calendar();
+
+        if ((isset( $_GET['id'] )) && ($_GET['id'] != "")) {
+            $fields = $calendarObj->getCalendarInfoE( $CalendarUid );
+            $fields['OLD_NAME'] = $fields['CALENDAR_NAME'];
+        }
+        // For a new Calendar
+        if (! isset( $fields['CALENDAR_UID'] )) {
+            $fields['CALENDAR_UID'] = $CalendarUid;
+            $fields['OLD_NAME'] = '';
+
+            //Default Business Hour
+            $fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_DAY'] = 7;
+            $fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_START'] = "09:00";
+            $fields['BUSINESS_DAY'][1]['CALENDAR_BUSINESS_END'] = "17:00";
+        }
+        // Copy Calendar
+        if ((isset( $_GET['cp'] )) && ($_GET['cp'] == 1)) {
+            $fields['CALENDAR_UID'] = G::GenerateUniqueID();
+            $fields['CALENDAR_NAME'] = G::LoadTranslation( "ID_COPY_OF" ) . " " . $fields['CALENDAR_NAME'];
+            $fields['OLD_NAME'] = $fields['CALENDAR_NAME'];
+        }
+
+        $c = new Configurations();
+        $configPage = $c->getConfiguration( 'additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+
+        $this->includeExtJS( 'admin/calendarEdit' );
+        $this->setView( 'admin/calendarEdit' );
+        $businessDayArray = array ();
+
+        for ($i = 0; $i < sizeof( $fields['BUSINESS_DAY'] ); $i ++) {
+            $businessDayArray[$i] = $fields['BUSINESS_DAY'][$i + 1];
+        }
+
+        $fields['BUSINESS_DAY'] = $businessDayArray;
+        //validating if the calendar is new, it means that we don't have the $_GET array
+        $fields['HOLIDAY'] = (isset( $_GET['id'] ) && $_GET['id'] != '') ? $fields['HOLIDAY'] : array ();
+        $holidayArray = array ();
+        for ($i = 0; $i < sizeof( $fields['HOLIDAY'] ); $i ++) {
+            $holidayArray[$i] = $fields['HOLIDAY'][$i + 1];
+
+        }
+
+        $_GET['id'] = (isset( $_GET['id'] ) && $_GET['id'] != '') ? $_GET['id'] : '';
+        $fields['HOLIDAY'] = $holidayArray;
+        $fields['NEWCALENDAR'] = 'NO';
+        if (isset( $_GET['id'] ) && $_GET['id'] == '') {
+            $fields['CALENDAR_UID'] = G::GenerateUniqueID();
+            $fields['NEWCALENDAR'] = 'YES';
+        }
+        $this->setJSVar( 'CALENDAR_UID', $fields['CALENDAR_UID'] );
+        $this->setJSVar( 'fields', $fields );
+
+        G::RenderPage( 'publish', 'extJs' );
+    }
+
+    /**
+     * getting email configuration
+     * @autor Alvaro <alvaro@colosa.com>
+     */
+    public function emails ()
+    {
+        global $RBAC;
+
+        $RBAC->requirePermissions( 'PM_SETUP_ADVANCE' );
+        $this->includeExtJS( 'admin/emails' );
+        //render content
+        G::RenderPage( 'publish', 'extJs' );
+    }
+
+    /**
+     * getting default list
+     *
+     * @param string $httpData->PRO_UID (opional)
+     */
+    public function pmLogo ($httpData)
+    {
+        global $RBAC;
+        $RBAC->requirePermissions( 'PM_SETUP_ADVANCE', 'PM_SETUP_LOGO');
+
+        $c = new Configurations();
+        $configPage = $c->getConfiguration( 'additionalTablesList', 'pageSize', '', $_SESSION['USER_LOGGED'] );
+        $Config['pageSize'] = isset( $configPage['pageSize'] ) ? $configPage['pageSize'] : 20;
+
+        $this->includeExtJS( 'admin/pmLogo' );
+        $this->setView( 'admin/pmLogo' );
+
+        //assigning js variables
+        $this->setJSVar( 'FORMATS', $c->getFormats() );
+        $this->setJSVar( 'CONFIG', $Config );
+        $this->setJSVar( 'PRO_UID', isset( $_GET['PRO_UID'] ) ? $_GET['PRO_UID'] : false );
+
+        if (isset( $_SESSION['_cache_pmtables'] )) {
+            unset( $_SESSION['_cache_pmtables'] );
+        }
+
+        if (isset( $_SESSION['ADD_TAB_UID'] )) {
+            unset( $_SESSION['ADD_TAB_UID'] );
+        }
+        //render content
+        G::RenderPage( 'publish', 'extJs' );
+    }
+
+    public function maintenance()
+    {
+        $this->setView('admin/maintenance');
+        $this->render('extJs');
+    }
+
+    function getSystemInfo ()
+    {
+        $this->setResponseType( 'json' );
+        $infoList = $this->_getSystemInfo();
+        $data = array ();
+
+        foreach ($infoList as $row) {
+            $data[] = array ('label' => $row[0],'value' => $row[1],'section' => $row[2]
+            );
+        }
+        return $data;
+    }
+
+    private function _getSystemInfo ()
+    {
+
+        if (getenv( 'HTTP_CLIENT_IP' )) {
+            $ip = getenv( 'HTTP_CLIENT_IP' );
+        } else {
+            if (getenv( 'HTTP_X_FORWARDED_FOR' )) {
+                $ip = getenv( 'HTTP_X_FORWARDED_FOR' );
+            } else {
+                $ip = getenv( 'REMOTE_ADDR' );
+            }
+        }
+
+        $redhat = '';
+        if (file_exists( '/etc/redhat-release' )) {
+            $fnewsize = filesize( '/etc/redhat-release' );
+            $fp = fopen( '/etc/redhat-release', 'r' );
+            $redhat = trim( fread( $fp, $fnewsize ) );
+            fclose( $fp );
+        }
+
+        $redhat .= " (" . PHP_OS . ")";
+        if (defined( "DB_HOST" )) {
+            $dbNetView = new NET( DB_HOST );
+            $dbNetView->loginDbServer( DB_USER, DB_PASS );
+
+            $dbConns = new dbConnections( '' );
+            $availdb = '';
+            foreach ($dbConns->getDbServicesAvailables() as $key => $val) {
+                if ($availdb != '') {
+                    $availdb .= ', ';
+                }
+                $availdb .= $val['name'];
+            }
+
+            try {
+                $sMySQLVersion = $dbNetView->getDbServerVersion( DB_ADAPTER );
+            } catch (Exception $oException) {
+                $sMySQLVersion = '?????';
+            }
+        }
+
+
+        if (file_exists(PATH_HTML . "lib/versions")) {
+            $versions = json_decode(file_get_contents(PATH_HTML . "lib/versions"), true);
+            $pmuiVer = $versions["pmui_ver"];
+            $mafeVer = $versions["mafe_ver"];
+            $pmdynaformVer = $versions["pmdynaform_ver"];
+        } else {
+            $pmuiVer = $mafeVer = $pmdynaformVer = "(unknown)";
+        }
+
+        $sysSection = G::loadTranslation('ID_SYSTEM_INFO' );
+        $pmSection = G::LoadTranslation('ID_PROCESS_INFORMATION');
+
+        $properties = array ();
+        $ee = class_exists( 'pmLicenseManager' ) ? " - Enterprise Edition" : '';
+        $systemName = 'ProcessMaker';
+        if (defined('SYSTEM_NAME')) {
+            $systemName = SYSTEM_NAME;
+        }
+        $properties[] = array ($systemName. ' Ver.', PmSystem::getVersion() . $ee, $pmSection);
+        $properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
+        $properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
+        $properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);
+
+        if (file_exists(PATH_DATA. 'log/upgrades.log')) {
+            $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), '<a href="#" onclick="showUpgradedLogs(); return false;">' . G::LoadTranslation( 'ID_UPGRADE_VIEW_LOG') . '</a>' ,$pmSection);
+        } else {
+            $properties[] = array (G::LoadTranslation('ID_UPGRADES_PATCHES'), G::LoadTranslation( 'ID_UPGRADE_NEVER_UPGRADE') ,$pmSection);
+        }
+
+        $properties[] = array (G::LoadTranslation('ID_OPERATING_SYSTEM') ,$redhat,$sysSection
+        );
+        $properties[] = array (G::LoadTranslation('ID_TIME_ZONE') ,(defined( 'TIME_ZONE' )) ? TIME_ZONE : "Unknown",$sysSection
+        );
+        $properties[] = array (G::LoadTranslation('ID_WEB_SERVER') ,getenv( 'SERVER_SOFTWARE' ),$sysSection
+        );
+        $properties[] = array (G::LoadTranslation('ID_SERVER_NAME') ,getenv( 'SERVER_NAME' ),$pmSection
+        );
+        $properties[] = array (G::LoadTranslation('ID_SERVER_IP') ,$this->lookup( $ip ),$sysSection
+        );
+        $properties[] = array (G::LoadTranslation('ID_PHP_VERSION') ,phpversion(),$sysSection
+        );
+
+        if (defined( "DB_HOST" )) {
+            $properties[] = array (G::LoadTranslation('ID_DATABASE') ,$dbNetView->dbName( DB_ADAPTER ) . ' (Version ' . $sMySQLVersion . ')',$pmSection
+            );
+            $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,DB_HOST,$pmSection
+            );
+            $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,DB_NAME,$pmSection
+            );
+            $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,$availdb,$sysSection
+            );
+        } else {
+            $properties[] = array (G::LoadTranslation('ID_DATABASE') ,"Not defined",$pmSection
+            );
+            $properties[] = array (G::LoadTranslation('ID_DATABASE_SERVER') ,"Not defined",$pmSection
+            );
+            $properties[] = array (G::LoadTranslation('ID_DATABASE_NAME') ,"Not defined",$pmSection
+            );
+            $properties[] = array (G::LoadTranslation('ID_AVAILABLE_DB') ,"Not defined",$sysSection
+            );
+        }
+
+        $properties[] = array ( G::LoadTranslation('ID_WORKSPACE') ,defined( "SYS_SYS" ) ? SYS_SYS : "Not defined",$pmSection
+        );
+
+        $properties[] = array ( G::LoadTranslation('ID_SERVER_PROTOCOL') ,getenv( 'SERVER_PROTOCOL' ),$sysSection
+        );
+        $properties[] = array ( G::LoadTranslation('ID_SERVER_PORT') ,getenv( 'SERVER_PORT' ),$sysSection
+        );
+        //$sysSection[] = array('Remote Host', getenv ('REMOTE_HOST'), $sysSection);
+        $properties[] = array ( G::LoadTranslation('ID_SERVER_NAME') , getenv( 'SERVER_ADDR' ),$sysSection
+        );
+        $properties[] = array ( G::LoadTranslation('ID_USER_BROWSER') , getenv( 'HTTP_USER_AGENT' ),$sysSection
+        );
+
+        return $properties;
+    }
+
+    private function lookup ($target)
+    {
+        global $ntarget;
+        $msg = $target . ' => ';
+        //if (eregi ('[a-zA-Z]', $target))
+        if (preg_match( '[a-zA-Z]', $target )) {
+            //Made compatible to PHP 5.3
+            $ntarget = gethostbyname( $target );
+        } else {
+            $ntarget = gethostbyaddr( $target );
+        }
+        $msg .= $ntarget;
+        return ($msg);
+    }
+}
+
diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php
index 84ff45b26..80744824e 100644
--- a/workflow/engine/controllers/adminProxy.php
+++ b/workflow/engine/controllers/adminProxy.php
@@ -38,7 +38,7 @@ class adminProxy extends HttpProxyController
         $updateRedirector = false;
         $restart = false;
         self::validateDataSystemConf($httpData, $envFile);
-        $sysConf = PMSystem::getSystemConfiguration($envFile);
+        $sysConf = PmSystem::getSystemConfiguration($envFile);
         $updatedConf = array();
 
         if ($sysConf['default_lang'] != $httpData->default_lang) {
@@ -96,7 +96,7 @@ class adminProxy extends HttpProxyController
                 }
             }
 
-            PMSystem::updateIndexFile(array(
+            PmSystem::updateIndexFile(array(
               'lang' => $sysConf['default_lang'],
               'skin' => $sysConf['default_skin']
             ));
@@ -611,7 +611,7 @@ class adminProxy extends HttpProxyController
         $sBodyPre->prepare();
         $sBodyPre->assign('server', $_SERVER['SERVER_NAME']);
         $sBodyPre->assign('date', date('H:i:s'));
-        $sBodyPre->assign('ver', PMSystem::getVersion());
+        $sBodyPre->assign('ver', PmSystem::getVersion());
         $sBodyPre->assign('engine', $engine);
         $sBodyPre->assign('msg', $msg);
         $sBody = $sBodyPre->getOutputContent();
@@ -1415,7 +1415,7 @@ class adminProxy extends HttpProxyController
         $params['lt'] = isset($licInfo[SYS_SYS]) ? isset($licInfo[SYS_SYS]['TYPE'])? $licInfo[SYS_SYS]['TYPE'] : ''  : '';
 
         //ProcessMaker Version
-        $params['v'] = PMSystem::getVersion();
+        $params['v'] = PmSystem::getVersion();
         if (file_exists(PATH_DATA. 'log/upgrades.log')) {
             $params['pmu'] = serialize(file_get_contents(PATH_DATA. 'log/upgrades.log', 'r'));
         } else {
@@ -1505,7 +1505,7 @@ class adminProxy extends HttpProxyController
 
         //Country/city (Timezone)
         $params['t'] = (defined('TIME_ZONE') && TIME_ZONE != "Unknown") ? TIME_ZONE : date_default_timezone_get();
-        $params['w'] = count(PMSystem::listWorkspaces());
+        $params['w'] = count(PmSystem::listWorkspaces());
 
         $support = PATH_DATA_SITE . G::sanitizeString($licenseManager->info['FIRST_NAME'] . '-' . $licenseManager->info['LAST_NAME'] . '-' . SYS_SYS . '-' . date('YmdHis'), false, false) . '.spm';
         file_put_contents($support, serialize($params));
diff --git a/workflow/engine/controllers/designer.php b/workflow/engine/controllers/designer.php
index ae84a111b..089582cdc 100644
--- a/workflow/engine/controllers/designer.php
+++ b/workflow/engine/controllers/designer.php
@@ -98,7 +98,7 @@ class Designer extends Controller
         $this->setVar("SYS_SYS", SYS_SYS);
         $this->setVar("SYS_LANG", SYS_LANG);
         $this->setVar("SYS_SKIN", SYS_SKIN);
-        $this->setVar('HTTP_SERVER_HOSTNAME', PMSystem::getHttpServerHostnameRequestsFrontEnd());
+        $this->setVar('HTTP_SERVER_HOSTNAME', PmSystem::getHttpServerHostnameRequestsFrontEnd());
 
         if ($debug) {
             if (! file_exists(PATH_HTML . "lib-dev/pmUI/build.cache")) {
diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php
index 213fab502..4ac15c7fd 100644
--- a/workflow/engine/controllers/home.php
+++ b/workflow/engine/controllers/home.php
@@ -102,7 +102,7 @@ class Home extends Controller
         $userProperty = new UsersProperties();
         $process = new Process();
         $case = new Cases();
-        $sysConf = PMSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
+        $sysConf = PmSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
 
         //Get ProcessStatistics Info
         $start = 0;
@@ -186,7 +186,7 @@ class Home extends Controller
 
         $solrEnabled = false;
 
-        if (($solrConf = PMSystem::solrEnv()) !== false) {
+        if (($solrConf = PmSystem::solrEnv()) !== false) {
 
             $ApplicationSolrIndex = new AppSolr(
                 $solrConf["solr_enabled"],
@@ -411,7 +411,7 @@ class Home extends Controller
             $type == "todo" || $type == "draft" || $type == "paused" || $type == "sent" ||
             $type == "selfservice" || $type == "unassigned" || $type == "search"
         ) &&
-        (($solrConf = PMSystem::solrEnv()) !== false)
+        (($solrConf = PmSystem::solrEnv()) !== false)
         ) {
 
             $ApplicationSolrIndex = new AppSolr(
diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php
index 6a91ad4a7..fa3a896d1 100644
--- a/workflow/engine/controllers/installer.php
+++ b/workflow/engine/controllers/installer.php
@@ -931,7 +931,7 @@ class Installer extends Controller
             $envFile = PATH_CONFIG . 'env.ini';
 
             // getting configuration from env.ini
-            $sysConf = PMSystem::getSystemConfiguration( $envFile );
+            $sysConf = PmSystem::getSystemConfiguration( $envFile );
 
             $langUri = 'en';
             if (isset($sysConf['default_lang'])) {
@@ -987,7 +987,7 @@ class Installer extends Controller
 
                 try {
                     // update the main index file
-                    $indexFileUpdated = PMSystem::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));
+                    $indexFileUpdated = PmSystem::updateIndexFile(array('lang' => 'en','skin' => $updatedConf['default_skin']));
                 } catch (Exception $e) {
                     $info->result = false;
                     $info->message = G::LoadTranslation('ID_PROCESSMAKER_WRITE_CONFIG_INDEX', SYS_LANG, Array(PATH_HTML . "index.html."));
diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php
index 4e5069264..82baf7927 100644
--- a/workflow/engine/controllers/main.php
+++ b/workflow/engine/controllers/main.php
@@ -262,7 +262,7 @@ class Main extends Controller
         }
 
         $this->setVar( 'logo_company', $this->getCompanyLogo() );
-        $this->setVar( 'pmos_version', PMSystem::getVersion() );
+        $this->setVar( 'pmos_version', PmSystem::getVersion() );
 
         $footerText = 'Copyright &copy; 2003-' . date( 'Y' ) . ' Colosa, Inc. All rights reserved.';
         $adviseText = 'Supplied free of charge with no support, certification, warranty,
@@ -312,7 +312,7 @@ class Main extends Controller
         $this->includeExtJS( 'main/sysLogin' );
 
         $this->setVar( 'logo_company', $this->getCompanyLogo() );
-        $this->setVar( 'pmos_version', PMSystem::getVersion() );
+        $this->setVar( 'pmos_version', PmSystem::getVersion() );
 
         $footerText = G::LoadTranslation('ID_COPYRIGHT_FROM') . date( 'Y' ) . G::LoadTranslation('ID_COPYRIGHT_COL');
         $adviseText = G::LoadTranslation('ID_COLOSA_AND_CERTIFIED_PARTNERS');
@@ -382,7 +382,7 @@ class Main extends Controller
             $template->assign( 'passwd', $newPass );
             $template->assign( 'poweredBy', G::loadTranslation( 'ID_PROCESSMAKER_SLOGAN1' ) );
             $template->assign( 'versionLabel', G::loadTranslation( 'ID_VERSION' ) );
-            $template->assign( 'version', PMSystem::getVersion() );
+            $template->assign( 'version', PmSystem::getVersion() );
             $template->assign( 'visit', G::loadTranslation( 'ID_VISIT' ) );
 
             $template->assign( 'footer', '' );
@@ -731,7 +731,7 @@ class Main extends Controller
         if (defined('SYSTEM_NAME')) {
             $systemName = SYSTEM_NAME;
         }
-        $properties[] = array ($systemName. ' Ver.', PMSystem::getVersion() . $ee, $pmSection);
+        $properties[] = array ($systemName. ' Ver.', PmSystem::getVersion() . $ee, $pmSection);
         $properties[] = array("PMUI JS Lib. Ver.", $pmuiVer, $pmSection);
         $properties[] = array("MAFE JS Lib. Ver.", $mafeVer, $pmSection);
         $properties[] = array("PM Dynaform JS Lib. Ver.", $pmdynaformVer, $pmSection);
diff --git a/workflow/engine/controllers/pmTablesProxy.php b/workflow/engine/controllers/pmTablesProxy.php
index c7bd3f81c..bd60e06c9 100644
--- a/workflow/engine/controllers/pmTablesProxy.php
+++ b/workflow/engine/controllers/pmTablesProxy.php
@@ -940,7 +940,7 @@ class pmTablesProxy extends HttpProxyController
             $result = new stdClass();
             $net = new NET( G::getIpAddress() );
 
-            $META = " \n-----== ProcessMaker Open Source Private Tables ==-----\n" . " @Ver: 1.0 Oct-2009\n" . " @Processmaker version: " . PMSystem::getVersion() . "\n" . " -------------------------------------------------------\n" . " @Export Date: " . date( "l jS \of F Y h:i:s A" ) . "\n" . " @Server address: " . getenv( 'SERVER_NAME' ) . " (" . getenv( 'SERVER_ADDR' ) . ")\n" . " @Client address: " . $net->hostname . "\n" . " @Workspace: " . SYS_SYS . "\n" . " @Export trace back:\n\n";
+            $META = " \n-----== ProcessMaker Open Source Private Tables ==-----\n" . " @Ver: 1.0 Oct-2009\n" . " @Processmaker version: " . PmSystem::getVersion() . "\n" . " -------------------------------------------------------\n" . " @Export Date: " . date( "l jS \of F Y h:i:s A" ) . "\n" . " @Server address: " . getenv( 'SERVER_NAME' ) . " (" . getenv( 'SERVER_ADDR' ) . ")\n" . " @Client address: " . $net->hostname . "\n" . " @Workspace: " . SYS_SYS . "\n" . " @Export trace back:\n\n";
 
             $EXPORT_TRACEBACK = Array ();
             $c = 0;
diff --git a/workflow/engine/controllers/strategicDashboard.php b/workflow/engine/controllers/strategicDashboard.php
index 19ffee75e..64c0d0810 100644
--- a/workflow/engine/controllers/strategicDashboard.php
+++ b/workflow/engine/controllers/strategicDashboard.php
@@ -31,7 +31,7 @@ class StrategicDashboard extends Controller
         $user = new Users();
         $user = $user->load($RBAC->aUserInfo['USER_INFO']['USR_UID']);
         $this->usrUnitCost = $this->currencySymbolToShow($user);
-        $this->urlProxy = PMSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/';
+        $this->urlProxy = PmSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/';
         //change
         $clientId = 'x-pm-local-client';
         $client = $this->getClientCredentials($clientId);
diff --git a/workflow/engine/controllers/webEntryProxy.php b/workflow/engine/controllers/webEntryProxy.php
index 9515607ee..d40f7d29f 100644
--- a/workflow/engine/controllers/webEntryProxy.php
+++ b/workflow/engine/controllers/webEntryProxy.php
@@ -183,7 +183,7 @@ class webEntryProxy extends HttpProxyController
         $template->assign( 'dynaform', $dynTitle );
         $template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
         $template->assign( 'ws', SYS_SYS );
-        $template->assign( 'version', PMSystem::getVersion() );
+        $template->assign( 'version', PmSystem::getVersion() );
 
         $fileName = $pathProcess . $dynTitle . 'Post.php';
         file_put_contents( $fileName, $template->getOutputContent() );
diff --git a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
index 6c54c094c..32d71be76 100644
--- a/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
+++ b/workflow/engine/methods/cases/caseMessageHistory_Ajax.php
@@ -192,7 +192,7 @@ if ($actionAjax == 'sendMailMessage_JXP') {
         $oCase = new Cases();
         $data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] );
 
-        $aSetup = PMSystem::getEmailConfiguration();
+        $aSetup = PmSystem::getEmailConfiguration();
 
         $oSpool = new spoolRun();
 
diff --git a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
index f02fadbb6..5ea1dbfc0 100644
--- a/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
+++ b/workflow/engine/methods/cases/casesConsolidatedListExtJs.php
@@ -69,7 +69,7 @@ while ($rsSql->next()) {
 }
 
 if (count($arrayTabItem) > 0) {
-    $urlProxy = PMSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
+    $urlProxy = PmSystem::getHttpServerHostnameRequestsFrontEnd() . '/api/1.0/' . SYS_SYS . '/consolidated/';
     $clientId = 'x-pm-local-client';
     $client = getClientCredentials($clientId);
     $authCode = getAuthorizationCode($client);
diff --git a/workflow/engine/methods/cases/casesListExtJs.php b/workflow/engine/methods/cases/casesListExtJs.php
index e69255edf..ae8cfc4eb 100644
--- a/workflow/engine/methods/cases/casesListExtJs.php
+++ b/workflow/engine/methods/cases/casesListExtJs.php
@@ -118,7 +118,7 @@ $oAppCache->confCasesList = $confCasesList;
 $solrEnabled = 0;
 if ($action == "todo" || $action == "draft" || $action == "sent" || $action == "selfservice" ||
     $action == "unassigned" || $action == "search") {
-    $solrConfigured = ($solrConf = PMSystem::solrEnv()) !== false ? 1 : 0;
+    $solrConfigured = ($solrConf = PmSystem::solrEnv()) !== false ? 1 : 0;
     if ($solrConfigured == 1) {
         $applicationSolrIndex = new AppSolr(
             $solrConf['solr_enabled'],
diff --git a/workflow/engine/methods/cases/cases_Ajax.php b/workflow/engine/methods/cases/cases_Ajax.php
index c4c01dc84..53aa3e7e6 100644
--- a/workflow/engine/methods/cases/cases_Ajax.php
+++ b/workflow/engine/methods/cases/cases_Ajax.php
@@ -785,7 +785,7 @@ switch (($_POST['action']) ? $_POST['action'] : $_REQUEST['action']) {
         $data = $oCase->getHistoryMessagesTrackerView( $_POST['APP_UID'], $_POST['APP_MSG_UID'] );
         //print_r($data);
 
-        $aSetup = PMSystem::getEmailConfiguration();
+        $aSetup = PmSystem::getEmailConfiguration();
 
         $passwd = $aSetup['MESS_PASSWORD'];
         $passwdDec = G::decrypt( $passwd, 'EMAILENCRYPT' );
diff --git a/workflow/engine/methods/enterprise/addonsStore.php b/workflow/engine/methods/enterprise/addonsStore.php
index ee90e834e..c38805234 100644
--- a/workflow/engine/methods/enterprise/addonsStore.php
+++ b/workflow/engine/methods/enterprise/addonsStore.php
@@ -64,7 +64,7 @@ $oHeadPublisher->assign("SUPPORT_FLAG", ((isset($licenseManager->supportStartDat
 $oHeadPublisher->assign("supportStartDate", (isset($licenseManager->supportStartDate))? $licenseManager->supportStartDate : '');
 $oHeadPublisher->assign("supportEndDate", (isset($licenseManager->supportEndDate))? $licenseManager->supportEndDate : '');
 
-$oHeadPublisher->assign("PROCESSMAKER_VERSION", PMSystem::getVersion());
+$oHeadPublisher->assign("PROCESSMAKER_VERSION", PmSystem::getVersion());
 $oHeadPublisher->assign("PROCESSMAKER_URL", "/sys" . SYS_SYS . "/" . SYS_LANG . "/" . SYS_SKIN );
 $oHeadPublisher->assign("SYS_SKIN", SYS_SKIN);
 $oHeadPublisher->assign("URL_PART_LOGIN", ((substr(SYS_SKIN, 0, 2) == "ux" && SYS_SKIN != "uxs")? "main/login" : "login/login"));
diff --git a/workflow/engine/methods/enterprise/addonsStoreAction.php b/workflow/engine/methods/enterprise/addonsStoreAction.php
index f4535ef2b..11697c771 100644
--- a/workflow/engine/methods/enterprise/addonsStoreAction.php
+++ b/workflow/engine/methods/enterprise/addonsStoreAction.php
@@ -285,7 +285,7 @@ try {
                 );
 
                 // Proxy settings
-                $sysConf = PMSystem::getSystemConfiguration();
+                $sysConf = PmSystem::getSystemConfiguration();
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
                         $option['http'] = array();
diff --git a/workflow/engine/methods/enterprise/enterprise.php b/workflow/engine/methods/enterprise/enterprise.php
index c7d2f3b58..e859b3a9f 100644
--- a/workflow/engine/methods/enterprise/enterprise.php
+++ b/workflow/engine/methods/enterprise/enterprise.php
@@ -16,7 +16,7 @@ class enterprisePlugin extends PMPlugin
     {
         $pathPluginTrunk = PATH_CORE . "enterprise";
 
-        $VERSION = PMSystem::getVersion();
+        $VERSION = PmSystem::getVersion();
 
         $res = parent::PMPlugin($sNamespace, $sFilename);
         $this->sFriendlyName = "ProcessMaker Enterprise Core Edition";
diff --git a/workflow/engine/methods/enterprise/processMakerAjax.php b/workflow/engine/methods/enterprise/processMakerAjax.php
index d5849c70c..d5fb82be9 100644
--- a/workflow/engine/methods/enterprise/processMakerAjax.php
+++ b/workflow/engine/methods/enterprise/processMakerAjax.php
@@ -43,7 +43,7 @@ function install($file)
         );
 
         // Proxy settings
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if (isset($sysConf['proxy_host'])) {
             if ($sysConf['proxy_host'] != '') {
                 if (!is_array($option['http'])) {
@@ -150,7 +150,7 @@ switch ($option) {
             );
 
             // Proxy settings
-            $sysConf = PMSystem::getSystemConfiguration();
+            $sysConf = PmSystem::getSystemConfiguration();
             if (isset($sysConf['proxy_host'])) {
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
@@ -319,7 +319,7 @@ switch ($option) {
             );
 
             // Proxy settings
-            $sysConf = PMSystem::getSystemConfiguration();
+            $sysConf = PmSystem::getSystemConfiguration();
             if (isset($sysConf['proxy_host'])) {
                 if ($sysConf['proxy_host'] != '') {
                     if (!is_array($option['http'])) {
diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index fd3759c21..ed7e32196 100644
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -245,7 +245,7 @@ try {
         $userTimeZone = $user->getUsrTimeZone();
 
         if (trim($userTimeZone) == '') {
-            $arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
+            $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
             $userTimeZone = $arraySystemConfiguration['time_zone'];
         }
@@ -419,7 +419,7 @@ try {
         die;
     }
 
-    $configS = PMSystem::getSystemConfiguration('', '', SYS_SYS);
+    $configS = PmSystem::getSystemConfiguration('', '', SYS_SYS);
     $activeSession = isset($configS['session_block']) ? !(int)$configS['session_block']:true;
     if ($activeSession){
         setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');
diff --git a/workflow/engine/methods/login/authenticationSso.php b/workflow/engine/methods/login/authenticationSso.php
index 8605f1eaa..758b2258d 100644
--- a/workflow/engine/methods/login/authenticationSso.php
+++ b/workflow/engine/methods/login/authenticationSso.php
@@ -38,7 +38,7 @@ try {
     }
     /*----------------------------------********---------------------------------*/
 
-    $arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
+    $arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
     //Set User Time Zone
     $user = UsersPeer::retrieveByPK($userUid);
diff --git a/workflow/engine/methods/login/login.php b/workflow/engine/methods/login/login.php
index 8d989eee1..d06ec840e 100644
--- a/workflow/engine/methods/login/login.php
+++ b/workflow/engine/methods/login/login.php
@@ -344,7 +344,7 @@ $flagForgotPassword = isset($oConf->aConfig['login_enableForgotPassword'])
 
 setcookie('PM-Warning', trim(G::LoadTranslation('ID_BLOCKER_MSG'), '*'), time() + (24 * 60 * 60), SYS_URI);
 
-$configS = PMSystem::getSystemConfiguration('', '', SYS_SYS);
+$configS = PmSystem::getSystemConfiguration('', '', SYS_SYS);
 $activeSession = isset($configS['session_block']) ? !(int)$configS['session_block'] : true;
 if ($activeSession) {
     setcookie("PM-TabPrimary", 101010010, time() + (24 * 60 * 60), '/');
diff --git a/workflow/engine/methods/login/retrivePassword.php b/workflow/engine/methods/login/retrivePassword.php
index a6a28b422..d3e2c9eff 100644
--- a/workflow/engine/methods/login/retrivePassword.php
+++ b/workflow/engine/methods/login/retrivePassword.php
@@ -8,7 +8,7 @@ $data['USR_USERNAME'] = strip_tags($data['USR_USERNAME']);
 $userData = $rbacUser->getByUsername($data['USR_USERNAME']);
 
 if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'] && ($userData['USR_AUTH_TYPE'] === '' || $userData['USR_AUTH_TYPE'] == 'MYSQL') ) {
-    $aSetup = PMSystem::getEmailConfiguration();
+    $aSetup = PmSystem::getEmailConfiguration();
     if (count($aSetup) == 0 || !isset($aSetup['MESS_ENGINE'])) {
         G::SendTemporalMessage ('ID_EMAIL_ENGINE_IS_NOT_ENABLED', "warning");
         G::header('location: forgotPassword');
@@ -53,7 +53,7 @@ if ($userData['USR_EMAIL'] != '' && $userData['USR_EMAIL'] === $data['USR_EMAIL'
   <tbody><tr><td><img id='logo' src='http://".$_SERVER['SERVER_NAME']."/images/processmaker.logo.jpg' /></td></tr>
   <tr><td style='font-size: 14px;'>$msg</td></tr>
   <tr><td style='vertical-align:middel;'>
-  <br /><hr><b>This Business Process is powered by ProcessMaker ver. ".PMSystem::getVersion().".<b><br />
+  <br /><hr><b>This Business Process is powered by ProcessMaker ver. ".PmSystem::getVersion().".<b><br />
   <a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
   </tr></tbody></table>";
 
diff --git a/workflow/engine/methods/processes/mainInit.php b/workflow/engine/methods/processes/mainInit.php
index 5ce95620f..64a525ac9 100644
--- a/workflow/engine/methods/processes/mainInit.php
+++ b/workflow/engine/methods/processes/mainInit.php
@@ -28,7 +28,7 @@ $RBAC->requirePermissions( 'PM_FACTORY' );
 
 $conf = new Configurations();
 
-$pmVersion = (preg_match("/^([\d\.]+).*$/", PMSystem::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
+$pmVersion = (preg_match("/^([\d\.]+).*$/", PmSystem::getVersion(), $arrayMatch))? $arrayMatch[1] : ""; //Otherwise: Branch master
 
 /*----------------------------------********---------------------------------*/
 if (true) {
diff --git a/workflow/engine/methods/processes/processes_webEntryGenerate.php b/workflow/engine/methods/processes/processes_webEntryGenerate.php
index 43d93845a..6f92e759d 100644
--- a/workflow/engine/methods/processes/processes_webEntryGenerate.php
+++ b/workflow/engine/methods/processes/processes_webEntryGenerate.php
@@ -86,7 +86,7 @@ try {
         $template->assign( 'dynaform', $dynTitle );
         $template->assign( 'timestamp', date( 'l jS \of F Y h:i:s A' ) );
         $template->assign( 'ws', SYS_SYS );
-        $template->assign( 'version', PMSystem::getVersion() );
+        $template->assign( 'version', PmSystem::getVersion() );
 
         $fileName = $pathProcess . $dynTitle . 'Post.php';
         file_put_contents( $fileName, $template->getOutputContent() );
diff --git a/workflow/engine/methods/setup/cron.php b/workflow/engine/methods/setup/cron.php
index 89c52cd05..914881e70 100644
--- a/workflow/engine/methods/setup/cron.php
+++ b/workflow/engine/methods/setup/cron.php
@@ -62,7 +62,7 @@ $cronInfo["fileLogSize"] = $fileLogSize;
 $cronInfo["fileLogPath"] = $fileLog;
 
 //Workspaces
-$workspaces = PMSystem::listWorkspaces();
+$workspaces = PmSystem::listWorkspaces();
 $arrayAux = array ();
 
 foreach ($workspaces as $index => $workspace) {
diff --git a/workflow/engine/methods/setup/emails_Ajax.php b/workflow/engine/methods/setup/emails_Ajax.php
index a76fd12af..1d5411532 100644
--- a/workflow/engine/methods/setup/emails_Ajax.php
+++ b/workflow/engine/methods/setup/emails_Ajax.php
@@ -252,7 +252,7 @@ function sendTestMail ()
   <tbody><tr><td><img id='logo' src='http://" . $_SERVER['SERVER_NAME'] . "/images/processmaker.logo.jpg' /></td></tr>
   <tr><td style='font-size: 14px;'>$msg [" . date( 'H:i:s' ) . "] - $engine</td></tr>
   <tr><td style='vertical-align:middel;'>
-  <br /><hr><b>This Business Process is powered by ProcessMaker ver. " . PMSystem::getVersion() . ".<b><br />
+  <br /><hr><b>This Business Process is powered by ProcessMaker ver. " . PmSystem::getVersion() . ".<b><br />
   <a href='http://www.processmaker.com' style='color:#c40000;'>www.processmaker.com</a><br /></td>
   </tr></tbody></table>";
 
diff --git a/workflow/engine/methods/setup/pluginsImportFile.php b/workflow/engine/methods/setup/pluginsImportFile.php
index a90736f56..9822338dc 100644
--- a/workflow/engine/methods/setup/pluginsImportFile.php
+++ b/workflow/engine/methods/setup/pluginsImportFile.php
@@ -280,8 +280,8 @@ try {
             $oClass->iPMVersion = 0;
         }
         if ($oClass->iPMVersion > 0) {
-            if (PMSystem::getVersion() > 0) {
-                if ($oClass->iPMVersion > PMSystem::getVersion()) {
+            if (PmSystem::getVersion() > 0) {
+                if ($oClass->iPMVersion > PmSystem::getVersion()) {
                     //throw new Exception('This plugin needs version ' . $oClass->iPMVersion . ' or higher of ProcessMaker');
                 }
             }
diff --git a/workflow/engine/methods/setup/skin_Ajax.php b/workflow/engine/methods/setup/skin_Ajax.php
index 82be90d1f..26ecc8990 100644
--- a/workflow/engine/methods/setup/skin_Ajax.php
+++ b/workflow/engine/methods/setup/skin_Ajax.php
@@ -46,7 +46,7 @@ function skinList ()
         $textFilter = '';
     }
 
-    $skinList = PMSystem::getSkingList();
+    $skinList = PmSystem::getSkingList();
     $wildcard = '';
     if (isset( $_REQUEST['activeskin'] )) {
         $wildcard = '@';
diff --git a/workflow/engine/methods/setup/skinsExport.php b/workflow/engine/methods/setup/skinsExport.php
index feec075c4..2373fa344 100644
--- a/workflow/engine/methods/setup/skinsExport.php
+++ b/workflow/engine/methods/setup/skinsExport.php
@@ -150,7 +150,7 @@ G::mk_dir( $pathPublic . 'images' );
 $fields['className'] = $id;
 $fields['version'] = $oConf->version;
 $fields['description'] = $oConf->description;
-$fields['PMversion'] = PMSystem::getVersion();
+$fields['PMversion'] = PmSystem::getVersion();
 savePluginFile( 'skinPluginMainClass', $pathHome . $id . '.php', $fields );
 
 savePluginFile( 'skinPluginClass', $pathBase . 'class.' . $id . '.php', $fields );
diff --git a/workflow/engine/methods/setup/upgrade.php b/workflow/engine/methods/setup/upgrade.php
index ad40d9f91..b3ae31211 100644
--- a/workflow/engine/methods/setup/upgrade.php
+++ b/workflow/engine/methods/setup/upgrade.php
@@ -61,7 +61,7 @@ $G_SUB_MENU = 'setup';
 $G_ID_MENU_SELECTED = 'SETUP';
 $G_ID_SUB_MENU_SELECTED = 'UPGRADE';
 
-$Fields['PM_VERSION'] = PMSystem::getVersion();
+$Fields['PM_VERSION'] = PmSystem::getVersion();
 $Fields['MAX_FILE_SIZE'] = $uploadMaxSize . " (" . $UPLOAD_MAX_SIZE . ") ";
 
 $G_PUBLISH = new Publisher();
diff --git a/workflow/engine/methods/setup/upgrade_System.php b/workflow/engine/methods/setup/upgrade_System.php
index aad6d1f5e..3a51b97a1 100644
--- a/workflow/engine/methods/setup/upgrade_System.php
+++ b/workflow/engine/methods/setup/upgrade_System.php
@@ -49,7 +49,7 @@ $G_ID_MENU_SELECTED = 'SETUP';
 $G_ID_SUB_MENU_SELECTED = 'UPGRADE';
 
 require_once "classes/class.system.php";
-$oSystem = new PMSystem();
+$oSystem = new PmSystem();
 
 try {
     if (! $oSystem->verifyFileForUpgrade()) {
diff --git a/workflow/engine/methods/setup/webServicesAjax.php b/workflow/engine/methods/setup/webServicesAjax.php
index 85059f3ab..1a1910869 100644
--- a/workflow/engine/methods/setup/webServicesAjax.php
+++ b/workflow/engine/methods/setup/webServicesAjax.php
@@ -149,7 +149,7 @@ try {
 
         //Apply proxy settings
         $proxy = array ();
-        $sysConf = PMSystem::getSystemConfiguration();
+        $sysConf = PmSystem::getSystemConfiguration();
         if ($sysConf['proxy_host'] != '') {
             $proxy['proxy_host'] = $sysConf['proxy_host'];
             if ($sysConf['proxy_port'] != '') {
diff --git a/workflow/engine/methods/users/usersEdit.php b/workflow/engine/methods/users/usersEdit.php
index 0cfa43637..10601ece7 100644
--- a/workflow/engine/methods/users/usersEdit.php
+++ b/workflow/engine/methods/users/usersEdit.php
@@ -17,7 +17,7 @@ if ($postMaxSize < $uploadMaxSize) {
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
 if (file_exists($envFile) ) {
-    $sysConf = PMSystem::getSystemConfiguration($envFile);
+    $sysConf = PmSystem::getSystemConfiguration($envFile);
     if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
        $expirationDate = abs($sysConf['expiration_year']);
     }
@@ -31,7 +31,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/
 
-$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
diff --git a/workflow/engine/methods/users/usersInit.php b/workflow/engine/methods/users/usersInit.php
index 5bd33b911..9ee14d407 100644
--- a/workflow/engine/methods/users/usersInit.php
+++ b/workflow/engine/methods/users/usersInit.php
@@ -32,7 +32,7 @@ if ($postMaxSize < $uploadMaxSize) {
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
 if (file_exists($envFile) ) {
-    $sysConf = PMSystem::getSystemConfiguration($envFile);
+    $sysConf = PmSystem::getSystemConfiguration($envFile);
     if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
        $expirationDate = abs($sysConf['expiration_year']);
     }
@@ -46,7 +46,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/
 
-$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
diff --git a/workflow/engine/methods/users/usersNew.php b/workflow/engine/methods/users/usersNew.php
index 09812a715..1cbe900cf 100644
--- a/workflow/engine/methods/users/usersNew.php
+++ b/workflow/engine/methods/users/usersNew.php
@@ -20,7 +20,7 @@ if ($postMaxSize < $uploadMaxSize) {
 $expirationDate = 1;
 $envFile = PATH_CONFIG . 'env.ini';
 if (file_exists($envFile) ) {
-    $sysConf = PMSystem::getSystemConfiguration($envFile);
+    $sysConf = PmSystem::getSystemConfiguration($envFile);
     if(isset($sysConf['expiration_year']) && $sysConf['expiration_year']>0){
        $expirationDate = abs($sysConf['expiration_year']);
     }
@@ -35,7 +35,7 @@ if ($licensedFeatures->verifyfeature('w2LL3o4NFNiaDRXcFFCYVpJS3Jsall5dmh0ZWtBTkd
 }
 /*----------------------------------********---------------------------------*/
 
-$arraySystemConfiguration = PMSystem::getSystemConfiguration('', '', SYS_SYS);
+$arraySystemConfiguration = PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
 $oHeadPublisher = & headPublisher::getSingleton();
 $oHeadPublisher->addExtJsScript( 'users/users', true ); //adding a javascript file .js
diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php
index 7fc88b33d..99de33590 100644
--- a/workflow/engine/skinEngine/skinEngine.php
+++ b/workflow/engine/skinEngine/skinEngine.php
@@ -42,7 +42,7 @@ class SkinEngine
     $this->content = $content;
     $this->skinVariants = array('blank','extjs','raw','tracker','submenu');
     $this->skinsBasePath = G::ExpandPath("skinEngine");
-    $sysConf = PMSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
+    $sysConf = PmSystem::getSystemConfiguration( PATH_CONFIG . 'env.ini' );
     $this->skinDefault = (isset($sysConf['default_skin']) && $sysConf['default_skin'] != '') ? $sysConf['default_skin'] : 'classic';
     $this->_init();
   }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
index 3ebed3069..bf8a890fa 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/ActionsByEmail.php
@@ -404,7 +404,7 @@ class ActionsByEmail
                     $arrayConfigAux = $row;
                     $arrayConfigAux["SMTPSecure"] = $row["SMTPSECURE"];
                 }
-                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \PMSystem::getEmailConfiguration();
+                $aSetup = (!empty($arrayConfigAux))? $arrayConfigAux : \PmSystem::getEmailConfiguration();
 
                 $spool = new \spoolRun();
                 $spool->setConfig($aSetup);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
index f85774528..e97ab85a0 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Cases.php
@@ -181,7 +181,7 @@ class Cases
     {
         try {
             $solrEnabled = false;
-            $solrConf = \PMSystem::solrEnv();
+            $solrConf = \PmSystem::solrEnv();
 
             if ($solrConf !== false) {
                 $ApplicationSolrIndex = new \AppSolr(
@@ -373,7 +373,7 @@ class Cases
     {
         try {
             $solrEnabled = 0;
-            if (($solrEnv = \PMSystem::solrEnv()) !== false) {
+            if (($solrEnv = \PmSystem::solrEnv()) !== false) {
                 $appSolr = new \AppSolr(
                     $solrEnv["solr_enabled"],
                     $solrEnv["solr_host"],
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
index 4d9b8d81a..b3e6d261b 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/EmailServer.php
@@ -139,7 +139,7 @@ class EmailServer
             $sBodyPre->prepare();
             $sBodyPre->assign("server", $_SERVER["SERVER_NAME"]);
             $sBodyPre->assign("date", date("H:i:s"));
-            $sBodyPre->assign("ver", \PMSystem::getVersion());
+            $sBodyPre->assign("ver", \PmSystem::getVersion());
             $sBodyPre->assign("engine", $engine);
             $sBodyPre->assign("msg", $msg);
             $sBody = $sBodyPre->getOutputContent();
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
index 54e25fbff..62030aac4 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light.php
@@ -1259,7 +1259,7 @@ class Light
         $offset = timezone_offset_get( new \DateTimeZone( $tz ), new \DateTime() );
         $response['timeZone'] = sprintf( "GMT%s%02d:%02d", ( $offset >= 0 ) ? '+' : '-', abs( $offset / 3600 ), abs( ($offset % 3600) / 60 ) );
         $response['multiTimeZone'] = $multiTimeZone;
-        $fields = \PMSystem::getSysInfo();
+        $fields = \PmSystem::getSysInfo();
         $response['version'] = $fields['PM_VERSION'];
 
         $buildType = 'Community';
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
index 2fa284b34..7aace44f0 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
@@ -11,7 +11,7 @@ class NotificationDevice
 
     public function checkMobileNotifications()
     {
-        $conf = \PMSystem::getSystemConfiguration('', '', SYS_SYS);
+        $conf = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
         $activeNotifications = true;
         if (isset($conf['mobileNotifications'])) {
             $activeNotifications = $conf['mobileNotifications'] == 1 ? true : false;
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
index efb20f340..667e61aae 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageAndroid.php
@@ -54,7 +54,7 @@ class PushMessageAndroid
      */
     public function setSettingNotification()
     {
-        $conf = \PMSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
+        $conf = \PmSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
         $this->setUrl($conf['android']['url']);
         $this->setKey($conf['android']['serverApiKey']);
     }
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
index 442dbfdc7..89647f707 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Light/PushMessageIOS.php
@@ -67,7 +67,7 @@ class PushMessageIOS
      */
     public function setSettingNotification()
     {
-        $conf = \PMSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
+        $conf = \PmSystem::getSystemConfiguration(PATH_CONFIG . 'mobile.ini');
         $this->setUrl($conf['apple']['url']);
         $this->setKey($conf['apple']['passphrase']);
         $this->setPemFile($conf['apple']['pemFile']);
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
index 254159495..461f17e3d 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularExporter.php
@@ -133,7 +133,7 @@ class GranularExporter
         $data["version"] = "3.1";
         $data["container"] = "ProcessMaker-Project";
         $data["metadata"] = array(
-            "vendor_version" => \PMSystem::getVersion(),
+            "vendor_version" => \PmSystem::getVersion(),
             "vendor_version_code" => "Michelangelo",
             "export_timestamp" => date("U"),
             "export_datetime" => date("Y-m-d\TH:i:sP"),
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
index 380101257..fc3007b6a 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Pmgmail.php
@@ -30,7 +30,7 @@ class Pmgmail {
 
         //getting the skin
         require_once (PATH_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP . "class.system.php");
-        $sysConf = new \PMSystem();
+        $sysConf = new \PmSystem();
         $responseSysConfig = $sysConf->getSystemConfiguration( PATH_CONFIG . 'env.ini' );
         $response['enviroment'] = $responseSysConfig['default_skin'];
 
diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
index b9c95acb3..2f9a1c405 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/WebEntry.php
@@ -447,7 +447,7 @@ class WebEntry
                     $template->assign("dynaform", $arrayDynaFormData["DYN_TITLE"]);
                     $template->assign("timestamp", date("l jS \of F Y h:i:s A"));
                     $template->assign("ws", $this->sysSys);
-                    $template->assign("version", \PMSystem::getVersion());
+                    $template->assign("version", \PmSystem::getVersion());
 
                     $fileName = $pathDataPublicProcess . PATH_SEP . $weTitle . "Post.php";
 
diff --git a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
index 04c96db0f..bf28ee0d5 100644
--- a/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
+++ b/workflow/engine/src/ProcessMaker/Exporter/Exporter.php
@@ -39,7 +39,7 @@ abstract class Exporter
         $this->projectData = $this->bpmnProject->getProject();
 
         $this->metadata = array(
-            "vendor_version" => \PMSystem::getVersion(),
+            "vendor_version" => \PmSystem::getVersion(),
             "vendor_version_code" => "Michelangelo",
             "export_timestamp" => date("U"),
             "export_datetime" => date("Y-m-d\TH:i:sP"),
diff --git a/workflow/engine/src/ProcessMaker/Project/Handler.php b/workflow/engine/src/ProcessMaker/Project/Handler.php
index cf16fd37c..0cb76b53e 100644
--- a/workflow/engine/src/ProcessMaker/Project/Handler.php
+++ b/workflow/engine/src/ProcessMaker/Project/Handler.php
@@ -110,21 +110,21 @@ abstract class Handler
      */
     public static function logstr($str)
     {
-        if (\PMSystem::isDebugMode()) {
+        if (\PmSystem::isDebugMode()) {
             Logger::getInstance()->setLog($str);
         }
     }
 
     public static function logInline()
     {
-        if (\PMSystem::isDebugMode()) {
+        if (\PmSystem::isDebugMode()) {
             call_user_func_array(array(Logger::getInstance(), 'setLogInline'), func_get_args());
         }
     }
 
     public static function log()
     {
-        if (\PMSystem::isDebugMode()) {
+        if (\PmSystem::isDebugMode()) {
             $logger = Logger::getInstance();
             call_user_func_array(array($logger, 'setLogLine'), func_get_args());
         }
diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
index c41a04526..b8c1c4d3f 100644
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
@@ -371,7 +371,7 @@ class Server implements iAuthenticate
                 $userTimeZone = $user->getUsrTimeZone();
 
                 if (trim($userTimeZone) == '') {
-                    $arraySystemConfiguration = \PMSystem::getSystemConfiguration('', '', SYS_SYS);
+                    $arraySystemConfiguration = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
                     $userTimeZone = $arraySystemConfiguration['time_zone'];
                 }
diff --git a/workflow/engine/src/ProcessMaker/Util/System.php b/workflow/engine/src/ProcessMaker/Util/System.php
index f65670caa..c01a86b89 100644
--- a/workflow/engine/src/ProcessMaker/Util/System.php
+++ b/workflow/engine/src/ProcessMaker/Util/System.php
@@ -19,7 +19,7 @@ class System
     public static function getTimeZone()
     {
         try {
-            $arraySystemConfiguration = \PMSystem::getSystemConfiguration('', '', SYS_SYS);
+            $arraySystemConfiguration = \PmSystem::getSystemConfiguration('', '', SYS_SYS);
 
             //Return
             return $arraySystemConfiguration['time_zone'];
diff --git a/workflow/public_html/bootstrap.php b/workflow/public_html/bootstrap.php
index 9e85de600..eb2d3b727 100644
--- a/workflow/public_html/bootstrap.php
+++ b/workflow/public_html/bootstrap.php
@@ -62,7 +62,7 @@
   ini_set('session.cookie_lifetime', $timelife);
   session_start();
 
-  $config = PMSystem::getSystemConfiguration();
+  $config = PmSystem::getSystemConfiguration();
 
   //$e_all  = defined('E_DEPRECATED') ? E_ALL  & ~E_DEPRECATED : E_ALL;
   //$e_all  = defined('E_STRICT')     ? $e_all & ~E_STRICT     : $e_all;