From 44d60e96d988261a27f70afd86fe3e68c52a391c Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Fri, 4 Aug 2017 11:49:43 -0400 Subject: [PATCH] HOR-3620 Fix PMSystem -> PmSystem since Processmaker is one word. --- framework/src/Maveriks/WebApplication.php | 6 +- gulliver/system/class.bootstrap.php | 6 +- gulliver/system/class.codeScanner.php | 2 +- gulliver/system/class.g.php | 8 +- gulliver/system/class.soapNtlm.php | 610 +++++----- workflow/engine/PmBootstrap.php | 2 +- workflow/engine/bin/cron.php | 2 +- workflow/engine/bin/cron_single.php | 2 +- workflow/engine/bin/reindex_solr.php | 4 +- workflow/engine/bin/tasks/cliCommon.php | 2 +- workflow/engine/bin/tasks/cliUpgrade.php | 4 +- workflow/engine/bin/verify_solr.php | 4 +- .../classes/{PMSystem.php => PmSystem.php} | 45 +- workflow/engine/classes/class.Upgrade.php | 2 +- workflow/engine/classes/class.case.php | 2 +- .../engine/classes/class.dashletRssReader.php | 2 +- .../engine/classes/class.enterpriseUtils.php | 2 +- workflow/engine/classes/class.license.lib.php | 2 +- workflow/engine/classes/class.patch.php | 4 +- .../engine/classes/class.pluginRegistry.php | 4 +- workflow/engine/classes/class.pmDynaform.php | 16 +- workflow/engine/classes/class.pmFunctions.php | 4 +- workflow/engine/classes/class.processes.php | 8 +- workflow/engine/classes/class.solr.php | 20 +- workflow/engine/classes/class.spool.php | 2 +- workflow/engine/classes/class.webdav.php | 4 +- workflow/engine/classes/class.wsBase.php | 8 +- workflow/engine/classes/class.wsTools.php | 28 +- .../engine/classes/model/AddonsManager.php | 4 +- workflow/engine/classes/model/AddonsStore.php | 4 +- workflow/engine/classes/model/AppNotes.php | 2 +- workflow/engine/classes/model/Language.php | 2 +- .../classes/triggers/api/class.zimbraApi.php | 2 +- .../triggers/class.pmSugarFunctions.php | 1036 ++++++++--------- .../triggers/class.pmTalendFunctions.php | 2 +- .../classes/triggers/class.pmTrZimbra.php | 2 +- workflow/engine/controllers/admin.php | 692 +++++------ workflow/engine/controllers/adminProxy.php | 10 +- workflow/engine/controllers/designer.php | 2 +- workflow/engine/controllers/home.php | 6 +- workflow/engine/controllers/installer.php | 4 +- workflow/engine/controllers/main.php | 8 +- workflow/engine/controllers/pmTablesProxy.php | 2 +- .../engine/controllers/strategicDashboard.php | 2 +- workflow/engine/controllers/webEntryProxy.php | 2 +- .../methods/cases/caseMessageHistory_Ajax.php | 2 +- .../cases/casesConsolidatedListExtJs.php | 2 +- .../engine/methods/cases/casesListExtJs.php | 2 +- workflow/engine/methods/cases/cases_Ajax.php | 2 +- .../engine/methods/enterprise/addonsStore.php | 2 +- .../methods/enterprise/addonsStoreAction.php | 2 +- .../engine/methods/enterprise/enterprise.php | 2 +- .../methods/enterprise/processMakerAjax.php | 6 +- .../engine/methods/login/authentication.php | 4 +- .../methods/login/authenticationSso.php | 2 +- workflow/engine/methods/login/login.php | 2 +- .../engine/methods/login/retrivePassword.php | 4 +- .../engine/methods/processes/mainInit.php | 2 +- .../processes/processes_webEntryGenerate.php | 2 +- workflow/engine/methods/setup/cron.php | 2 +- workflow/engine/methods/setup/emails_Ajax.php | 2 +- .../methods/setup/pluginsImportFile.php | 4 +- workflow/engine/methods/setup/skin_Ajax.php | 2 +- workflow/engine/methods/setup/skinsExport.php | 2 +- workflow/engine/methods/setup/upgrade.php | 2 +- .../engine/methods/setup/upgrade_System.php | 2 +- .../engine/methods/setup/webServicesAjax.php | 2 +- workflow/engine/methods/users/usersEdit.php | 4 +- workflow/engine/methods/users/usersInit.php | 4 +- workflow/engine/methods/users/usersNew.php | 4 +- workflow/engine/skinEngine/skinEngine.php | 2 +- .../BusinessModel/ActionsByEmail.php | 2 +- .../src/ProcessMaker/BusinessModel/Cases.php | 4 +- .../BusinessModel/EmailServer.php | 2 +- .../src/ProcessMaker/BusinessModel/Light.php | 2 +- .../Light/NotificationDevice.php | 2 +- .../Light/PushMessageAndroid.php | 2 +- .../BusinessModel/Light/PushMessageIOS.php | 2 +- .../Migrator/GranularExporter.php | 2 +- .../ProcessMaker/BusinessModel/Pmgmail.php | 2 +- .../ProcessMaker/BusinessModel/WebEntry.php | 2 +- .../src/ProcessMaker/Exporter/Exporter.php | 2 +- .../src/ProcessMaker/Project/Handler.php | 6 +- .../ProcessMaker/Services/OAuth2/Server.php | 2 +- .../engine/src/ProcessMaker/Util/System.php | 2 +- workflow/public_html/bootstrap.php | 2 +- 86 files changed, 1332 insertions(+), 1359 deletions(-) rename workflow/engine/classes/{PMSystem.php => PmSystem.php} (97%) 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 @@ -. - * - * 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
"; - //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]
"; - 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
"; - 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]
"; - 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
"; - return true; - } - //echo "false
"; - return false; - } - - /** - * - * @return int the position of the current read pointer - */ - public function stream_tell () - { - //echo "[NTLMStream::stream_tell]
"; - return $this->pos; - } - - /** - * Flush stream data - */ - public function stream_flush () - { - //echo "[NTLMStream::stream_flush]
"; - $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]
"; - $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
"; - $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
"; - $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
"; - $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]; - } -} - +. + * + * 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
"; + //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]
"; + 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
"; + 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]
"; + 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
"; + return true; + } + //echo "false
"; + return false; + } + + /** + * + * @return int the position of the current read pointer + */ + public function stream_tell () + { + //echo "[NTLMStream::stream_tell]
"; + return $this->pos; + } + + /** + * Flush stream data + */ + public function stream_flush () + { + //echo "[NTLMStream::stream_flush]
"; + $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]
"; + $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
"; + $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
"; + $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
"; + $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 @@ . - * - * 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. * 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 = " "; @@ -1406,7 +1406,7 @@ class pmDynaform $javascrip = "" . "