diff --git a/plugins/admin/systems/class_glpiManufacturer.inc b/plugins/admin/systems/class_glpiManufacturer.inc
index 0c950d366a2837c35bbfc09f4249a9aa35564d9a..8e676d8eeeae19cb97c300b714d9ec1228103a29 100644 (file)
var $email ="";
var $ID =-1;
- function glpiManufacturer($config, $dn= NULL)
+ function glpiManufacturer(&$config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
$this->ui = get_userinfo();
}
/* Remove enterprise from db */
if((isset($_POST['remove_manu']))&&(isset($_POST['manufacturer']))){
- $this->parent->handle->removeEnterprise($_POST['manufacturer']);
+
+ $tmp = $this->parent->handle->is_manufacturerUsed($_POST['manufacturer']);
+ if(count($tmp)){
+
+ $names = "";
+ foreach($tmp as $name){
+ $names .= ", ".$name;
+ }
+ $names = preg_replace("/^, /","",$names);
+ $names = trim($names);
+ if(count($tmp) == 3){
+ $names .= " ...";
+ }
+ print_red(sprintf(_("You can't delete this manufacturer, it is still in use by these system(s) '%s'"),$names));
+ }else{
+ $this->parent->handle->removeEnterprise($_POST['manufacturer']);
+ }
}
/* Add new Manufactuer : Open dialog with empty fields */
$allok = false;
}
+ $attr = $this->parent->handle->getEnterprises();
+
+ if($this->ID == -1 ){
+ if(in_array($tmp['name'],$attr)){
+ $allok = false;
+ print_red(_("Specified name is already in use, please choose another one."));
+ }
+ }else{
+ unset($attr[$this->ID]);
+ if(in_array($tmp['name'],$attr)){
+ $allok = false;
+ print_red(_("Specified name is already in use, please choose another one."));
+ }
+ }
+
/* all checks are ok , so save changes */
if($allok){
if($this->Edit_Add == "add"){
{
foreach($this->attributes as $attr){
if(isset($_POST[$attr])){
- $this->$attr = $_POST[$attr];
+ $this->$attr = stripslashes($_POST[$attr]);
}
}
}