X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_glpi.inc;h=162e0fed6eab5f97e5e5e4e9d4fd7c1300d13381;hb=7c4b0a6716966dd6a0a0fe550a1e2fe8c334d4dc;hp=eb8c5fe95b79b8d2aa7505bf904763f368f3ff89;hpb=290bdaa4281b5f1eab4d7dd46d02cc03fb864550;p=gosa.git

diff --git a/include/class_glpi.inc b/include/class_glpi.inc
index eb8c5fe95..162e0fed6 100644
--- a/include/class_glpi.inc
+++ b/include/class_glpi.inc
@@ -115,6 +115,7 @@ class glpiDB{
 			foreach($tmp as $t){
 				$ret[$t['ID']]=$t['name'];
 			}
+			asort($ret);
 			return($ret);
 		}else{
 			echo "not connected";
@@ -127,7 +128,6 @@ class glpiDB{
 	*/
 	function updateSystemType($name,$id)
 	{
-
 		if($this->is_connected){
 			$tmp = $this->query("SELECT * FROM glpi_type_computers WHERE ID=".$id.";");
 			if(isset($tmp[0])){
@@ -180,6 +180,23 @@ class glpiDB{
 		}
 	}
 
+	/* System type is used */
+	function is_systemTypeUsed($ID){
+		if($this->is_connected){
+			$ret = array();
+			$qry="SELECT name,type FROM glpi_computers WHERE type=".$ID." LIMIT 3;";
+			$res = $this->query($qry);
+			foreach($res as $val){
+				$ret[$val['name']] = $val['name'];
+			}
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+
 	/* Manufacturer 
 	   Returns all defined manufacturers
 	*/	
@@ -187,10 +204,11 @@ class glpiDB{
 	{
 		if($this->is_connected){
 			$ret = array();
-			$tmp = $this->query("SELECT * FROM glpi_enterprises;");
+			$tmp = $this->query("SELECT * FROM glpi_enterprises ORDER BY name;");
 			foreach($tmp as $t){
 				$ret[$t['ID']]=$t['name'];
 			}
+			
 			return($ret);
 		}else{
 			echo "not connected";
@@ -303,24 +321,46 @@ class glpiDB{
 	/* Operating systems 
 	   Returns all OSs
 	 */
-	function getOSTypes()
+	function getOSTypes($keys = false)
 	{
 		if($this->is_connected){
 			$ret = array();
-			$tmp=($this->query("SELECT * FROM glpi_dropdown_os;"));
+			$tmp=($this->query("SELECT * FROM glpi_dropdown_os ORDER by name;"));
 
-			foreach($tmp as $t){
-				$ret[$t['ID']]=$t['name'];
+			if($keys){
+				foreach($tmp as $t){
+					$ret[$t['name']]=$t['ID'];
+				}
+			}else{
+				foreach($tmp as $t){
+					$ret[$t['ID']]=$t['name'];
+				}
 			}
+			return($ret);
 
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* Operating system is used ? */
+	function is_osUsed($ID){
+		if($this->is_connected){
+			$ret = array();
+			$qry="SELECT name,type FROM glpi_computers WHERE os=".$ID." LIMIT 3;";
+			$res = $this->query($qry);
+			foreach($res as $val){
+				$ret[$val['name']] = $val['name'];
+			}
 			return($ret);
-				
 		}else{
 			echo "not connected";
 			return(false);
 		}
 	}
 
+
 	/*  Operating systems
 		Add a new operating system to the dropdown menus   
 	 */
@@ -364,7 +404,6 @@ class glpiDB{
 	*/
 	function updateOS($name,$id)
 	{
-
 		if($this->is_connected){
 			$tmp = $this->query("SELECT * FROM glpi_dropdown_os WHERE ID=".$id.";");
 			if(isset($tmp[0])){
@@ -578,6 +617,41 @@ class glpiDB{
 		return(false);
 	}
 
+		
+	/* Check if given device is used by some accounts
+     *  (helpfull to avoid removement of used devices)
+     */
+	function is_deviceUsed($item)
+	{
+		$deviceMappingGOsaGlpi 		= array_flip($this->deviceMappingGOsaGlpi);
+		$deviceMappingTableNameID 	= $this->deviceMappingTableNameID;
+		if($this->is_connected){
+			$tablename =  $deviceMappingGOsaGlpi[$item['device_type']];
+			$type = $item['device_type'];
+
+			$ret = array();
+
+			if($type=="monitor"){
+				$str = "SELECT c.name FROM glpi_connect_wire as w, glpi_computers as c WHERE w.end1=".$item['ID']." AND w.end2 = c.ID AND w.type=4;"; 
+			}else{
+				$str = "SELECT c.name FROM glpi_computer_device as d, glpi_computers as c WHERE d.FK_computers=c.ID AND FK_device=".$item['ID']." AND device_type=".$deviceMappingTableNameID[$type]." ;";
+			}
+
+			$res = $this->query($str);
+	
+			foreach($res as $val){
+				$ret[$val['name']] = $val['name'];
+			}	
+
+			return($ret);//count($this->query($str)));
+		}else{
+			echo "not connected";
+			return(false);
+		}
+			
+	}
+
+
 	/* This functions deletes a specified entry 
      * from our device tables 
      */
@@ -896,9 +970,15 @@ class glpiDB{
 	
 	function getAttachments()
 	{
+		$ret = array();
 		if($this->is_connected){
 			$qry = "SELECT * FROM glpi_docs WHERE name!='';";
-			$ret = $this->query($qry);
+			$re = $this->query($qry);
+
+			foreach($re as $entry){
+				$ret[$entry['ID']]=$entry;
+			}
+
 			return($ret);
 		}else{
             echo "not connected";
@@ -936,7 +1016,6 @@ class glpiDB{
 					$values = preg_replace("/, $/","",$values);
 					$namen  = preg_replace("/, $/","",$namen);
 					$str .= "(".$namen.") VALUES (".$values.");";
-					print $str;
 				}else{
 					$str = "UPDATE glpi_docs SET ";
 					foreach($tmp as $name => $value){	
@@ -958,7 +1037,27 @@ class glpiDB{
 		}
 	}
 
+	
+	/* Check if given attachment id is used in any Device 
+		( - avoid removing of used attachments)
+     */
+	function is_attachmentUsed($id)
+	{
+		if($this->is_connected){
+			$ret = array();
+			$qry = "SELECT t.name FROM glpi_computers as t, glpi_doc_device WHERE t.ID = glpi_doc_device.FK_device AND FK_doc =".$id." LIMIT 3;";
+			$res = $this->query($qry);
+			foreach($res as $val){
+				$ret[$val['name']] = $val['name'];
+			}
+			return($ret);
+		}else{
+            echo "not connected";
+            return(false);
+        }
+	}
 
+		
 	/* Monitor handling 
      */
     function getMonitors()
@@ -1043,6 +1142,634 @@ class glpiDB{
         }
 	}
 
+	
+	/* Printer functions
+     */
+
+	/* is printer type used ? 
+     */
+	function is_printerTypeUsed($id)
+	{
+		if($this->is_connected){
+			$qry = "SELECT * FROM glpi_printers WHERE type=".$id.";";
+			$res = $this->query( $qry);
+			$ret =array();
+			foreach($res as $entry){
+				$ret[$entry['ID']] = $entry['name'];
+			}
+			return($ret);
+		}else{
+            echo "not connected";
+            return(false);
+        }
+	}
+
+	/* This functions checks if the selected computer/network 
+	   device is already available in the db
+	 */
+	function is_printer_account($dn)
+	{
+		if(!$this->is_connected){
+			$this->lasterror ="Can't query anything, if we aren't connected.";
+			return(false);
+		}else{
+			$qry = "SELECT * FROM glpi_printers WHERE name='".$dn."';";
+			$res = $this->query($qry);
+			if(count($res)==0){
+				return(false);
+			}else{
+				return(true);
+			}
+		}
+	}
+
+	/* This function returns all available data 
+       from a specified dn
+     */
+	function getPrinterInformations($name)
+	{
+		if($this->is_connected){	
+			$ret = $this->query("SELECT * FROM glpi_printers WHERE name='".$name."';");
+			return($ret);		
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* Get Printer attachments
+     */
+	function getAssignPrinterAttachments($id)
+	{
+
+		if($this->is_connected){
+			$qry= "SELECT * FROM glpi_doc_device WHERE (device_type=3) AND (FK_device=".$id.");";
+			$ret = $this->query($qry);
+			return($ret);
+		}else{
+            echo "not connected";
+            return(false);
+        }
+	}
+
+	/* Printer types 
+       Returns all defined printer types 
+	 */
+	function getPrinterTypes()
+	{
+		if($this->is_connected){
+			$ret = array();
+			$tmp = ($this->query("SELECT * FROM glpi_type_printers ORDER BY name; "));
+			foreach($tmp as $t){
+				$ret[$t['ID']]=$t['name'];
+			}
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* Add pritner types 
+       Add one entry to the printer types 
+     */
+	function addPrinterType($name)
+	{
+		if($this->is_connected){
+			$tmp = $this->query("SELECT * FROM glpi_type_printers WHERE name='".$name."';");
+			if(isset($tmp[0])){
+				//echo "such an entry already exists";
+				return(false);
+			}else{	
+				return($this->query("INSERT INTO glpi_type_printers (name) VALUES ('".$name."');"));
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* remove printer types 
+       Remove one entry from the printer types (specified by ID=$id)
+     */
+	function removePrinterType($id)
+	{
+		if($this->is_connected){
+			$tmp = $this->query("SELECT * FROM glpi_type_printers WHERE ID=".$id.";");
+			if(isset($tmp[0])){
+				return($this->query("DELETE FROM glpi_type_printers WHERE ID=".$id.";"));	
+			}else{
+				echo "can't remove not existing entry";
+				return(false);	
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* Update printer types 
+	   Update a printer type 	
+	*/
+	function updatePrinterType($name,$id)
+	{
+
+		if($this->is_connected){
+			$tmp = $this->query("SELECT * FROM glpi_type_printers WHERE ID=".$id.";");
+			if(isset($tmp[0])){
+				return($this->query("UPDATE glpi_type_printers SET name='".$name."' WHERE ID=".$id.";"));	
+			}else{
+				echo "can't update not existing entry";
+				return(false);	
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+
+	/*  This fucntions updates an already existing entry 
+     */
+	function updatePrinterInformations($array,$name)
+	{
+		if(!is_array($array)){
+			echo "updatePrinterInformations: first paraeter must be an array";
+		}elseif($this->is_connected){
+			$tmp = $this->query("SELECT * FROM  glpi_printers WHERE name='".$name."';");
+			if(isset($tmp[0])){
+
+				$atr = array(	"ID","name","serial","otherserial","contact","contact_num",
+						"tech_num","comments","date_mod","location","domain","network","ramSize","flags_serial","flags_par","flags_usb",
+						"model","type","is_template","tplname","FK_glpi_enterprise","deleted");
+				$v = "";
+				foreach($atr as $at){
+					if(isset($array[$at])){
+						$v .= " ".$at."='".$array[$at]."', ";
+					}
+				}
+				if(empty($v)){
+					echo "updateSystemInformations: no attributes given ";
+					return(false);
+				}else{
+					$v = preg_replace("/, $/","",$v);
+					return($this->query("UPDATE glpi_printers SET ".$v." WHERE name='".$name."';"));
+				}
+			}else{
+				echo "can't update not existing entry";
+				return(false);
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+
+	}
+
+	/* This function adds a new inventory settings for printers
+     */
+	function addPrinterInformations($array)
+	{
+		if(!is_array($array)){
+			echo "updateComputerInformations: first paraeter must be an array";
+		}elseif($this->is_connected){
+			$atr = array(	"ID","name","serial","otherserial","contact","contact_num",
+					"tech_num","comments","date_mod","os","location","domain","network","ramSize","flags_serial","flags_par","flags_usb",
+					"model","type","is_template","tplname","FK_glpi_enterprise","deleted");
+			$v = "";
+			$a = "";
+			foreach($atr as $at){
+				if(isset($array[$at])){
+					$a .= $at.", ";
+					$v .= "'".$array[$at]."', ";
+				}
+			}
+			if(empty($v)){
+				echo "updateComputerInformations: no attributes given ";
+				return(false);
+			}else{
+				$a = preg_replace("/, $/","",$a);
+				$v = preg_replace("/, $/","",$v);
+				return($this->query("INSERT INTO glpi_printers (".$a.") VALUES (".$v.");"));
+			}
+		
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* add atachment to given printer */
+	function addAttachmentsToPrinter($attr,$id)
+	{
+        if(($id == "" )||(!is_numeric($id))){
+            return (false);
+        }
+        if($this->is_connected){
+            $qry = "DELETE FROM glpi_doc_device WHERE (FK_device=".$id.") AND (device_type=3);";
+            $this->query($qry);
+			
+			foreach($attr as $aid => $entry){
+				$str = "INSERT INTO glpi_doc_device (FK_doc,FK_device,device_type,is_template) 
+												VALUES
+													($aid,$id,3,'0');";
+				$this->query($str);
+			}
+        }else{
+            echo "not connected";
+            return(false);
+        }
+	}
+
+	function removePrinterInformations($name)
+	{
+		if($this->is_connected){
+			$tmp = $this->query("SELECT * FROM glpi_printers WHERE name='".$name."';");
+			if(isset($tmp[0])){
+				$id = $tmp[0]['ID'];
+//				$this->query("DELETE FROM glpi_connect_wire WHERE end2=".$id.";");
+				$this->query("DELETE FROM glpi_doc_device WHERE FK_device=".$id." AND device_type=3;");
+				return($this->query("DELETE FROM glpi_printers WHERE ID=".$id.";"));
+			}else{
+				echo "can't remove not existing entry";
+				return(false);
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+
+	/* Cartridges 
+     */
+	/* return all assigned cartridges */
+	function getUsedCartridges($printerID)
+	{
+		if($this->is_connected){
+			$ret = array();
+			$qry = "SELECT 
+						c.date_use			as date_use,
+						c.ID 				as ID, 
+						t.ID 				as type_ID,
+						t.name				as name, 
+						c.FK_glpi_printers	as FK_glpi_printers, 
+						d.name 				as type_name 
+					FROM 
+						glpi_dropdown_cartridge_type as d,
+						glpi_cartridges as c, 
+						glpi_cartridges_type as t 
+					WHERE 	c.FK_glpi_cartridges_type = t.ID 
+						AND t.type = d.ID 
+						AND c.FK_glpi_printers = ".$printerID.";"; 
+			$res = $this->query($qry);
+			foreach($res as $entry){
+				$ret[$entry['ID']] = $entry;
+			}
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* return all assigned cartridges */
+	function getAvailableCartridgeTypes($printerTypeID)
+	{
+		if($this->is_connected){
+			$ret = array();
+			$qry= "
+	SELECT 	
+			ct.ID 			as cartridgeID,
+			ct.name 		as cartridgeName,
+			pt.ID 			as printerTypeID,
+			pt.name 		as printerTypeName,
+			ct.type 		as cartridgeTypeID,
+			dt.name 		as cartridgeTypeName 
+	FROM 	
+			glpi_type_printers 				as pt, 
+			glpi_cartridges_type 			as ct, 
+			glpi_dropdown_cartridge_type 	as dt, 
+			glpi_cartridges_assoc 			as ac
+	 WHERE 
+				ac.FK_glpi_type_printer = pt.ID 
+			AND ac.FK_glpi_cartridges_type = ct.ID 
+			AND ct.type=dt.ID 
+			AND pt.ID=".$printerTypeID.";";
+			$res = $this->query($qry);
+			foreach($res as $entry){
+				$ret[$entry['cartridgeID']] = $entry;
+			}
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function removeCartridgeFromPrinter($cartridgeID)
+	{
+		if($this->is_connected){
+			$qry = "DELETE FROM glpi_cartridges WHERE ID=".$cartridgeID.";";
+			return($this->query($qry));
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function addCartridgeFromPrinter($printerID,$cartridgeID)
+	{
+		if($this->is_connected){
+			$qry ="INSERT INTO 
+						glpi_cartridges (FK_glpi_cartridges_type,FK_glpi_printers,date_in,date_use) 
+				   VALUES 
+						(".$cartridgeID.",".$printerID.",'".date("Y-m-d")."','".date("Y-m-d")."');";	
+			return($this->query($qry));
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function is_cartridgeTypeUsed($id){
+		if($this->is_connected){
+			$qry = "SELECT p.ID,p.name as name FROM glpi_cartridges as c,glpi_printers as p WHERE p.ID=c.FK_glpi_printers AND c.FK_glpi_cartridges_type=".$id.";";
+			$res = $this->query($qry);
+			$ret =array();
+			foreach($res as $entry){
+				$ret[$entry['ID']] = $entry['name'];
+			}
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function getCartridgeTypeInformations($id = "all"){
+		if($this->is_connected){
+			$ret = array();			
+			if($id != "all"){
+				$qry = "SELECT * FROM glpi_cartridges_type WHERE ID = ".$id.";";
+			}else{
+				$qry = "SELECT * FROM glpi_cartridges_type;";
+			}
+		
+			$res = ($this->query($qry));
+			foreach($res as $entry){
+				$ret[$entry['ID']] = $entry;
+			}	
+			return($ret);
+
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function getCartridgeTypes(){
+		if($this->is_connected){
+			$ret = array();			
+			$qry = "SELECT * FROM glpi_dropdown_cartridge_type;";
+			$res = ($this->query($qry));
+			foreach($res as $entry){
+				$ret[$entry['ID']] = $entry['name'];
+			}	
+			return($ret);
+
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+
+
+	/* check if given manufacturer ID ist still in use.
+	   The problem is, that nearly every table uses manufacturers .... 
+     */
+	function is_manufacturerUsed($id)
+	{
+		if($this->is_connected){
+			$tables = array();
+			foreach($this->deviceMappingGOsaGlpi as $entry => $table){
+				$tables[] = $entry;
+			}
+			$tables[] ="glpi_computers";
+			$tables[] ="glpi_cartridges_type";
+			$ret = array();
+			$i = 3;
+			foreach($tables as $tbl){
+				if($i <= 0 ) continue;
+				$qry = "SELECT * FROM ".$tbl." WHERE FK_glpi_enterprise = ".$id.";";
+				$res = $this->query($qry);
+				foreach($res as $entry){
+					if($i <= 0 ) continue;
+					if(isset($entry['designation'])){
+						$entry['name'] = $entry['designation'];
+					}
+					$i --;
+						$ret[] = $entry['name'];
+				}
+			}
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* Manufacturer 
+	   Updates already existing manufacturer
+	 */
+	function Add_UpdateCatrigdeType($array,$array_printer_types)
+	{
+		if(!is_array($array)){
+			echo "Add_UpdateCatrigdeType: first paraeter must be an array";
+		}elseif($this->is_connected){
+
+
+			$atr = array("name","ref","location","type","FK_glpi_enterprise","tech_num","deleted","comments","alarm");
+
+			/* Entry was edited */
+			if($array['ID']>0){
+				$qry = "DELETE FROM glpi_cartridges_assoc WHERE FK_glpi_cartridges_type=".$array['ID'].";";
+
+				$v = "";
+				foreach($atr as $at){
+					if(isset($array[$at])){
+						$v .= " ".$at."='".$array[$at]."', ";
+					}
+				}
+				if(empty($v)){
+					echo "Add_UpdateCatrigdeType: no attributes given ";
+					return(false);
+				}else{
+					$v = preg_replace("/, $/","",$v);
+					$qry = "UPDATE glpi_cartridges_type SET ".$v." WHERE ID='".$array['ID']."';";
+					$this->query($qry);	
+				}
+			}else{
+
+				/* skip if name is in use*/
+				$qry = "SELECT * FROM glpi_cartridges_type WHERE name='".$array['name']."';";
+				if(count($this->query($qry))){
+					return;
+				}
+
+				$str = "INSERT INTO glpi_cartridges_type ";
+				$namen = "";
+				$values= "";
+				foreach($array as $name => $value){	
+					$namen .= $name.", ";
+					if(is_numeric($value)){
+						$values .= $value.", ";
+					}else{
+						$values .= "'".$value."', ";
+					}
+				}
+				$values = preg_replace("/, $/","",$values);
+				$namen  = preg_replace("/, $/","",$namen);
+				$str .= "(".$namen.") VALUES (".$values.");";
+				$this->query($str);	
+				$IDs = $this->query("SELECT ID FROM glpi_cartridges_type WHERE name='".$array['name']."';");
+				if(count($IDs) > 1){
+					echo "internal db error";
+					return;
+				}
+				$array['ID'] = $IDs[0]['ID'];
+			}
+
+			foreach($array_printer_types as $id){
+				$qry = "INSERT INTO glpi_cartridges_assoc 
+					(FK_glpi_cartridges_type,FK_glpi_type_printer) 
+					VALUES 
+					(".$array['ID'].",".$id.")";
+
+				$this->query($qry);
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function getSupportedPrinterTypeIDsForCartridge($cid)
+	{
+		if($this->is_connected){
+			$ret = array();
+			$qry = "SELECT FK_glpi_type_printer FROM glpi_cartridges_assoc WHERE FK_glpi_cartridges_type = ".$cid.";";	
+			$res = $this->query($qry);
+				
+			foreach($res as $entry => $value){
+				$ret[$value['FK_glpi_type_printer']] = $value['FK_glpi_type_printer'];
+			}
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function removeCartridgeType($id){
+		if($this->is_connected){
+			$qry = "DELETE FROM glpi_cartridges_assoc WHERE FK_glpi_cartridges_type=".$id.";";
+			$this->query($qry);	
+			$qry = "DELETE FROM glpi_cartridges_type WHERE ID=".$id.";";
+			return($this->query($qry));	
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function getCartridgesWhichUseThisType($id)
+	{
+		if($this->is_connected){
+			$qry = "SELECT * FROM glpi_cartridges WHERE FK_glpi_cartridges_type=".$id.";";
+			$ret  = $this->query($qry);
+			return($ret);
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+
+	/* Add pritner types 
+       Add one entry to the cartridgeType types 
+     */
+	function addCartridgeDropdownType($name)
+	{
+		if($this->is_connected){
+			$tmp = $this->query("SELECT * FROM glpi_dropdown_cartridge_type WHERE name='".$name."';");
+			if(isset($tmp[0])){
+				//echo "such an entry already exists";
+				return(false);
+			}else{	
+				return($this->query("INSERT INTO glpi_dropdown_cartridge_type (name) VALUES ('".$name."');"));
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* remove cartridgeType types 
+       Remove one entry from the cartridgeType types (specified by ID=$id)
+     */
+	function removeCartridgeDropdownType($id)
+	{
+		if($this->is_connected){
+			$tmp = $this->query("SELECT * FROM glpi_dropdown_cartridge_type WHERE ID=".$id.";");
+			if(isset($tmp[0])){
+				return($this->query("DELETE FROM glpi_dropdown_cartridge_type WHERE ID=".$id.";"));	
+			}else{
+				echo "can't remove not existing entry";
+				return(false);	
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	/* Update cartridgeType  
+	   Update a cartridgeType  	
+	*/
+	function updateCartridgeDropdownType($name,$id)
+	{
+
+		if($this->is_connected){
+			$tmp = $this->query("SELECT * FROM glpi_dropdown_cartridge_type WHERE ID=".$id.";");
+			if(isset($tmp[0])){
+				return($this->query("UPDATE glpi_dropdown_cartridge_type SET name='".$name."' WHERE ID=".$id.";"));	
+			}else{
+				echo "can't update not existing entry";
+				return(false);	
+			}
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
+	function getUsedDropdownTypes($id=false)
+	{
+		if($this->is_connected){
+			if($id){
+				$qry = "SELECT distinct(type) FROM glpi_cartridges_type WHERE type = ".$id.";";
+			}else{
+				$qry = "SELECT distinct(type) FROM glpi_cartridges_type;";
+			}
+			return($this->query($qry));
+		}else{
+			echo "not connected";
+			return(false);
+		}
+	}
+
 }
 //$s = new glpiDB("vserver-01","glpi","tester","glpi");
 //print_r($s->query("SELECT * FROM glpi_computers"));