Removed fping

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@8963 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
index e51022472e1bc7faeb84b99f7cf485be9f2c01e6..dce8cdfb4b8e2130a3fb949d15fd5f914c5edd77 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc
@@ -244,11 +244,7 @@ class termgeneric extends plugin
     $smarty->assign("inheritTimeServer",$this->inheritTimeServer);
 
     /* Check if terminal is online */
-    $query= "fping -q -r 1 -t 500 ".$this->cn;
-    exec ($query, $dummy, $retval);
-
-    /* Offline */
-    if ($retval == 0){
+    if (gosaSupportDaemon::ping($this->netConfigDNS->macAddress)){
       $smarty->assign("actions", array( "halt" => _("Switch off"), 
                                         "reboot" => _("Reboot"),
                                         "memcheck" => _("Memory test"),

diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc
index a584e188da882d39df740a9764d5e0deaf58f88f..0ff6e3ab69ebf8b247b70fa3dfae657954017668 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc
@@ -104,10 +104,7 @@ class terminfo extends plugin
         $smarty->assign("swap", progressbar(0,100,15,true));
 
         /* Check if terminal is online */
-        $query= "fping -q -r 1 -t 500 ".$this->cn;
-        exec ($query, $dummy, $retval);
-
-        if ($retval == 0){
+        if (gosaSupportDaemon::ping($this->macAddress)){
           $smarty->assign("status", _("online"));
           $smarty->assign("active", "true");
 
@@ -116,7 +113,7 @@ class terminfo extends plugin
 
           /* Use 'goto' as snmp community or the configured value from the config */
           $community= 'goto';
-          $str = search_config($this->config->data['TABS'],"terminfo","SNMPCOMMUNITY");
+         $str= $this->config->search("terminfo", "SNMPCOMMUNITY", array('tabs'));
           if(!empty($str)){
             $community = $str;
           }

diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
index 0e264ab6c0b47965c1dbd2323110121405dcaeb9..aa94042b3b41d48d55073c7aa64aa7f4ffaa82b7 100644 (file)
--- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
+++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc
@@ -301,11 +301,7 @@ class workgeneric extends plugin
     $smarty->assign("gotoNtpServers",$tmp);
         
     /* Check if workstation is online */
-    $query= "fping -q -r 1 -t 500 ".$this->cn;
-    exec ($query, $dummy, $retval);
-
-    /* Offline */
-    if ($retval == 0){
+    if (gosaSupportDaemon::ping($this->netConfigDNS->macAddress)){
       $smarty->assign("actions", array("halt" => _("Switch off"), "reboot" => _("Reboot"),
                                        "instant_update" => _("Instant update"),
                                        "update" => _("Scheduled update"),