Skip to content

Commit

Permalink
Rename glpi_dropdown_plugin_fusioninventory_snmp_version table to glp…
Browse files Browse the repository at this point in the history 
…i_plugin_fusioninventory_snmpversions, add PluginFusioninventorySnmpversion class in inc/snmpversion.class.php file and related files. See release fusioninventory#47
  • Loading branch information
Vincent MAZZONI committed Apr 28, 2010
1 parent 3e0840f commit f05f81c
Show file tree
Hide file tree
Showing 7 changed files with 196 additions and 11 deletions.
45 changes: 45 additions & 0 deletions ajax/snmpversion.tabs.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php
/*
* @version $Id:$
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
Copyright (C) 2003-2010 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
LICENSE
This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
GLPI is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GLPI; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--------------------------------------------------------------------------
*/

// ----------------------------------------------------------------------
// Original Author of file: Vincent MAZZONI
// Purpose of file:
// ----------------------------------------------------------------------


define('GLPI_ROOT', '../../..');
include (GLPI_ROOT . "/inc/includes.php");

Plugin::load('fusioninventory',true);

$dropdown = new PluginFusioninventorySnmpversion();
include (GLPI_ROOT . "/ajax/dropdown.common.tabs.php");

?>
44 changes: 44 additions & 0 deletions front/snmpversion.form.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php
/*
* @version $Id:$
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
Copyright (C) 2003-2010 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
LICENSE
This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
GLPI is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GLPI; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--------------------------------------------------------------------------
*/

// ----------------------------------------------------------------------
// Original Author of file: Vincent MAZZONI
// Purpose of file:
// ----------------------------------------------------------------------


define('GLPI_ROOT', '../../..');
include (GLPI_ROOT . "/inc/includes.php");

Plugin::load('fusioninventory',true);

$dropdown = new PluginFusioninventorySnmpversion();
include (GLPI_ROOT . "/front/dropdown.common.form.php");
?>
44 changes: 44 additions & 0 deletions front/snmpversion.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<?php
/*
* @version $Id:$
-------------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
Copyright (C) 2003-2010 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org
-------------------------------------------------------------------------
LICENSE
This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
GLPI is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GLPI; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
--------------------------------------------------------------------------
*/

// ----------------------------------------------------------------------
// Original Author of file: Vincent MAZZONI
// Purpose of file:
// ----------------------------------------------------------------------


define('GLPI_ROOT', '../../..');
include (GLPI_ROOT . "/inc/includes.php");

Plugin::load('fusioninventory',true);

