diff options
| author | Stanislav-Wolski <stanislau.wolski@gmail.com> | 2012-05-23 19:44:42 +0300 |
|---|---|---|
| committer | Stanislav-Wolski <stanislau.wolski@gmail.com> | 2012-05-23 19:44:42 +0300 |
| commit | 6c5b0c64092ad095d55412b5765c14bd121b508c (patch) | |
| tree | 9b2e598d9556f72e1eadc89f231074d7e7072085 /codebase/scheduler_connector.php | |
| parent | 97ec6d0772ca2123f54fb0cf558e9fe8a9b72115 (diff) | |
| parent | 5b2915c991c6fd26503accfc7218256917bff0d3 (diff) | |
| download | connector-php-6c5b0c64092ad095d55412b5765c14bd121b508c.zip connector-php-6c5b0c64092ad095d55412b5765c14bd121b508c.tar.gz connector-php-6c5b0c64092ad095d55412b5765c14bd121b508c.tar.bz2 | |
Merge branch 'frameworks'
Conflicts:
codebase/base_connector.php
codebase/data_connector.php
codebase/grid_connector.php
codebase/scheduler_connector.php
Diffstat (limited to 'codebase/scheduler_connector.php')
| -rw-r--r-- | codebase/scheduler_connector.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/codebase/scheduler_connector.php b/codebase/scheduler_connector.php index 123d03b..7032fd8 100644 --- a/codebase/scheduler_connector.php +++ b/codebase/scheduler_connector.php @@ -22,6 +22,11 @@ class SchedulerDataItem extends DataItem{ $extra = $this->config->text[$i]["name"]; $str.="<".$extra."><![CDATA[".$this->data[$extra]."]]></".$extra.">"; } + + if ($this->userdata !== false) + foreach ($this->userdata as $key => $value) + $str.="<".$key."><![CDATA[".$value."]]></".$key.">"; + return $str."</event>"; } } @@ -119,6 +124,11 @@ class JSONSchedulerDataItem extends SchedulerDataItem{ $extra = $this->config->text[$i]["name"]; $obj[$extra]=$this->data[$extra]; } + + if ($this->userdata !== false) + foreach ($this->userdata as $key => $value) + $obj[$key]=$value; + return $obj; } } @@ -212,5 +222,4 @@ class JSONSchedulerConnector extends SchedulerConnector { $out->output("", true, $this->encoding); } } - ?>
\ No newline at end of file |