X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_glpiPrinterAccount.inc;h=5af98b686c62eef30c23c5fa26c8530a1e4aba1a;hb=7385deb3e680ce8a77f131b62907146bbf01075f;hp=2fbffd147c576f7b3b8ebf3862c14208c693cae2;hpb=25c3b361a9765b517d7b133f00125dd02d122cac;p=gosa.git
diff --git a/plugins/admin/systems/class_glpiPrinterAccount.inc b/plugins/admin/systems/class_glpiPrinterAccount.inc
index 2fbffd147..5af98b686 100644
--- a/plugins/admin/systems/class_glpiPrinterAccount.inc
+++ b/plugins/admin/systems/class_glpiPrinterAccount.inc
@@ -39,6 +39,9 @@ class glpiPrinterAccount extends plugin
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 */
@@ -138,11 +141,11 @@ class glpiPrinterAccount extends plugin
/* 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 ");
}
- 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 ");
}
@@ -193,10 +196,10 @@ class glpiPrinterAccount extends plugin
/* Show tab dialog headers */
if ($this->is_account){
- $display= $this->show_header(_("Remove inventory service"),
+ $display= $this->show_disable_header(_("Remove inventory"),
_("This server has inventory features enabled. You can disable them by clicking below."));
} else {
- $display= $this->show_header(_("Add inventory service"),
+ $display= $this->show_enable_header(_("Add inventory"),
_("This server has inventory features disabled. You can enable them by clicking below."));
return ($display);
}
@@ -207,6 +210,29 @@ class glpiPrinterAccount extends plugin
* 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'])){
@@ -224,25 +250,63 @@ class glpiPrinterAccount extends plugin
/* 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']))){
- $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
*/
- 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){
+ $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));
@@ -312,7 +376,8 @@ class glpiPrinterAccount extends plugin
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",
@@ -382,6 +447,17 @@ class glpiPrinterAccount extends plugin
/* 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']]);
@@ -456,7 +532,7 @@ class glpiPrinterAccount extends plugin
* 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));
}
@@ -493,6 +569,25 @@ class glpiPrinterAccount extends plugin
/* Assign used Attachments
*/
+
+ $divlist = new divSelectBox("glpiAttachmentsList");
+ $divlist-> SetHeight(120);
+ $atts = $this->getUsedAttachments(true);
+ $downlink = "%s";
+ $del_link = "";
+ 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()));
@@ -505,7 +600,8 @@ class glpiPrinterAccount extends plugin
* 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]." "; }
@@ -519,7 +615,8 @@ class glpiPrinterAccount extends plugin
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]." "; }
@@ -581,7 +678,8 @@ class glpiPrinterAccount extends plugin
/* 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.");
@@ -621,22 +719,25 @@ class glpiPrinterAccount extends plugin
}
/* 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)){
+ 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);
@@ -656,7 +757,37 @@ class glpiPrinterAccount extends plugin
return($ret);
}
+ /* Return plugin informations for acl handling */
+ function plInfo()
+ {
+ return (array(
+ "plShortName" => _("Glpi"),
+ "plDescription" => _("Printer inventory extension"),
+ "plSelfModify" => FALSE,
+ "plDepends" => array(),
+ "plPriority" => 0,
+ "plSection" => array("administration"),
+ "plCategory" => array("printer"),
+
+ "plProvidedAcls"=> array(
+ "flags_serial" => _("Supports serial interface"),
+ "flags_par" => _("Supports parallel interface"),
+ "flags_usb" => _("Supports usb interface"),
+ "tech_num" => _("Technical responsible"),
+ "comments" => _("Comments"),
+ "location" => _("Location"),
+ "contact_num" => _("Contact person"),
+ "type" => _("Type"),
+ "FK_glpi_enterprise" => _("Manufacturer"),
+
+ "Attachment_name" => _("Attachment name"),
+ "Attachment_comment" => _("Attachment comment"),
+ "Attachment_mime" => _("Attachment mime type"),
+ "Attachment_filename" => _("Attachment filename"),
+
+ "ManageCartridges" => _("Cartridge settings"))
+ ));
+ }
}
-
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>