fernando/luos
1
0
Fork 0
Code Releases Activity

update composer .json

Browse Source
This commit is contained in:
hjonathan
2017-08-04 11:58:34 -04:00
parent 3a8194a412 687e5c9d9d
commit 1baf391bb3
104 changed files with 1530 additions and 1599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
composer.json
View File

@@ -58,6 +58,7 @@
"thirdparty/libchart/classes/",
"thirdparty/pear",
"thirdparty/html2ps_pdf",
"thirdparty/phing",
"rbac/engine/classes/"
],
"files": [

8
framework/src/Maveriks/WebApplication.php
View File

@@ -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"]);
@@ -418,7 +418,7 @@ class WebApplication
define("PATH_GULLIVER", PATH_GULLIVER_HOME . "system" . PATH_SEP); //gulliver system classes
define("PATH_GULLIVER_BIN", PATH_GULLIVER_HOME . "bin" . PATH_SEP); //gulliver bin classes
define("PATH_TEMPLATE", PATH_GULLIVER_HOME . "templates" . PATH_SEP);
define("PATH_THIRDPARTY", PATH_GULLIVER_HOME . "thirdparty" . PATH_SEP);
define("PATH_THIRDPARTY", PATH_TRUNK . "thirdparty" . PATH_SEP);
define("PATH_RBAC", PATH_RBAC_HOME . "engine" . PATH_SEP . "classes" . PATH_SEP); //to enable rbac version 2
define("PATH_RBAC_CORE", PATH_RBAC_HOME . "engine" . PATH_SEP);
define("PATH_CORE", PATH_HOME . "engine" . PATH_SEP);
@@ -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']);

6
gulliver/system/class.bootstrap.php
View File

@@ -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'];
}

2
gulliver/system/class.codeScanner.php
View File

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

8
gulliver/system/class.g.php
View File

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

610
gulliver/system/class.soapNtlm.php
View File

File diff suppressed because it is too large Load Diff

2
rbac/engine/config/paths.php
View File

@@ -38,7 +38,7 @@
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_GULLIVER_BIN', PATH_GULLIVER_HOME . 'bin' . PATH_SEP ); //gulliver bin classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_TRUNK . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine' . PATH_SEP . 'classes' . PATH_SEP ); //to enable rbac version 2

2
rbac/public_html/sysGeneric.php
View File

@@ -26,7 +26,7 @@
define( 'PATH_GULLIVER', PATH_GULLIVER_HOME . 'system' . PATH_SEP ); //gulliver system classes
define( 'PATH_TEMPLATE', PATH_GULLIVER_HOME . 'templates' . PATH_SEP );
define( 'PATH_THIRDPARTY', PATH_GULLIVER_HOME . 'thirdparty' . PATH_SEP );
define( 'PATH_THIRDPARTY', $pathTrunk . 'thirdparty' . PATH_SEP );
define( 'PATH_RBAC', PATH_RBAC_HOME . 'engine/classes' . PATH_SEP ); //to enable rbac version 2
define( 'PATH_DATA', '/shared/rbac/');
define( 'PATH_HTML', PATH_HOME . 'public_html' . PATH_SEP );

2
workflow/engine/PmBootstrap.php
View File

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

2
workflow/engine/bin/cron.php
View File

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

2
workflow/engine/bin/cron_single.php
View File

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

4
workflow/engine/bin/reindex_solr.php
View File

@@ -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";

2
workflow/engine/bin/tasks/cliCommon.php
View File

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

4
workflow/engine/bin/tasks/cliUpgrade.php
View File

@@ -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

4
workflow/engine/bin/verify_solr.php
View File

@@ -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";

45
workflow/engine/classes/PMSystem.php → workflow/engine/classes/PmSystem.php
View File

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

402
workflow/engine/classes/class.pmTable.php → workflow/engine/classes/PmTable.php
View File

File diff suppressed because it is too large Load Diff

2
workflow/engine/classes/class.Upgrade.php
View File

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

2
workflow/engine/classes/class.case.php
View File

@@ -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']);
}
}

2
workflow/engine/classes/class.dashletRssReader.php
View File

@@ -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'] != '') {

2
workflow/engine/classes/class.enterpriseUtils.php
View File

@@ -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'] : ''));

2
workflow/engine/classes/class.license.lib.php
View File

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

4
workflow/engine/classes/class.patch.php
View File

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

4
workflow/engine/classes/class.pluginRegistry.php
View File

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

16
workflow/engine/classes/class.pmDynaform.php
View File

@@ -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" .

4
workflow/engine/classes/class.pmFunctions.php
View File

@@ -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();
}
/**

8
workflow/engine/classes/class.processes.php
View File

@@ -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'] != '') {

20
workflow/engine/classes/class.solr.php
View File

@@ -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'] != '') {

2
workflow/engine/classes/class.spool.php
View File

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

4
workflow/engine/classes/class.webdav.php
View File

@@ -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

Some files were not shown because too many files have changed in this diff Show More