Skip to content

Commit

Permalink
Use of Dropdown::getDropdownName() instead of getDropdownName(). See …
Browse files Browse the repository at this point in the history 
…release fusioninventory#47
  • Loading branch information
Vincent MAZZONI committed Apr 27, 2010
1 parent 3d2912b commit 431e50a
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 44 deletions.
12 changes: 6 additions & 6 deletions hook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ function plugin_fusioninventory_giveItem($type,$ID,$data,$num) {
$plugin_fusioninventory_snmp = new PluginFusionInventorySNMP;
$FK_model_DB = $plugin_fusioninventory_snmp->GetSNMPModel($data["ID"],$type);
$out = "<a href=\"" . $CFG_GLPI["root_doc"] . "/plugins/fusioninventory/front/plugin_fusioninventory.models.form.php?ID=" . $FK_model_DB . "\">";
$out .= getDropdownName("glpi_plugin_fusioninventory_model_infos", $FK_model_DB, 0);
$out .= Dropdown::getDropdownName("glpi_plugin_fusioninventory_model_infos", $FK_model_DB, 0);
$out .= "</a>";
return "<center>".$out."</center>";
break;
Expand All @@ -749,7 +749,7 @@ function plugin_fusioninventory_giveItem($type,$ID,$data,$num) {
$plugin_fusioninventory_snmp = new PluginFusionInventorySNMPAuth;
$FK_auth_DB = $plugin_fusioninventory_snmp->GetSNMPAuth($data["ID"],$type);
$out = "<a href=\"" . $CFG_GLPI["root_doc"] . "/plugins/fusioninventory/front/plugin_fusioninventory.snmp_auth.form.php?ID=" . $FK_auth_DB . "\">";
$out .= getDropdownName("glpi_plugin_fusioninventory_snmp_connection", $FK_auth_DB, 0);
$out .= Dropdown::getDropdownName("glpi_plugin_fusioninventory_snmp_connection", $FK_auth_DB, 0);
$out .= "</a>";
return "<center>".$out."</center>";
break;
Expand Down Expand Up @@ -814,7 +814,7 @@ function plugin_fusioninventory_giveItem($type,$ID,$data,$num) {
$plugin_fusioninventory_snmp = new PluginFusionInventorySNMP;
$FK_model_DB = $plugin_fusioninventory_snmp->GetSNMPModel($data["ID"],$type);
$out = "<a href=\"" . $CFG_GLPI["root_doc"] . "/plugins/fusioninventory/front/plugin_fusioninventory.models.form.php?ID=" . $FK_model_DB . "\">";
$out .= getDropdownName("glpi_plugin_fusioninventory_model_infos", $FK_model_DB, 0);
$out .= Dropdown::getDropdownName("glpi_plugin_fusioninventory_model_infos", $FK_model_DB, 0);
$out .= "</a>";
return "<center>".$out."</center>";
break;
Expand All @@ -824,7 +824,7 @@ function plugin_fusioninventory_giveItem($type,$ID,$data,$num) {
$plugin_fusioninventory_snmp = new PluginFusionInventorySNMPAuth;
$FK_auth_DB = $plugin_fusioninventory_snmp->GetSNMPAuth($data["ID"],$type);
$out = "<a href=\"" . $CFG_GLPI["root_doc"] . "/plugins/fusioninventory/front/plugin_fusioninventory.snmp_auth.form.php?ID=" . $FK_auth_DB . "\">";
$out .= getDropdownName("glpi_plugin_fusioninventory_snmp_connection", $FK_auth_DB, 0);
$out .= Dropdown::getDropdownName("glpi_plugin_fusioninventory_snmp_connection", $FK_auth_DB, 0);
$out .= "</a>";
return "<center>".$out."</center>";
break;
Expand Down Expand Up @@ -1013,7 +1013,7 @@ function plugin_fusioninventory_giveItem($type,$ID,$data,$num) {

// ** Location of switch
case "glpi_dropdown_locations.ID" :
$out = getDropdownName("glpi_dropdown_locations",$data["ITEM_$num"]);
$out = Dropdown::getDropdownName("glpi_dropdown_locations",$data["ITEM_$num"]);
return "<center>".$out."</center>";
break;

Expand All @@ -1032,7 +1032,7 @@ function plugin_fusioninventory_giveItem($type,$ID,$data,$num) {
// ** Display entity name
case "glpi_entities.name" :
if ($data["ITEM_$num"] == '') {
$out = getDropdownName("glpi_entities",$data["ITEM_$num"]);
$out = Dropdown::getDropdownName("glpi_entities",$data["ITEM_$num"]);
return "<center>".$out."</center>";
}
break;
Expand Down
6 changes: 3 additions & 3 deletions inc/communication.classes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,22 +343,22 @@ function addAuth($p_sxml_node, $p_id) {
$sxml_authentication->addAttribute('ID', $p_id);
$sxml_authentication->addAttribute('COMMUNITY', $ptsnmpa->fields['community']);
$sxml_authentication->addAttribute('VERSION',
getDropdownName('glpi_dropdown_plugin_fusioninventory_snmp_version',
Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_snmp_version',
$ptsnmpa->fields['FK_snmp_version']));
$sxml_authentication->addAttribute('USERNAME', $ptsnmpa->fields['sec_name']);
if ($ptsnmpa->fields['auth_protocol'] == '0') {
$sxml_authentication->addAttribute('AUTHPROTOCOL', '');
} else {
$sxml_authentication->addAttribute('AUTHPROTOCOL',
getDropdownName('glpi_dropdown_plugin_fusioninventory_snmp_auth_auth_protocol',
Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_snmp_auth_auth_protocol',
$ptsnmpa->fields['auth_protocol']));
}
$sxml_authentication->addAttribute('AUTHPASSPHRASE', $ptsnmpa->fields['auth_passphrase']);
if ($ptsnmpa->fields['priv_protocol'] == '0') {
$sxml_authentication->addAttribute('PRIVPROTOCOL', '');
} else {
$sxml_authentication->addAttribute('PRIVPROTOCOL',
getDropdownName('glpi_dropdown_plugin_fusioninventory_snmp_auth_priv_protocol',
Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_snmp_auth_priv_protocol',
$ptsnmpa->fields['priv_protocol']));
}
$sxml_authentication->addAttribute('PRIVPASSPHRASE', $ptsnmpa->fields['priv_passphrase']);
Expand Down
6 changes: 3 additions & 3 deletions inc/constructdevice.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ function generateDiscovery() {
$result_serial=$DB->query($query_serial);
if ($DB->numrows($result_serial)) {
$line = mysql_fetch_assoc($result_serial);
$sxml_device->addAttribute('SERIAL', getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',
$sxml_device->addAttribute('SERIAL', Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',
$line['mib_oid_id']));
}

Expand All @@ -698,10 +698,10 @@ function generateDiscovery() {
if ($DB->numrows($result_serial)) {
$line = mysql_fetch_assoc($result_serial);
if ($line['mapping_name'] == "macaddr") {
$sxml_device->addAttribute('MAC', getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',
$sxml_device->addAttribute('MAC', Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',
$line['mib_oid_id']));
} else {
$sxml_device->addAttribute('MACDYN', getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',
$sxml_device->addAttribute('MACDYN', Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',
$line['mib_oid_id']));
}
}
Expand Down
8 changes: 4 additions & 4 deletions inc/display.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,15 @@ static function mib_management() {
while ($data=$DB->fetch_array($result)) {
echo "<tr class='tab_bg_1'>";
echo "<td align='center'><a href=''><b>
".getDropdownName("glpi_plugin_fusioninventory_model_infos",$data["FK_model_infos"]).
".Dropdown::getDropdownName("glpi_plugin_fusioninventory_model_infos",$data["FK_model_infos"]).
"</b></a></td>";
echo "<td align='center'>
".getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_label",$data["FK_mib_oid"])."</td>";
".Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_label",$data["FK_mib_oid"])."</td>";
echo "<td align='center'>
".getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_object",$data["FK_mib_object"]).
".Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_object",$data["FK_mib_object"]).
"</td>";
echo "<td align='center'>
".getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_oid",$data["FK_mib_oid"])."</td>";
".Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_oid",$data["FK_mib_oid"])."</td>";
echo "</tr>";

}
Expand Down
10 changes: 5 additions & 5 deletions inc/mibnetworking.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ function showForm($target,$ID) {
echo "</td>";

echo "<td align='center'>";
echo getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_label",$data["FK_mib_label"]);
echo Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_label",$data["FK_mib_label"]);
echo "</td>";

echo "<td align='center'>";
$object_used[] = $data["FK_mib_object"];
echo getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_object",
echo Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_object",
$data["FK_mib_object"]);
echo "</td>";

echo "<td align='center'>";
echo getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_oid",$data["FK_mib_oid"]);
echo Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_oid",$data["FK_mib_oid"]);
echo "</td>";

echo "<td align='center'>";
Expand Down Expand Up @@ -342,14 +342,14 @@ function oidList($p_sxml_node,$p_id) {
case 0:
$ptc->addGet($p_sxml_node,
$data['mapping_name'],
getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',$data['FK_mib_oid']),
Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',$data['FK_mib_oid']),
$data['mapping_name'], $data['vlan']);
break;

case 1:
$ptc->addWalk($p_sxml_node,
$data['mapping_name'],
getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',$data['FK_mib_oid']),
Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',$data['FK_mib_oid']),
$data['mapping_name'], $data['vlan']);
break;

Expand Down
2 changes: 1 addition & 1 deletion inc/modelinfos.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ function oidlist($ID_Device,$type) {
$exclude = array();
while ($data=$DB->fetch_array($result)) {
$oids[$data['oid_port_counter']][$data['oid_port_dyn']][$data['mapping_name']] =
getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',$data['FK_mib_oid']);
Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_mib_oid',$data['FK_mib_oid']);
}
return $oids;
}
Expand Down
2 changes: 1 addition & 1 deletion inc/networking.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ function load($p_id='') {
**/
function updateDB() {
if (array_key_exists('model', $this->ptcdUpdates)) {
$manufacturer = getDropdownName("glpi_dropdown_manufacturer",
$manufacturer = Dropdown::getDropdownName("glpi_dropdown_manufacturer",
$this->getValue('FK_glpi_enterprise'));
$this->ptcdUpdates['model'] = externalImportDropdown("glpi_dropdown_model_networking",
$this->ptcdUpdates['model'], 0,
Expand Down
2 changes: 1 addition & 1 deletion inc/printer.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function updateDB() {
global $DB;

if (array_key_exists('model', $this->ptcdUpdates)) {
$manufacturer = getDropdownName("glpi_dropdown_manufacturer",
$manufacturer = Dropdown::getDropdownName("glpi_dropdown_manufacturer",
$this->getValue('FK_glpi_enterprise'));
$this->ptcdUpdates['model'] = externalImportDropdown("glpi_dropdown_model_printers",
$this->ptcdUpdates['model'], 0,
Expand Down
4 changes: 2 additions & 2 deletions inc/snmp.importexport.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ function plugin_fusioninventory_export($ID_model) {
while ($data=$DB->fetch_array($result)) {
$xml .= " <oidobject>\n";
$xml .= " <object><![CDATA[".
getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_object",$data["FK_mib_object"]).
Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_object",$data["FK_mib_object"]).
"]]></object>\n";
$xml .= " <oid><![CDATA[".
getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_oid",$data["FK_mib_oid"])."]]></oid>\n";
Dropdown::getDropdownName("glpi_dropdown_plugin_fusioninventory_mib_oid",$data["FK_mib_oid"])."]]></oid>\n";
$xml .= " <portcounter>".$data["oid_port_counter"]."</portcounter>\n";
$xml .= " <dynamicport>".$data["oid_port_dyn"]."</dynamicport>\n";
$xml .= " <mapping_type>".$data["mapping_type"]."</mapping_type>\n";
Expand Down
2 changes: 1 addition & 1 deletion inc/snmp.networking.classes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ class='tab_bg_1_2'>".$link1;
echo "<table cellpadding='0' cellspacing='0'>";
while ($line = $DB->fetch_array($result_vlan)) {
$used[]=$line["FK_vlan"];
$a_vlan = getDropdownName("glpi_dropdown_vlan", $line["FK_vlan"],1);
$a_vlan = Dropdown::getDropdownName("glpi_dropdown_vlan", $line["FK_vlan"],1);
echo "<tr><td>" . $a_vlan['name']." [".$a_vlan['comments']."]";
echo "</td><td>";
if ($canedit) {
Expand Down
34 changes: 17 additions & 17 deletions inc/snmpauth.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ function plugin_fusioninventory_snmp_connections($array=0) {
break;

case 3:
$snmp_version[$i] = getDropdownName(
$snmp_version[$i] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$item);
if ($snmp_version[$i] == "&nbsp;") {
$snmp_version[$i] = "";
Expand All @@ -209,7 +209,7 @@ function plugin_fusioninventory_snmp_connections($array=0) {
break;

case 7:
$auth_protocol[$i] = getDropdownName(
$auth_protocol[$i] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_auth_protocol",$item);
if ($auth_protocol[$i] == "&nbsp;") {
$auth_protocol[$i] = "";
Expand All @@ -221,7 +221,7 @@ function plugin_fusioninventory_snmp_connections($array=0) {
break;

case 9:
$priv_protocol[$i] = getDropdownName(
$priv_protocol[$i] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_priv_protocol",$item);
if ($priv_protocol[$i] == "&nbsp;") {
$priv_protocol[$i] = "";
Expand Down Expand Up @@ -478,11 +478,11 @@ function GetInfos($ID_Device,$xml_auth_rep,$type) {

case 3:
if (($recup == "1") AND ($ID_Device != "all")) {
$snmp_auth["snmp_version"] = getDropdownName(
$snmp_auth["snmp_version"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$item);
}
if ($ID_Device == "all") {
$snmp_auth[($i+2)]["snmp_version"] = getDropdownName(
$snmp_auth[($i+2)]["snmp_version"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$item);
}
break;
Expand All @@ -507,11 +507,11 @@ function GetInfos($ID_Device,$xml_auth_rep,$type) {

case 7:
if (($recup == "1") AND ($ID_Device != "all")) {
$snmp_auth["auth_protocol"] = getDropdownName(
$snmp_auth["auth_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_auth_protocol",$item);
}
if ($ID_Device == "all") {
$snmp_auth[($i+2)]["auth_protocol"] = getDropdownName(
$snmp_auth[($i+2)]["auth_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_auth_protocol",$item);
}
break;
Expand All @@ -527,11 +527,11 @@ function GetInfos($ID_Device,$xml_auth_rep,$type) {

case 9:
if (($recup == "1") AND ($ID_Device != "all")) {
$snmp_auth["priv_protocol"] = getDropdownName(
$snmp_auth["priv_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_priv_protocol",$item);
}
if ($ID_Device == "all") {
$snmp_auth[($i+2)]["priv_protocol"] = getDropdownName(
$snmp_auth[($i+2)]["priv_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_priv_protocol",$item);
}
break;
Expand Down Expand Up @@ -568,43 +568,43 @@ function GetInfos($ID_Device,$xml_auth_rep,$type) {
$snmp_auth["priv_passphrase"] = "";
} else if ($ID_Device != "all") {
$snmp_auth["Name"] = $DB->result($result,0,"name");
$snmp_auth["snmp_version"] = getDropdownName(
$snmp_auth["snmp_version"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$DB->result($result,0,
"FK_snmp_version"));
$snmp_auth["community"] = $DB->result($result,0,"community");
$snmp_auth["sec_name"] = $DB->result($result,0,"sec_name");
$snmp_auth["auth_protocol"] = getDropdownName(
$snmp_auth["auth_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_auth_protocol",$DB->result($result,0,
"auth_protocol"));
$snmp_auth["auth_passphrase"] = $DB->result($result,0,"auth_passphrase");
$snmp_auth["priv_protocol"] = getDropdownName(
$snmp_auth["priv_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_priv_protocol",$DB->result($result,0,
"priv_protocol"));
$snmp_auth["priv_passphrase"] = $DB->result($result,0,"priv_passphrase");
} else if ($ID_Device == "all") {
$i = 2;
while ($data=$DB->fetch_array($result)) {
if (($snmp_auth[0]["snmp_version"] == getDropdownName(
if (($snmp_auth[0]["snmp_version"] == Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$data["FK_snmp_version"]))
AND ($snmp_auth[0]["community"] == $data["community"])) {

$snmp_auth[0]["ID"] = $data["ID"];
} else if (($snmp_auth[1]["snmp_version"] == getDropdownName(
} else if (($snmp_auth[1]["snmp_version"] == Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$data["FK_snmp_version"]))
AND ($snmp_auth[1]["community"] == $data["community"])) {

$snmp_auth[1]["ID"] = $data["ID"];
} else {
$snmp_auth[$i]["ID"] = $data["ID"];
$snmp_auth[$i]["Name"] = $data["name"];
$snmp_auth[$i]["snmp_version"] = getDropdownName(
$snmp_auth[$i]["snmp_version"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$data["FK_snmp_version"]);
$snmp_auth[$i]["community"] = $data["community"];
$snmp_auth[$i]["sec_name"] = $data["sec_name"];
$snmp_auth[$i]["auth_protocol"] = getDropdownName(
$snmp_auth[$i]["auth_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_auth_protocol",$data["auth_protocol"]);
$snmp_auth[$i]["auth_passphrase"] = $data["auth_passphrase"];
$snmp_auth[$i]["priv_protocol"] = getDropdownName(
$snmp_auth[$i]["priv_protocol"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_auth_priv_protocol",$data["priv_protocol"]);
$snmp_auth[$i]["priv_passphrase"] = $data["priv_passphrase"];
$i++;
Expand Down

0 comments on commit 431e50a

Please sign in to comment.