";
+
$filter= $_SESSION['glpiDeviceRegex'];
$smarty->assign("devicehead", $listhead);
$smarty->assign("devices", $divlist->DrawList());
$smarty->assign("search_image", get_template_path('images/search.png'));
$smarty->assign("searchu_image", get_template_path('images/search_user.png'));
$smarty->assign("tree_image", get_template_path('images/tree.png'));
- $smarty->assign("infoimage", get_template_path('images/info.png'));
- $smarty->assign("launchimage", get_template_path('images/launch.png'));
+ $smarty->assign("infoimage", get_template_path('images/info_small.png'));
+ $smarty->assign("launchimage", get_template_path('images/small_filter.png'));
$smarty->assign("apply", apply_filter());
$smarty->assign("alphabet", generate_alphabet());
$smarty->assign("device_regex", $filter['device_regex']);
-
$display.= $smarty->fetch(get_template_path('glpiDeviceManagement.tpl', TRUE));
return($display);
}
@@ -235,18 +291,24 @@ class glpiDeviceManagement extends plugin
function save_object()
{
foreach($_POST as $name => $value){
+
if(preg_match("/wasOnPage_/",$name)){
$dN = base64_decode($value);
$device = $this->devices[$dN];
$type = $device['device_type'];
+ if(isset($device['designation'])){
+ $str = "designation";
+ }else{
+ $str = "name";
+ }
if(isset($_POST['useDevice_'.$value])){
- $this->Selected[$type][$device['designation']] = $device;
+ $this->Selected[$type][$device[$str]] = $device;
}else{
- if(isset($this->Selected[$type][$device['designation']])){
- unset($this->Selected[$type][$device['designation']]);
+ if(isset($this->Selected[$type][$device[$str]])){
+ unset($this->Selected[$type][$device[$str]]);
}
}
}
@@ -270,19 +332,35 @@ class glpiDeviceManagement extends plugin
/* This function cehck all created devices if you wan't to create device specific check
use >>if($attr['device_type']=="moboard")<< to create a device type depending check
- */
+ */
function check($attr)
{
- $message = array();
- if(empty($attr['designation'])){
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+
+ if(isset($attr['designation'])){
+ $str2 = "designation";
+ }else{
+ $str2 = "name";
+ }
+ if(empty($attr[$str2])){
$message[]=(_("You have to specify a valid name for this device."));
}
/* Avoid same name twice */
$devices = ($this->parent->handle->getDevices());
foreach($devices as $dev){
- if($dev['designation']==$attr['designation']){
+ /* Some devices use designation some name for name
+ */
+ if(isset($dev['designation'])){
+ $str = "designation";
+ }else{
+ $str = "name";
+ }
+
+ if($dev[$str]==$attr[$str2]){
+
/* Entries with ['ID'] already exists, and are only edited, if ID is missing we are currently creating a new entry */
if(isset($attr['ID'])){
if(!(($dev['ID'] == $attr['ID'])&&($dev['device_type']==$attr['device_type']))){
@@ -297,8 +375,8 @@ class glpiDeviceManagement extends plugin
return($message);
}
- /* This funtions displays the tempalte for all available devices
- * This funtion is also used if we create a new device
+ /* This functions displays the template for all available devices
+ * This function is also used if we create a new device
*/
function editDevice($entry)
{
@@ -306,14 +384,14 @@ class glpiDeviceManagement extends plugin
/* Transfer given data to smarty */
foreach($this->EditEntry as $name => $value){
- $smarty->assign($name,$value);
+ $smarty->assign($name,htmlentities(utf8_decode($value)));
}
/* Set default select boxes, manufacturers ... */
$smarty->assign("device_type",$entry['device_type']);
$none = array(0 => _("none"));
- $manufacturer = array_merge($none,$this->parent->handle->getEnterprisesTypes());
+ $manufacturer = array_merge($none,$this->parent->handle->getEnterprises());
$ramtypes = $this->parent->handle->getRAMTypes();
@@ -333,6 +411,9 @@ class glpiDeviceManagement extends plugin
$smarty->assign("FK_glpi_enterpriseKeys",array_flip($manufacturer));
$smarty->assign("FK_glpi_enterprises", $manufacturer);
+ $smarty->assign("formats",array("Large","Medium","Micro"));
+ $smarty->assign("formats",array("Large","Medium","Micro"));
+
$smarty->assign("formats",array("Large","Medium","Micro"));
$smarty->assign("formatKeys",array('Grand','Moyen','Micro'));
return($smarty->fetch(get_template_path('glpi_devices.tpl', TRUE)));
