diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc
index ce2cfaca4874e26850baa30ab0cbf3c8172cb32b..e44e000bdcb35166616d6cbd5edb83ed6ebf0c9e 100644 (file)
var $comments = ""; // Comment
var $comments = ""; // Comment
- var $type = 0; // System type id
+ var $type = 0; // printer type id
var $serial = "";
var $otherserial = "";
var $ramSize = 0;
var $serial = "";
var $otherserial = "";
var $ramSize = 0;
var $contact = ""; // Empty
var $deleted = "N"; // Deleted entries should have this set to Y
var $contact = ""; // Empty
var $deleted = "N"; // Deleted entries should have this set to Y
+ var $rename = false;
+ var $select_type ;
+
+ var $editManufacturer = false;
+
/* Not necessary, cause we use mysql databse */
var $objectclasses= array("whatever");
/* Not necessary, cause we use mysql databse */
var $objectclasses= array("whatever");
var $usedDevices = array(); // Which devices are currently selected
var $usedAttachments = array(); // Used Attachments
var $usedDevices = array(); // Which devices are currently selected
var $usedAttachments = array(); // Used Attachments
-
+ var $usedCartridges = array(); // Used Cartridges
/* Contructor
Sets default values and checks if we already have an existing glpi account
*/
/* Contructor
Sets default values and checks if we already have an existing glpi account
*/
- function glpiPrinterAccount ($config, $dn= NULL)
+ function glpiPrinterAccount ($config, $dn= NULL, $parent= NULL)
{
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
$this->ui= get_userinfo();
$this->is_account = false;
$this->ui= get_userinfo();
$this->is_account = false;
foreach($atts as $attachment){
$this->usedAttachments[$attachment['FK_doc']]=$attachment['FK_doc'];
}
foreach($atts as $attachment){
$this->usedAttachments[$attachment['FK_doc']]=$attachment['FK_doc'];
}
+
+ $cart= $this->handle->getUsedCartridges($tmp[0]['ID']);
+ foreach($cart as $key => $cartridge){
+ $this->usedCartridges[$key]=$cartridge;
+ $this->usedCartridges[$key]['status']="exists";
+ }
+
+
}else{
$this->is_account = false;
}
}else{
$this->is_account = false;
}
$smarty= get_smarty();
$display= "";
$smarty= get_smarty();
$display= "";
+ $smarty->assign("CartridgesACL",chkacl($this->acl,"Cartridges"));
+
/* Assign smarty defaults
To avoid undefined indexes, if there is an error with the glpi db
*/
/* Assign smarty defaults
To avoid undefined indexes, if there is an error with the glpi db
*/
- foreach(array("PrinterTypeKeys","PrinterTypes","ManufacturerKeys","Manufacturers","Attachments","AttachmentKeys") as $attr){
+ foreach(array("PrinterTypeKeys","PrinterTypes","ManufacturerKeys","Manufacturers","Attachments","AttachmentKeys","CartridgeKeys","Cartridges") as $attr){
$smarty->assign($attr,array());
$smarty->assign($attr."ACL"," disabled ");
}
$smarty->assign($attr,array());
$smarty->assign($attr."ACL"," disabled ");
}
- foreach(array("type","FK_glpi_enterprise","tech_num","contact_num","comments","flags_serial","flags_par","flags_usb") as $attr){
+ foreach(array("type","FK_glpi_enterprise","tech_num","contact_num","comments","flags_serial","flags_par","flags_usb","AttachmentsDiv") as $attr){
$smarty->assign($attr,"");
$smarty->assign($attr."ACL"," disabled ");
}
$smarty->assign($attr,"");
$smarty->assign($attr."ACL"," disabled ");
}
/* Show tab dialog headers */
if ($this->is_account){
/* Show tab dialog headers */
if ($this->is_account){
- $display= $this->show_header(_("Remove inventory service"),
+ $display= $this->show_header(_("Remove inventory"),
_("This server has inventory features enabled. You can disable them by clicking below."));
} else {
_("This server has inventory features enabled. You can disable them by clicking below."));
} else {
- $display= $this->show_header(_("Add inventory service"),
+ $display= $this->show_header(_("Add inventory"),
_("This server has inventory features disabled. You can enable them by clicking below."));
return ($display);
}
_("This server has inventory features disabled. You can enable them by clicking below."));
return ($display);
}
* Dialog
*/
* Dialog
*/
+ /* Rename was requested */
+ if(isset($_POST['Rename_PType_OK'])){
+ $tmp = $this->handle->getPrinterTypes();
+ $allok = true;
+ foreach($tmp as $id => $name){
+ if(trim($name) == trim($_POST['string'])){
+ $allok = false;
+ }
+ }
+ if($allok){
+ $this->handle->updatePrinterType($_POST['string'],$this->select_type);
+ $this->rename = false;
+ }else{
+ print_red(sprintf(_("Can't rename given printer type to '%s', because this type name already exists."),$_POST['string']));
+ }
+ }
+
+ /* abort rename
+ */
+ if(isset($_POST['Rename_Cancel'])){
+ $this->rename = false;
+ }
+
/* Printer type management
*/
if(isset($_POST['edit_type'])){
/* Printer type management
*/
if(isset($_POST['edit_type'])){
/* This appends a new printer to our sytem types
*/
if((isset($_POST['add_type']))&&(!empty($_POST['type_string']))){
/* This appends a new printer to our sytem types
*/
if((isset($_POST['add_type']))&&(!empty($_POST['type_string']))){
- $this->handle->addPrinterType($_POST['type_string']);
+
+ $tmp = $this->handle->getPrinterTypes();
+ $allok = true;
+ foreach($tmp as $id => $name){
+ if(trim($name) == trim($_POST['type_string'])){
+ $allok = false;
+ }
+ }
+ if($allok){
+ $this->handle->addPrinterType($_POST['type_string']);
+ }else{
+ print_red(sprintf(_("Can't rename given printer type to '%s', because this type name already exists."),$_POST['type_string']));
+ }
}
/* Remove selected type from our printer types list
*/
if((isset($_POST['del_type']))&&(!empty($_POST['select_type']))){
}
/* Remove selected type from our printer types list
*/
if((isset($_POST['del_type']))&&(!empty($_POST['select_type']))){
- $this->handle->removePrinterType($_POST['select_type']);
+ $tmp = $this->handle->is_printerTypeUsed($_POST['select_type']);
+ if(count($tmp)){
+ $str = "";
+ foreach($tmp as $id => $name){
+ $str .= $name.", ";
+ }
+ $str = preg_replace("/, $/","",$str);
+ print_red(sprintf(_("Can't delete printer type, it is still in use by '%s'."),$str));
+ }else{
+ $this->handle->removePrinterType($_POST['select_type']);
+ }
}
/* Rename selected printer type to given string
*/
}
/* Rename selected printer type to given string
*/
- if((isset($_POST['rename_type']))&&(!empty($_POST['select_type']))&&(!empty($_POST['type_string']))){
- $this->handle->updatePrinterType($_POST['type_string'],$_POST['select_type']);
- }
+ if((isset($_POST['rename_type']))&&(!empty($_POST['select_type']))||($this->rename)){
+ $this->rename = true;
+
+ $smarty->assign("Method","rename");
+
+ $tmp = $this->handle->getPrinterTypes();
+
+ if(isset($_POST['select_type'])){
+ $this->select_type = $_POST['select_type'];
+ }
+ $smarty->assign("string",$tmp[$this->select_type]);
+ if(isset($_POST['string'])){
+ $smarty->assign("string",$_POST['string']);
+ }
+
+ $display= $smarty->fetch(get_template_path('glpi_edit_printer_type.tpl', TRUE));
+ return($display);
+ }
/* Someone wants to edit the printer types ...
So, lets open a new dialog which provides some buttons to edit the types
*/
if($this->edit_type){
/* Someone wants to edit the printer types ...
So, lets open a new dialog which provides some buttons to edit the types
*/
if($this->edit_type){
+ $smarty->assign("Method","edit");
$smarty->assign("PrinterTypes", $this->handle->getPrinterTypes());
$smarty->assign("PrinterTypeKeys", array_flip($this->handle->getPrinterTypes()));
$display= $smarty->fetch(get_template_path('glpi_edit_printer_type.tpl', TRUE));
$smarty->assign("PrinterTypes", $this->handle->getPrinterTypes());
$smarty->assign("PrinterTypeKeys", array_flip($this->handle->getPrinterTypes()));
$display= $smarty->fetch(get_template_path('glpi_edit_printer_type.tpl', TRUE));
if(isset($_POST['edit_manufacturer'])){
$this->cur_dialog = new glpiManufacturer($this->config,$this->dn);
$this->dialog = true;
if(isset($_POST['edit_manufacturer'])){
$this->cur_dialog = new glpiManufacturer($this->config,$this->dn);
$this->dialog = true;
+ $this->editManufacturer =true;
}
/* Close manufacturer editing dialog
*/
}
/* Close manufacturer editing dialog
*/
- if(isset($_POST['close_edit_manufacturer'])){
+ if((isset($_POST['close_edit_manufacturer']))&&($this->editManufacturer)){
$this->dialog = false;
$this->cur_dialog = false;
$this->dialog = false;
$this->cur_dialog = false;
+ $this->editManufacturer=false;
}
}
*/
if(isset($_POST['SelectContactPerson'])){
$this->addUser = "contact";
*/
if(isset($_POST['SelectContactPerson'])){
$this->addUser = "contact";
- $this->cur_dialog= new glpiSelectUser($this->config,$this->dn);
+ $this->cur_dialog= new glpiSelectUser($this->config,$this->dn,"user_tech_num");
}
/* Selecte technical responsible person
*/
if(isset($_POST['SelectTechPerson'])){
$this->addUser ="tech";
}
/* Selecte technical responsible person
*/
if(isset($_POST['SelectTechPerson'])){
$this->addUser ="tech";
- $this->cur_dialog= new glpiSelectUser($this->config,$this->dn);
+ $this->cur_dialog= new glpiSelectUser($this->config,$this->dn,"user_tech_num");
}
/* Abort user selection
*/
}
/* Abort user selection
*/
+ $smarty->assign("AbortSelectUser","SelectUserCancel");
if(isset($_POST['SelectUserCancel'])){
$this->dialog = false;
$this->addUser ="";
if(isset($_POST['SelectUserCancel'])){
$this->dialog = false;
$this->addUser ="";
if(!in_array($id,$users)){
/* If this user doesn't exists in glpi db, we must create him */
if(!in_array($id,$users)){
/* If this user doesn't exists in glpi db, we must create him */
- $atr = $ldap->fetch($ldap->cat($id));
+ $ldap->cat($id, array('cn', 'mail', 'telephoneNumber'));
+ $atr = $ldap->fetch();
$tmp = array();
$use = array( "cn" =>"name",
"mail" =>"email",
$tmp = array();
$use = array( "cn" =>"name",
"mail" =>"email",
/* Remove Attachment from this tab
*/
/* Remove Attachment from this tab
*/
+ $once = true;
+ foreach($_POST as $name => $value){
+ if((preg_match("/^delAttachment_/",$name))&&($once)){
+ $once= false;
+ $name = preg_replace("/^delAttachment_/","",$name);
+ $entry = preg_replace("/_.*$/","",$name);
+ if(isset($this->usedAttachments[$entry])){
+ unset($this->usedAttachments[$entry]);
+ }
+ }
+ }
if((isset($_POST['RemoveAttachment']))&&(isset($_POST['Attachments']))){
if(isset($this->usedAttachments[$_POST['Attachments']])){
unset($this->usedAttachments[$_POST['Attachments']]);
}
}
if((isset($_POST['RemoveAttachment']))&&(isset($_POST['Attachments']))){
if(isset($this->usedAttachments[$_POST['Attachments']])){
unset($this->usedAttachments[$_POST['Attachments']]);
}
}
+ /* ##########################################################################
+ * Printer Cartridge handling
+ */
+
+ /* Abort cartridge select dialog
+ */
+ if(isset($_POST['SelectCartridgeCancel'])){
+ $this->cur_dialog = false;
+ $this->edit_type = false;
+ }
+
+ /* Get selected cartridges and add them to our list
+ */
+ if(isset($_POST['SelectCartridgeSave'])){
+ $this->cur_dialog->save_object();
+ $carts = $this->cur_dialog->save();
+ foreach($carts as $cart){
+ $cart['status'] = "new";
+ $this->usedCartridges[] = $cart;
+ }
+ $this->cur_dialog = false;
+ $this->edit_type = false;
+ }
+
+ /* Remove cartridge
+ */
+ if((isset($_POST['RemoveCartridge']))&&(isset($_POST['Cartridges']))){
+
+ foreach($_POST['Cartridges'] as $cartID){
+
+ if(isset($this->usedCartridges[$cartID])){
+ if($this->usedCartridges[$cartID]['status'] == "exists"){
+ $this->usedCartridges[$cartID]['status'] = "deleted";
+ }else{
+ unset($this->usedCartridges[$cartID]);
+ }
+ }
+ }
+ }
+
+ /* Open Attachment pool to add/edit Attachments
+ */
+ if(isset($_POST['AddCartridge'])){
+ $this->cur_dialog = new glpiPrinterCartridges($this->config,$this->dn,$this->type);
+ $this->dialog = true;
+ }
+
+
/* ##########################################################################
* Draw Dialogs
*/
/* ##########################################################################
* Draw Dialogs
*/
* Assign listbox / checkbox .... values to smarty
*/
/* Assign smarty defaults */
* Assign listbox / checkbox .... values to smarty
*/
/* Assign smarty defaults */
- foreach(array("PrinterTypes","PrinterTypeKeys","Manufacturers","TechnicalResponsibles","Attachments") as $attr){
+ foreach(array("PrinterTypes","PrinterTypeKeys","Manufacturers","TechnicalResponsibles","Attachments","Cartridges") as $attr){
$smarty->assign($attr,array());
$smarty->assign($attr."ACL",chkacl($this->acl,$attr));
}
$smarty->assign($attr,array());
$smarty->assign($attr."ACL",chkacl($this->acl,$attr));
}
/* Assign used Attachments
*/
/* Assign used Attachments
*/
+
+ $divlist = new divSelectBox("glpiAttachmentsList");
+ $divlist-> SetHeight(120);
+ $atts = $this->getUsedAttachments(true);
+ $downlink = "<a href='get_attachment.php?id=%s' target='_blank'>%s</a>";
+ $del_link = "<input type='image' src='images/edittrash.png' name='delAttachment_%s'>";
+ foreach($atts as $id => $attachment){
+ $divlist->AddEntry
+ (
+ array(
+ array("string"=>$attachment['name']),
+ array("string"=>$attachment['mime']),
+ array("string"=>sprintf($downlink,$id,$attachment['filename'])),
+ array("string"=>sprintf($del_link,$attachment['ID']),"attach"=>"style='border-right:0px;'"),
+ )
+ );
+ }
+
+ $smarty->assign("AttachmentsDiv" ,$divlist->DrawList());
$smarty->assign("Attachments", $this->getUsedAttachments());
$smarty->assign("AttachmentKeys", array_flip($this->getUsedAttachments()));
$smarty->assign("Attachments", $this->getUsedAttachments());
$smarty->assign("AttachmentKeys", array_flip($this->getUsedAttachments()));
+ /* Assign Cartridges
+ */
+ $smarty->assign("Cartridges", $this->getUsedCartridges());
+ $smarty->assign("CartridgeKeys", $this->getUsedCartridges(true));
/* ##########################################################################
* Assign contact and technical responsible person
*/
if(isset($users[$this->contact_num])){
/* ##########################################################################
* Assign contact and technical responsible person
*/
if(isset($users[$this->contact_num])){
- $tr = $ldap->fetch($ldap->cat($users[$this->contact_num]));
+ $ldap->cat($users[$this->contact_num], array('givenName', 'sn', 'uid'));
+ $tr = $ldap->fetch();
$str = "";
if(isset($tr['givenName'][0])){ $str .= $tr['givenName'][0]." "; }
if(isset($tr['sn'][0])) { $str .= $tr['sn'][0]." "; }
$str = "";
if(isset($tr['givenName'][0])){ $str .= $tr['givenName'][0]." "; }
if(isset($tr['sn'][0])) { $str .= $tr['sn'][0]." "; }
Assign name ... to smarty, if set
*/
if(isset($users[$this->tech_num])){
Assign name ... to smarty, if set
*/
if(isset($users[$this->tech_num])){
- $tr = $ldap->fetch($ldap->cat($users[$this->tech_num]));
+ $ldap->cat($users[$this->tech_num], array('givenName', 'sn', 'uid'));
+ $tr = $ldap->fetch();
$str = "";
if(isset($tr['givenName'][0])){ $str .= $tr['givenName'][0]." "; }
if(isset($tr['sn'][0])) { $str .= $tr['sn'][0]." "; }
$str = "";
if(isset($tr['givenName'][0])){ $str .= $tr['givenName'][0]." "; }
if(isset($tr['sn'][0])) { $str .= $tr['sn'][0]." "; }
$smarty->assign("tech_num", _("N/A"));
}
$smarty->assign("tech_num", _("N/A"));
}
+ /* If theres a cartridge selected, you can't change the printer type.
+ */
+ $disp = true;
+
+ foreach($this->usedCartridges as $cart){
+ if($cart['status'] != "deleted"){
+ $disp = false;
+ }
+ }
+ if($disp==false){
+ $smarty->assign("typeACL","disabled");
+ }
+
$display.= $smarty->fetch(get_template_path('glpiPrinter.tpl', TRUE));
return($display);
}
$display.= $smarty->fetch(get_template_path('glpiPrinter.tpl', TRUE));
return($display);
}
/* Save data to object */
function save_object()
{
/* Save data to object */
function save_object()
{
- plugin::save_object();
- foreach($this->attributes as $attrs){
- if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
+ if(isset($_POST['glpiPrinterFlagsPosted'])){
+ plugin::save_object();
+ foreach($this->attributes as $attrs){
+ if(isset($_POST[$attrs])){
+ $this->$attrs = $_POST[$attrs];
+ }
}
}
- }
- foreach(array("flags_serial","flags_par","flags_usb") as $checkboxes){
- if(isset($_POST[$checkboxes])){
- $this->$checkboxes = 1;
- }else{
- $this->$checkboxes = 0;
+ foreach(array("flags_serial","flags_par","flags_usb") as $checkboxes){
+ if(isset($_POST[$checkboxes])){
+ $this->$checkboxes = 1;
+ }else{
+ $this->$checkboxes = 0;
+ }
}
}
}
}
/* Check supplied data */
function check()
{
/* Check supplied data */
function check()
{
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
// if($this->TechnicalResponsible == ""){
// $message[] = _("Please select a technical responsible person for this entry.");
// if($this->TechnicalResponsible == ""){
// $message[] = _("Please select a technical responsible person for this entry.");
}
$tmp = $this->handle->getPrinterInformations($this->dn);
$this->handle->addAttachmentsToPrinter($this->usedAttachments,$tmp[0]['ID']);
}
$tmp = $this->handle->getPrinterInformations($this->dn);
$this->handle->addAttachmentsToPrinter($this->usedAttachments,$tmp[0]['ID']);
+
+ foreach($this->usedCartridges as $cart){
+ if($cart['status'] == "deleted"){
+ $this->handle->removeCartridgeFromPrinter($cart['ID']);
+ }elseif($cart['status'] == "new"){
+ $this->handle->addCartridgeFromPrinter($tmp[0]['ID'],$cart['type_ID']);
+ }
+ }
}
}
/* Return used attachments */
}
}
/* Return used attachments */
- function getUsedAttachments()
+ function getUsedAttachments($divlist = false)
{
$atts =$this->handle->getAttachments();
$ret = array();
foreach($atts as $entry){
if(in_array($entry['ID'],$this->usedAttachments)){
{
$atts =$this->handle->getAttachments();
$ret = array();
foreach($atts as $entry){
if(in_array($entry['ID'],$this->usedAttachments)){
+ if($divlist){
+ $ret[$entry['ID']] = $entry;
+ }else{
+ $cm ="";
+ if(isset($entry['comment'])){
+ $cm=" [".$entry['comment']."]";
+ }
+ if(isset($entry['mime'])){
+ $cm.=" -".$entry['mime']."";
+ }
- $cm ="";
- if(isset($entry['comment'])){
- $cm=" [".$entry['comment']."]";
- }
- if(isset($entry['mime'])){
- $cm.=" -".$entry['mime']."";
+ $ret[$entry['ID']]= $entry['name'].$cm;
}
}
-
- $ret[$entry['ID']]= $entry['name'].$cm;
}
}
return($ret);
}
}
}
return($ret);
}
-
+
+ function getUsedCartridges($flip = false)
+ {
+ $ret = array();
+ foreach($this->usedCartridges as $key => $value){
+ if($value['status'] == "deleted") continue;
+ if($flip){
+ $ret[$key] = $key;
+ }else{
+ $ret[$key] = $value['name']." [".$value['type_name']."] "._("since")." :".$value['date_use'];
+ }
+ }
+ return($ret);
+ }
}
}