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,7 +97,6 @@ class PMPlugin
$oPluginRegistry->registerDashlets($this->sNamespace);
}
/**
* With this function we can register the report
* param
@@ -361,6 +360,17 @@ class PMPlugin
$oPluginRegistry->unregisterRestService($this->sNamespace, $classname, $path);
}
/**
* With this function we can register a cron file
* param string $cronFile
* @return void
*/
public function registerCronFile($cronFile)
{
$oPluginRegistry =& PMPluginRegistry::getSingleton();
$oPluginRegistry->registerCronFile($this->sNamespace, $cronFile);
}
function enableRestService($enable)
{
$oPluginRegistry =& PMPluginRegistry::getSingleton();
@@ -688,3 +698,20 @@ class dashboardPage
}
}
class cronFile
{
public $namespace;
public $cronFile;
/**
* This function is the constructor of the cronFile class
* param string $namespace
* param string $cronFile
* @return void
*/
public function __construct($namespace, $cronFile)
{
$this->namespace = $namespace;
$this->cronFile = $cronFile;
}
}