From: hickert Date: Fri, 26 Oct 2007 09:09:49 +0000 (+0000) Subject: Added community flag to configuration. Closes: #237 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d37a6cb4ab45aa42148886cdc385bb254ad7a15b;p=gosa.git Added community flag to configuration. Closes: #237 git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@7675 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/contrib/gosa.conf b/contrib/gosa.conf index 59ed6eef4..c48dc3a32 100644 --- a/contrib/gosa.conf +++ b/contrib/gosa.conf @@ -180,7 +180,8 @@ - + @@ -203,7 +204,8 @@ {else} {/if} - + @@ -212,7 +214,8 @@ - + {if $cv.enableFAI_management} {else} diff --git a/plugins/admin/systems/class_terminalInfo.inc b/plugins/admin/systems/class_terminalInfo.inc index f233e746b..f2678b4cc 100644 --- a/plugins/admin/systems/class_terminalInfo.inc +++ b/plugins/admin/systems/class_terminalInfo.inc @@ -95,11 +95,10 @@ class terminfo extends plugin $display.= _("This is a virtual terminal which has no properties to show here."); $display.= ""; } else { - /* Get template object */ + /* Get template object */ $smarty->assign("staticAddress", ""); - /* Prevent undefined variable .... */ $smarty->assign("load", progressbar(0,100,15,true)); $smarty->assign("mem", progressbar(0,100,15,true)); @@ -115,7 +114,13 @@ class terminfo extends plugin /* Fill data if we have snmp */ $host= $this->cn; + + /* Use goto as snmp community or the configured value from the config */ $community= 'goto'; + $str = search_config($this->config->data['TABS'],"terminfo","SNMPCOMMUNITY"); + if(!empty($str)){ + $community = $str; + } /* Get memory informations */ if(!is_callable("snmpget")){