Merge branch 'master' of github.com:colosa/processmaker

Conflicts:
	workflow/engine/classes/class.plugin.php
	workflow/engine/classes/class.pluginRegistry.php
This commit is contained in:
Erik Amaru Ortiz
2013-12-03 18:23:12 -04:00
118 changed files with 22708 additions and 5200 deletions

View File

@@ -97,6 +97,7 @@ class PMPluginRegistry
private $_aCaseSchedulerPlugin = array ();
private $_aTaskExtendedProperties = array ();
private $_aDashboardPages = array ();
private $_aCronFiles = array ();
/**
* Registry a plugin javascript to include with js core at same runtime
@@ -1444,6 +1445,27 @@ class PMPluginRegistry
}
}
/**
* Register a cron file in the singleton
*
* @param unknown_type $namespace
* @param unknown_type $cronFile
*/
public function registerCronFile ($namespace, $cronFile)
{
$found = false;
foreach ($this->_aCronFiles as $row => $detail) {
if ($cronFile == $detail->cronFile && $namespace == $detail->namespace) {
$detail->cronFile = $cronFile;
$found = true;
}
}
if (!$found) {
$cronFile = new cronFile( $namespace, $cronFile );
$this->_aCronFiles[] = $cronFile;
}
}
/**
* Function to enable rest service for plugins
* @param string $sNamespace