Skip to content

Commit

Permalink
Use of Dropdown::showYesNo() instead of dropdownYesNo(). See release f…
Browse files Browse the repository at this point in the history 
…usioninventory#47
  • Loading branch information
Vincent MAZZONI committed Apr 28, 2010
1 parent f0c541b commit 2768a19
Show file tree
Hide file tree
Showing 7 changed files with 34 additions and 34 deletions.
10 changes: 5 additions & 5 deletions inc/agents.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ function showForm($target, $ID = '') {
if ($ptcm->getValue('inventoryocs') == "1") {
echo "<td>".$LANG['plugin_fusioninventory']['config'][3]." :</td>";
echo "<td align='center'>";
dropdownYesNo("module_inventory",$this->fields["module_inventory"]);
Dropdown::showYesNo("module_inventory",$this->fields["module_inventory"]);
echo "</td>";
} else {
echo "<td colspan='2'></td>";
Expand All @@ -125,7 +125,7 @@ function showForm($target, $ID = '') {
if ($ptcm->getValue('netdiscovery') == "1") {
echo "<td>".$LANG['plugin_fusioninventory']['config'][4]." :</td>";
echo "<td align='center'>";
dropdownYesNo("module_netdiscovery",$this->fields["module_netdiscovery"]);
Dropdown::showYesNo("module_netdiscovery",$this->fields["module_netdiscovery"]);
echo "</td>";
} else {
echo "<td colspan='2'></td>";
Expand All @@ -136,13 +136,13 @@ function showForm($target, $ID = '') {
echo "<tr class='tab_bg_1'>";
echo "<td>" . $LANG['plugin_fusioninventory']["agents"][6] . " :</td>";
echo "<td align='center'>";
dropdownYesNo("lock",$this->fields["lock"]);
Dropdown::showYesNo("lock",$this->fields["lock"]);
echo "</td>";

if ($ptcm->getValue('snmp') == "1") {
echo "<td>".$LANG['plugin_fusioninventory']['config'][7]." :</td>";
echo "<td align='center'>";
dropdownYesNo("module_snmpquery",$this->fields["module_snmpquery"]);
Dropdown::showYesNo("module_snmpquery",$this->fields["module_snmpquery"]);
echo "</td>";
} else {
echo "<td colspan='2'></td>";
Expand All @@ -166,7 +166,7 @@ function showForm($target, $ID = '') {
if ($ptcm->getValue('wol') == "1") {
echo "<td>".$LANG['plugin_fusioninventory']['config'][6]." :</td>";
echo "<td align='center'>";
dropdownYesNo("module_wakeonlan",$this->fields["module_wakeonlan"]);
Dropdown::showYesNo("module_wakeonlan",$this->fields["module_wakeonlan"]);
echo "</td>";
} else {
echo "<td colspan='2'></td>";
Expand Down
18 changes: 9 additions & 9 deletions inc/config.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ function showForm($target,$ID) {
echo "<tr class='tab_bg_1'>";
echo "<td>".$LANG['plugin_fusioninventory']["functionalities"][27]."&nbsp;:</td>";
echo "<td width='20%'>";
dropdownYesNo("ssl_only", $this->isActivated('ssl_only'));
Dropdown::showYesNo("ssl_only", $this->isActivated('ssl_only'));
echo "</td>";
echo "<td>".$LANG['plugin_fusioninventory']["functionalities"][16]."&nbsp;:</td>";
echo "<td width='20%'>";
Expand Down Expand Up @@ -162,44 +162,44 @@ function showForm($target,$ID) {
echo "<tr class='tab_bg_1'>";
echo "<td width='500'>".$LANG["networking"][14]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria1_ip", $this->isActivated('criteria1_ip'));
Dropdown::showYesNo("criteria1_ip", $this->isActivated('criteria1_ip'));
echo "</td>";
echo "<td width='500'>".$LANG["networking"][14]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria2_ip", $this->isActivated('criteria2_ip'));
Dropdown::showYesNo("criteria2_ip", $this->isActivated('criteria2_ip'));
echo "</td>";
echo "</tr>";

echo "<tr class='tab_bg_1'>";
echo "<td>".$LANG["common"][16]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria1_name", $this->isActivated('criteria1_name'));
Dropdown::showYesNo("criteria1_name", $this->isActivated('criteria1_name'));
echo "</td>";
echo "<td>".$LANG["common"][16]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria2_name", $this->isActivated('criteria2_name'));
Dropdown::showYesNo("criteria2_name", $this->isActivated('criteria2_name'));
echo "</td>";
echo "</tr>";

echo "<tr class='tab_bg_1'>";
echo "<td>".$LANG["common"][19]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria1_serial", $this->isActivated('criteria1_serial'));
Dropdown::showYesNo("criteria1_serial", $this->isActivated('criteria1_serial'));
echo "</td>";
echo "<td>".$LANG["common"][19]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria2_serial", $this->isActivated('criteria2_serial'));
Dropdown::showYesNo("criteria2_serial", $this->isActivated('criteria2_serial'));
echo "</td>";
echo "</tr>";

echo "<tr class='tab_bg_1'>";
echo "<td>".$LANG['device_iface'][2]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria1_macaddr", $this->isActivated('criteria1_macaddr'));
Dropdown::showYesNo("criteria1_macaddr", $this->isActivated('criteria1_macaddr'));
echo "</td>";
echo "<td>".$LANG['device_iface'][2]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("criteria2_macaddr", $this->isActivated('criteria2_macaddr'));
Dropdown::showYesNo("criteria2_macaddr", $this->isActivated('criteria2_macaddr'));
echo "</td>";
echo "</tr>";

Expand Down
10 changes: 5 additions & 5 deletions inc/configmodules.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,29 +95,29 @@ function showForm($target,$ID) {
echo "<tr class='tab_bg_1'>";
echo "<td width='30%'>".$LANG['plugin_fusioninventory']['config'][2]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("snmp", $this->isActivated('snmp'));
Dropdown::showYesNo("snmp", $this->isActivated('snmp'));
echo "</td>";
echo "<td width='20%'>".$LANG['plugin_fusioninventory']['config'][4]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("netdiscovery", $this->isActivated('netdiscovery'));
Dropdown::showYesNo("netdiscovery", $this->isActivated('netdiscovery'));
echo "</td>";
echo "</tr>";

echo "<tr class='tab_bg_1'>";
echo "<td>".$LANG['plugin_fusioninventory']['config'][3]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("inventoryocs", $this->isActivated('inventoryocs'));
Dropdown::showYesNo("inventoryocs", $this->isActivated('inventoryocs'));
echo "</td>";
echo "<td>".$LANG['plugin_fusioninventory']['config'][5]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("remotehttpagent", $this->isActivated('remotehttpagent'));
Dropdown::showYesNo("remotehttpagent", $this->isActivated('remotehttpagent'));
echo "</td>";
echo "</tr>";

echo "<tr class='tab_bg_1'>";
echo "<td>".$LANG['plugin_fusioninventory']['config'][6]."&nbsp;:</td>";
echo "<td>";
dropdownYesNo("wol", $this->isActivated('wol'));
Dropdown::showYesNo("wol", $this->isActivated('wol'));
echo "</td>";
echo "<td colspan='2'>";
echo "</td>";
Expand Down
16 changes: 8 additions & 8 deletions inc/constructdevice.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,9 @@ function manageWalks($target, $ID) {
}
} else {
if (isset($mapping_pre_vlan[$before])) {
dropdownYesNo("vlan_".$oid_id_before, 1);
Dropdown::showYesNo("vlan_".$oid_id_before, 1);
} else {
dropdownYesNo("vlan_".$oid_id_before);
Dropdown::showYesNo("vlan_".$oid_id_before);
}
}
echo "</th>";
Expand All @@ -326,7 +326,7 @@ function manageWalks($target, $ID) {
echo "<img src='".$CFG_GLPI["root_doc"]."/plugins/fusioninventory/pics/bookmark_off.png'/>";
}
} else {
dropdownYesNo("oid_port_counter_".$oid_id_before);
Dropdown::showYesNo("oid_port_counter_".$oid_id_before);
}
echo "</th>";
echo "<th>";
Expand All @@ -338,7 +338,7 @@ function manageWalks($target, $ID) {
echo "<img src='".$CFG_GLPI["root_doc"]."/plugins/fusioninventory/pics/bookmark_off.png'/>";
}
} else {
dropdownYesNo("oid_port_dyn_".$oid_id_before);
Dropdown::showYesNo("oid_port_dyn_".$oid_id_before);
}
echo "</th>";
echo "</tr>";
Expand Down Expand Up @@ -420,19 +420,19 @@ function manageWalks($target, $ID) {
}
} else {
if (isset($mapping_pre_vlan[$before])) {
dropdownYesNo("vlan_".$oid_id_before, 1);
Dropdown::showYesNo("vlan_".$oid_id_before, 1);
} else {
dropdownYesNo("vlan_".$oid_id_before);
Dropdown::showYesNo("vlan_".$oid_id_before);
}
}
echo "</th>";
echo "<th>";
echo $LANG['plugin_fusioninventory']["mib"][6]." : ";
dropdownYesNo("oid_port_counter_".$oid_id_before);
Dropdown::showYesNo("oid_port_counter_".$oid_id_before);
echo "</th>";
echo "<th>";
echo $LANG['plugin_fusioninventory']["mib"][7]." : ";
dropdownYesNo("oid_port_dyn_".$oid_id_before);
Dropdown::showYesNo("oid_port_dyn_".$oid_id_before);
echo "</th>";
echo "</tr>";
echo "<tr>";
Expand Down
6 changes: 3 additions & 3 deletions inc/mib.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,12 +238,12 @@ function showForm($target,$ID) {

echo "<td align='center'>";
//echo "<input name='oid_port_counter' value='0' type='checkbox'>";
dropdownYesNo("oid_port_counter");
Dropdown::showYesNo("oid_port_counter");
echo "</td>";

echo "<td align='center'>";
//echo "<input name='oid_port_dyn' value='0' type='checkbox'>";
dropdownYesNo("oid_port_dyn");
Dropdown::showYesNo("oid_port_dyn");
echo "</td>";

echo "<td align='center'>";
Expand All @@ -267,7 +267,7 @@ function showForm($target,$ID) {

if ($type_model == NETWORKING_TYPE) {
echo "<td align='center'>";
dropdownYesNo("vlan");
Dropdown::showYesNo("vlan");
echo "</td>";
}

Expand Down
4 changes: 2 additions & 2 deletions inc/rangeip.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,14 @@ function showForm($target, $ID = '') {
echo "<tr class='tab_bg_1'>";
echo "<td align='center'>" . $LANG['plugin_fusioninventory']["discovery"][3] . "</td>";
echo "<td align='center'>";
dropdownYesNo("discover",$this->fields["discover"]);
Dropdown::showYesNo("discover",$this->fields["discover"]);
echo "</td>";
echo "</tr>";

echo "<tr class='tab_bg_1'>";
echo "<td align='center'>" . $LANG['plugin_fusioninventory']["rangeip"][3] . "</td>";
echo "<td align='center'>";
dropdownYesNo("query",$this->fields["query"]);
Dropdown::showYesNo("query",$this->fields["query"]);
echo "</td>";
echo "</tr>";

Expand Down
4 changes: 2 additions & 2 deletions inc/unknowndevice.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ function showForm($target, $ID = '') {
echo "<tr class='tab_bg_1'>";
echo "<td align='center'>" . $LANG['plugin_fusioninventory']["unknown"][2] . " :</td>";
echo "<td align='center'>";
dropdownYesNo("accepted", $this->fields["accepted"]);
Dropdown::showYesNo("accepted", $this->fields["accepted"]);
echo "</td>";

echo "<td align='center'>" . $LANG['common'][20] . " : </td>";
Expand Down Expand Up @@ -213,7 +213,7 @@ function showForm($target, $ID = '') {
echo "<tr class='tab_bg_1'>";
echo "<td align='center'>" . $LANG['plugin_fusioninventory']["functionalities"][3] . " :</td>";
echo "<td align='center'>";
dropdownYesNo("snmp", $this->fields["snmp"]);
Dropdown::showYesNo("snmp", $this->fields["snmp"]);
echo "</td>";

if ($this->fields["snmp"] == "1") {
Expand Down

0 comments on commit 2768a19

Please sign in to comment.