diff options
Diffstat (limited to 'program/include/rcube_plugin.php')
| -rw-r--r-- | program/include/rcube_plugin.php | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/program/include/rcube_plugin.php b/program/include/rcube_plugin.php index e8fb22b5b..c92b58e7d 100644 --- a/program/include/rcube_plugin.php +++ b/program/include/rcube_plugin.php @@ -31,6 +31,7 @@ abstract class rcube_plugin public $task; protected $home; protected $urlbase; + private $mytask; /** * Default constructor. @@ -134,19 +135,8 @@ abstract class rcube_plugin */ public function register_task($task) { - if ($task != asciiwords($task)) { - raise_error(array('code' => 526, 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Invalid task name: $task. Only characters [a-z0-9_.-] are allowed"), true, false); - } - else if (in_array(rcmail::$main_tasks, $task)) { - raise_error(array('code' => 526, 'type' => 'php', - 'file' => __FILE__, 'line' => __LINE__, - 'message' => "Cannot register taks $task; already taken by another plugin or the application itself"), true, false); - } - else { - rcmail::$main_tasks[] = $task; - } + if ($this->api->register_task($task, $this->ID)) + $this->mytask = $task; } /** @@ -159,7 +149,7 @@ abstract class rcube_plugin */ public function register_action($action, $callback) { - $this->api->register_action($action, $this->ID, $callback); + $this->api->register_action($action, $this->ID, $callback, $this->mytask); } /** |