$dropdown = new PluginFusioninventorySnmpversion();
include (GLPI_ROOT . "/front/dropdown.common.php");
?>
4 changes: 2 additions & 2 deletions hook.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ function plugin_fusioninventory_getSearchOption() {
$sopt[PLUGIN_FUSIONINVENTORY_SNMP_AUTH][30]['linkfield'] = 'ID';
$sopt[PLUGIN_FUSIONINVENTORY_SNMP_AUTH][30]['name'] = $LANG["common"][2];

$sopt[PLUGIN_FUSIONINVENTORY_SNMP_AUTH][3]['table'] = 'glpi_dropdown_plugin_fusioninventory_snmp_version';
$sopt[PLUGIN_FUSIONINVENTORY_SNMP_AUTH][3]['table'] = 'glpi_plugin_fusioninventory_snmpversions';
$sopt[PLUGIN_FUSIONINVENTORY_SNMP_AUTH][3]['field'] = 'name';
$sopt[PLUGIN_FUSIONINVENTORY_SNMP_AUTH][3]['linkfield'] = 'FK_snmp_version';
$sopt[PLUGIN_FUSIONINVENTORY_SNMP_AUTH][3]['name'] = $LANG['plugin_fusioninventory']["model_info"][2];
Expand Down Expand Up @@ -1098,7 +1098,7 @@ function plugin_fusioninventory_getDropdown() {
global $LANG;
if (isset ($_SESSION["glpi_plugin_fusioninventory_installed"]) && $_SESSION["glpi_plugin_fusioninventory_installed"] == 1) {
return array (
"glpi_dropdown_plugin_fusioninventory_snmp_version" => "SNMP version",
"glpi_plugin_fusioninventory_snmpversions" => "SNMP version",
"glpi_plugin_fusioninventory_mib_oid" => "OID MIB",
"glpi_plugin_fusioninventory_mib_object" => "Objet MIB",
"glpi_plugin_fusioninventory_mib_label" => "Label MIB"
Expand Down
2 changes: 1 addition & 1 deletion inc/communication.classes.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ function addAuth($p_sxml_node, $p_id) {
$sxml_authentication->addAttribute('ID', $p_id);
$sxml_authentication->addAttribute('COMMUNITY', $ptsnmpa->fields['community']);
$sxml_authentication->addAttribute('VERSION',
Dropdown::getDropdownName('glpi_dropdown_plugin_fusioninventory_snmp_version',
Dropdown::getDropdownName('glpi_plugin_fusioninventory_snmpversions',
$ptsnmpa->fields['FK_snmp_version']));
$sxml_authentication->addAttribute('USERNAME', $ptsnmpa->fields['sec_name']);
if ($ptsnmpa->fields['auth_protocol'] == '0') {
Expand Down
16 changes: 8 additions & 8 deletions inc/snmpauth.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ function showForm($target, $ID = '') {
echo "<tr class='tab_bg_1'>";
echo "<td align='center'>" . $LANG['plugin_fusioninventory']["model_info"][2] . "</td>";
echo "<td align='center'>";
dropdownValue("glpi_dropdown_plugin_fusioninventory_snmp_version", "FK_snmp_version",
dropdownValue("glpi_plugin_fusioninventory_snmpversions", "FK_snmp_version",
$this->fields["FK_snmp_version"], 0);
echo "</td>";
echo "</tr>";
Expand Down Expand Up @@ -194,7 +194,7 @@ function plugin_fusioninventory_snmp_connections($array=0) {

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

Expand Down Expand Up @@ -569,7 +569,7 @@ function GetInfos($ID_Device,$xml_auth_rep,$type) {
} else if ($ID_Device != "all") {
$snmp_auth["Name"] = $DB->result($result,0,"name");
$snmp_auth["snmp_version"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$DB->result($result,0,
"glpi_plugin_fusioninventory_snmpversions",$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");
Expand All @@ -585,20 +585,20 @@ function GetInfos($ID_Device,$xml_auth_rep,$type) {
$i = 2;
while ($data=$DB->fetch_array($result)) {
if (($snmp_auth[0]["snmp_version"] == Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$data["FK_snmp_version"]))
"glpi_plugin_fusioninventory_snmpversions",$data["FK_snmp_version"]))
AND ($snmp_auth[0]["community"] == $data["community"])) {

$snmp_auth[0]["ID"] = $data["ID"];
} else if (($snmp_auth[1]["snmp_version"] == Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$data["FK_snmp_version"]))
"glpi_plugin_fusioninventory_snmpversions",$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"] = Dropdown::getDropdownName(
"glpi_dropdown_plugin_fusioninventory_snmp_version",$data["FK_snmp_version"]);
"glpi_plugin_fusioninventory_snmpversions",$data["FK_snmp_version"]);
$snmp_auth[$i]["community"] = $data["community"];
$snmp_auth[$i]["sec_name"] = $data["sec_name"];
$snmp_auth[$i]["auth_protocol"] = Dropdown::getDropdownName(
Expand Down
52 changes: 52 additions & 0 deletions inc/snmpversion.class.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
<?php
/*
* @version $Id$
----------------------------------------------------------------------
GLPI - Gestionnaire Libre de Parc Informatique
Copynetwork (C) 2003-2010 by the INDEPNET Development Team.
http://indepnet.net/ http://glpi-project.org/
----------------------------------------------------------------------
LICENSE
This file is part of GLPI.
GLPI is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
GLPI is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with GLPI; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
------------------------------------------------------------------------
*/

// ----------------------------------------------------------------------
// Original Author of file: MAZZONI Vincent
// Purpose of file:
// ----------------------------------------------------------------------

if (!defined('GLPI_ROOT')) {
die("Sorry. You can't access directly to this file");
}

class PluginFusioninventorySnmpversion extends CommonDropdown {
// From CommonDBTM
public $table = 'glpi_plugin_fusioninventory_snmpversions';
public $type = 'PluginFusioninventorySnmpversion';

static function getTypeName() {
global $LANG;

return "Plugin Fusioninventory Snmp version";
}
}

?>

0 comments on commit f05f81c

Please sign in to comment.