From: hickert Date: Wed, 27 Feb 2008 11:05:19 +0000 (+0000) Subject: Updated reinstall event. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f06435e46d693a144a9dd828506197d0cbf573b8;p=gosa.git Updated reinstall event. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@9167 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent.inc b/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent.inc index 76d1e5f2a..400f13c1b 100644 --- a/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent.inc +++ b/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent.inc @@ -77,6 +77,9 @@ class DaemonEvent foreach($attrs as $to => $from){ $this->$to = $data[$from]; } + if(isset($data['TIMESTAMP'])){ + $this->timestamp = $this->_event_to_timestamp($data['TIMESTAMP']); + } } } diff --git a/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent_reinstall.inc b/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent_reinstall.inc index 9d499762e..f2d029d1a 100644 --- a/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent_reinstall.inc +++ b/gosa-plugins/goto/addons/gotomasses/events/class_DaemonEvent_reinstall.inc @@ -2,8 +2,8 @@ class DaemonEvent_reinstall extends DaemonEvent { - var $progress = -1; - var $status = "none"; + var $progress = 0; + var $status = ""; public function __construct($config,$data = array()) { @@ -21,7 +21,7 @@ class DaemonEvent_reinstall extends DaemonEvent $this->progress = $data['PROGRESS']; } if(isset($data['STATUS'])){ - $this->progress = $data['STATUS']; + $this->status = $data['STATUS']; } } } @@ -65,7 +65,7 @@ class DaemonEvent_reinstall extends DaemonEvent { $ret = DaemonEvent::save(); foreach(array("progress","status") as $attr){ -# $ret[$attr] = $this->$attr; + $ret[$attr] = $this->$attr; } return($ret); }