support new AgentConfig

code cleanup
okitsu · Mar 12, 2012 · 7d1d340 · 7d1d340
1 parent 54a7efe
commit 7d1d340
Showing 1 changed file with 13 additions and 17 deletions.
diff --git a/src/Net/Zabbix/Sender.php b/src/Net/Zabbix/Sender.php
@@ -42,7 +42,7 @@ class Sender {
 
     function __construct($servername = null,$serverport = null)
     {
-        if( isset($servername)){
+        if( isset($servername) ){
             $this->_servername = $servername;
         }
         if( isset($serverport) and is_numeric($serverport) ){
@@ -51,7 +51,8 @@ function __construct($servername = null,$serverport = null)
         $this->initData();
     }
 
-    function initData(){
+    function initData()
+    {
         $this->_data = $this->_createDataTemplate();
     }
 
@@ -63,18 +64,15 @@ function _createDataTemplate()
         );
     }
 
-    function importAgentConfig(Agent\Config $agentConfig){
-        $config = $agentConfig->getAgentConfig();
-        if( is_array($config) )
-        {
-            if( array_key_exists('Server',$config) )
-            {
-                $this->_servername = $config{'Server'}; 
-            }
-            if( array_key_exists('ServerPort',$config) )
-            {
-                $this->_serverport = intval($config{'ServerPort'}); 
-            }
+    function importAgentConfig(Agent\Config $agentConfig)
+    {
+        $server = $agentConfig->getServer();
+        $port   = $agentConfig->getServerPort();
+        if( isset($server) ){
+            $this->_servername = $server;
+        }
+        if( isset($port) ){
+            $this->_serverport = $port;
         }
     }
 
@@ -90,10 +88,8 @@ function getTimeout(){
 
     function addData($hostname=null,$key=null,$value=null,$clock=null)
     {
-
         $input = array("host"=>$hostname,"value"=>$value,"key"=>$key);
-        if( isset($clock) )
-        {
+        if( isset($clock) ){
             $input{"clock"} = $clock;
         }
         array_push($this->_data{"data"},$input);