fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change

Browse Source
This commit is contained in:
Ronald Quenta
2017-08-01 12:16:06 -04:00
parent 6cdb07c2c8
commit cc5fcb08bc
116 changed files with 4797 additions and 3202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
workflow/engine/controllers/adminProxy.php
View File

@@ -1,4 +1,7 @@
<?php
use ProcessMaker\Plugins\PluginRegistry;
/**
* adminProxy.php
*
@@ -1382,7 +1385,7 @@ class adminProxy extends HttpProxyController
$params = array ();
$oServerConf = &serverConf::getSingleton();
$pluginRegistry = &PMPluginRegistry::getSingleton();
$pluginRegistry = PluginRegistry::loadSingleton();
$licenseManager = &pmLicenseManager::getSingleton();
//License Information:
@@ -1455,10 +1458,10 @@ class adminProxy extends HttpProxyController
if (file_exists( PATH_PLUGINS . $sFileName . ".php" )) {
$plugin = array();
$addonDetails = $pluginRegistry->getPluginDetails( $sFileName . ".php" );
$plugin['name'] = $addonDetails->sNamespace;
$plugin['description'] = $addonDetails->sDescription;
$plugin['version'] = $addonDetails->iVersion;
$plugin['enable'] = $addonDetails->enabled;
$plugin['name'] = $addonDetails->getNamespace();
$plugin['description'] = $addonDetails->getDescription();
$plugin['version'] = $addonDetails->getVersion();
$plugin['enable'] = $addonDetails->isEnabled();
$plugins[] = $plugin;
}
}

12
workflow/engine/controllers/caseSchedulerProxy.php
View File

@@ -1,5 +1,7 @@
<?php
use ProcessMaker\Plugins\PluginRegistry;
class caseSchedulerProxy extends HttpProxyController
{
@@ -507,11 +509,11 @@ class caseSchedulerProxy extends HttpProxyController
if ((isset( $_POST['form']['CASE_SH_PLUGIN_UID'] )) && ($_POST['form']['CASE_SH_PLUGIN_UID'] != "")) {
$params = explode( "--", $_REQUEST['form']['CASE_SH_PLUGIN_UID'] );
$oPluginRegistry = & PMPluginRegistry::getSingleton();
$oPluginRegistry = PluginRegistry::loadSingleton();
$activePluginsForCaseScheduler = $oPluginRegistry->getCaseSchedulerPlugins();
foreach ($activePluginsForCaseScheduler as $key => $caseSchedulerPluginDetail) {
if (($caseSchedulerPluginDetail->sNamespace == $params[0]) && ($caseSchedulerPluginDetail->sActionId == $params[1])) {
/** @var \ProcessMaker\Plugins\Interfaces\CaseSchedulerPlugin $caseSchedulerPluginDetail */
foreach ($activePluginsForCaseScheduler as $caseSchedulerPluginDetail) {
if (($caseSchedulerPluginDetail->equalNamespaceTo($params[0])) && ($caseSchedulerPluginDetail->equalActionIdTo($params[1]))) {
$caseSchedulerSelected = $caseSchedulerPluginDetail;
}
}
@@ -519,7 +521,7 @@ class caseSchedulerProxy extends HttpProxyController
//Save the form
$oData = $_POST['pluginFields'];
$oData['SCH_UID'] = $aData['SCH_UID'];
$oPluginRegistry->executeMethod( $caseSchedulerPluginDetail->sNamespace, $caseSchedulerPluginDetail->sActionSave, $oData );
$oPluginRegistry->executeMethod( $caseSchedulerPluginDetail->getNamespace(), $caseSchedulerPluginDetail->getActionSave(), $oData );
}
}

6
workflow/engine/controllers/designer.php
View File

@@ -1,5 +1,7 @@
<?php
use ProcessMaker\Plugins\PluginRegistry;
/**
* Designer Controller
*
@@ -134,10 +136,10 @@ class Designer extends Controller
$sourceCss = array();
$sourceJs = array();
$pluginRegistry = &PMPluginRegistry::getSingleton();
$pluginRegistry = PluginRegistry::loadSingleton();
$srcPath = $pluginRegistry->getDesignerSourcePath();
foreach ($srcPath as $key => $value) {
foreach ($srcPath as $value) {
$ext = pathinfo($value->pathFile, PATHINFO_EXTENSION);
if ($ext === "css") {
$sourceCss[] = $value->pathFile;

6
workflow/engine/controllers/main.php
View File

@@ -1,5 +1,7 @@
<?php
use ProcessMaker\Plugins\PluginRegistry;
/**
* Main Controller for processMaker v2.1
* @date Jul 17, 2011
@@ -156,7 +158,7 @@ class Main extends Controller
$this->memcache->delete( 'rbacSession' . session_id() );
} else {
// Execute SSO trigger
$pluginRegistry = & PMPluginRegistry::getSingleton();
$pluginRegistry = PluginRegistry::loadSingleton();
if (defined( 'PM_SINGLE_SIGN_ON' )) {
if ($pluginRegistry->existsTrigger( PM_SINGLE_SIGN_ON )) {
if ($pluginRegistry->executeTriggers( PM_SINGLE_SIGN_ON, null )) {
@@ -473,7 +475,7 @@ class Main extends Controller
}
}
if (class_exists( 'PMPluginRegistry' )) {
$oPluginRegistry = &PMPluginRegistry::getSingleton();
$oPluginRegistry = PluginRegistry::loadSingleton();
$logoPlugin = $oPluginRegistry->getCompanyLogo( $sCompanyLogo );
if ($logoPlugin != '/images/processmaker2.logo2.png') {
$sCompanyLogo = $logoPlugin;