X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_glpiAccount.inc;h=9ff5019138a6059b2d135fd975a33db5767d911d;hb=8edf1b0390149b39682c7e02c394fec56940874d;hp=8a5f8d993908a31f4d8b82a171f6aaa354f92f5f;hpb=5b539ec9d04cfbedc3017d782b79e17ac2dd6e21;p=gosa.git
diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index 8a5f8d993..9ff501913 100644
--- a/plugins/admin/systems/class_glpiAccount.inc
+++ b/plugins/admin/systems/class_glpiAccount.inc
@@ -36,6 +36,10 @@ class glpiAccount extends plugin
var $FK_glpi_enterprise = 0; // Manufacturer id
var $deleted = "N"; // Deleted entries should have this set to Y
+ var $renameTypeDialog = false;
+ var $renameOSDialog = false;
+ var $select_type ;
+
/* Not necessary, cause we use mysql databse */
var $objectclasses= array("whatever");
@@ -60,9 +64,9 @@ class glpiAccount extends plugin
/* Contructor
Sets default values and checks if we already have an existing glpi account
*/
- function glpiAccount ($config, $dn= NULL)
+ function glpiAccount ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
+ plugin::plugin ($config, $dn, $parent);
$this->ui= get_userinfo();
/* Abort class construction, if no db is defined */
@@ -129,7 +133,7 @@ class glpiAccount extends plugin
$smarty->assign($attr,array());
$smarty->assign($attr."ACL"," disabled ");
}
- foreach(array("type","FK_glpi_enterprise","os","tech_num","comments","contact_num") as $attr){
+ foreach(array("type","FK_glpi_enterprise","os","tech_num","comments","contact_num","AttachmentsDiv") as $attr){
$smarty->assign($attr,"");
$smarty->assign($attr."ACL"," disabled ");
}
@@ -224,9 +228,22 @@ class glpiAccount extends plugin
/* Remove Attachment fro 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']]);
+ foreach($_POST['Attachments'] as $entry){
+ if(isset($this->usedAttachments[$entry])){
+ unset($this->usedAttachments[$entry]);
+ }
}
}
@@ -262,28 +279,78 @@ class glpiAccount extends plugin
$this->dialog = false;
}
+ if(isset($_POST['Rename_Cancel'])){
+ $this->renameTypeDialog = false;
+ $this->renameOSDialog = false;
+ }
+
/* This appends a new system to our sytem types
*/
if((isset($_POST['add_type']))&&(!empty($_POST['type_string']))){
- $this->handle->addSystemType($_POST['type_string']);
+ $attr = $this->handle->getSystemTypes();
+ if(in_array(trim($_POST['type_string']),$attr)){
+ print_red(_("Adding new sytem type failed, this system type name is already used.")) ;
+ }else{
+ $this->handle->addSystemType(trim($_POST['type_string']));
+ }
}
/* Remove selected type from our system types list
*/
if((isset($_POST['del_type']))&&(!empty($_POST['select_type']))){
- $this->handle->removeSystemType($_POST['select_type']);
+ $tmp = $this->handle->is_systemTypeUsed($_POST['select_type']);
+ 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 system type, it is still in use by these system(s) '%s'"),$names));
+ }else{
+ $this->handle->removeSystemType($_POST['select_type']);
+ }
}
/* Rename selected system type to given string
*/
- if((isset($_POST['rename_type']))&&(!empty($_POST['select_type']))&&(!empty($_POST['type_string']))){
- $this->handle->updateSystemType($_POST['type_string'],$_POST['select_type']);
+ if(isset($_POST['Rename_type_OK'])){
+ $attr = $this->handle->getSystemTypes();
+ if(in_array(trim($_POST['string']),$attr)){
+ print_red(_("Rename failed, this system type name is already used.")) ;
+ }else{
+ $this->renameTypeDialog = false;
+ $this->handle->updateSystemType($_POST['string'],trim($this->select_type));
+ }
+ }
+
+
+ if((isset($_POST['rename_type'])&&(!empty($_POST['select_type'])))||($this->renameTypeDialog)){
+ if(isset($_POST['select_type'])){
+ $this->select_type = $_POST['select_type'];
+ }
+ $this->renameTypeDialog = true;
+ $tmp = $this->handle->getSystemTypes();
+
+ $smarty->assign("string",$tmp[$this->select_type]);
+ if(isset($_POST['string'])){
+ $smarty->assign("string",$_POST['string']);
+ }
+ $smarty->assign("Method","rename");
+ $display= $smarty->fetch(get_template_path('glpi_edit_type.tpl', TRUE));
+ return($display);
}
+
+
/* Someone wants to edit the system 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("SystemTypes", $this->handle->getSystemTypes());
$smarty->assign("SystemTypeKeys", array_flip($this->handle->getSystemTypes()));
$display= $smarty->fetch(get_template_path('glpi_edit_type.tpl', TRUE));
@@ -307,36 +374,82 @@ class glpiAccount extends plugin
/* Add new os to the db
*/
if((isset($_POST['add_os']))&&(!empty($_POST['is_string']))){
- $this->handle->addOS($_POST['is_string']);
+ $attr = $this->handle->getOSTypes();
+ if(in_array(trim($_POST['is_string']),$attr)){
+ print_red(_("Adding new operating system failed, specifed name is already used.")) ;
+ }else{
+ $this->handle->addOS(trim($_POST['is_string']));
+ }
}
/* Delete selected os from list and db
*/
if((isset($_POST['del_os']))&&(!empty($_POST['select_os']))){
- $this->handle->removeOS_byID($_POST['select_os']);
+ $tmp = $this->handle->is_osUsed($_POST['select_os']);
+
+ 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 operating system, it is still in use by these system(s) '%s'"),$names));
+
+ }else{
+ $this->handle->removeOS_byID($_POST['select_os']);
+ }
}
/* Rename selected os to given string
*/
- if((isset($_POST['rename_os']))&&(!empty($_POST['select_os']))&&(!empty($_POST['is_string']))){
- $this->handle->updateOS($_POST['is_string'],$_POST['select_os']);
+ if(isset($_POST['Rename_os_OK'])){
+ $attr = $this->handle->getOSTypes();
+ if(in_array(trim($_POST['string']),$attr)){
+ print_red(_("Updating operating system failed, specifed name is already used.")) ;
+ }else{
+ $this->handle->updateOS($_POST['string'],$this->select_type);
+ $this->renameOSDialog = false;
+ }
+ }
+ if((isset($_POST['rename_os'])&&(!empty($_POST['select_os'])))||($this->renameOSDialog)){
+ if(isset($_POST['select_os'])){
+ $this->select_type = $_POST['select_os'];
+ }
+ $this->renameOSDialog = true;
+ $tmp = $this->handle->getOSTypes();
+
+ $smarty->assign("string",$tmp[$this->select_type]);
+ if(isset($_POST['string'])){
+ $smarty->assign("string",$_POST['string']);
+ }
+ $smarty->assign("Method","rename");
+ $display= $smarty->fetch(get_template_path('glpi_edit_os.tpl', TRUE));
+ return($display);
}
/* Open dialog to edit os types
*/
if($this->edit_os){
- $smarty->assign("OSKeys", array_flip($this->handle->getOSTypes()));
- $smarty->assign("OSs", $this->handle->getOSTypes());
+ $smarty->assign("Method","edit");
+ $smarty->assign("OSs", $this->handle->getOSTypes());
+ $smarty->assign("OSKeys", array_flip($this->handle->getOSTypes()));
$display= $smarty->fetch(get_template_path('glpi_edit_os.tpl', TRUE));
return($display);
}
+
+
/* Show dialog to select a new contact person
* Select a contact person
*/
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");
}
/* Open dialog which allows to edit the manufacturers
@@ -355,6 +468,7 @@ class glpiAccount extends plugin
/* Abort user selection
*/
+ $smarty->assign("AbortSelectUser","SelectUserCancel");
if(isset($_POST['SelectUserCancel'])){
$this->dialog = false;
$this->addUser ="";
@@ -365,7 +479,7 @@ class glpiAccount extends plugin
*/
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");
}
/* Technical responsible person selected*/
@@ -378,7 +492,8 @@ class glpiAccount 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",
@@ -435,7 +550,7 @@ class glpiAccount extends plugin
/* Assign some vars to smarty
*/
- foreach(array("type","FK_glpi_enterprise","os","tech_num","contact_num") as $attr){
+ foreach(array("type","FK_glpi_enterprise","os","tech_num","contact_num","Attachments","InstalledDevices") as $attr){
$smarty->assign($attr,"");
$smarty->assign($attr."ACL",chkacl($this->acl,$attr));
}
@@ -447,11 +562,11 @@ class glpiAccount extends plugin
/* Show tab dialog headers */
if ($this->is_account){
- $display= $this->show_header(_("Remove inventory service"),
- _("This server has inventory features enabled. You can disable them by clicking below."));
+ $display= $this->show_header(_("Remove inventory"),
+ _("This device has inventory informations enabled. You can disable them by clicking below."));
} else {
- $display= $this->show_header(_("Add inventory service"),
- _("This server has inventory features disabled. You can enable them by clicking below."));
+ $display= $this->show_header(_("Add inventory"),
+ _("This device has inventory informations disabled. You can enable them by clicking below."));
return ($display);
}
@@ -484,14 +599,31 @@ class glpiAccount extends plugin
/* Assign used Attachments
*/
- $smarty->assign("Attachments", $this->getUsedAttachments());
- $smarty->assign("AttachmentKeys", array_flip($this->getUsedAttachments()));
+ $divlist = new divSelectBox("glpiAttachmentsList");
+ $divlist-> SetHeight(130);
+ $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());
/* Handle contact person
Assign name ... to smarty, if set
*/
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]." "; }
@@ -505,7 +637,8 @@ class glpiAccount extends plugin
Assign name ... to smarty, if set
*/
if(isset($users[$this->tech_num])){
- $tr = $ldap->fetch($ldap->cat($users[$this->tech_num]));
+ $tr = $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]." "; }
@@ -522,9 +655,16 @@ class glpiAccount extends plugin
function remove_from_parent()
{
- $this->handle = new glpiDB($this->data['SERVER'],$this->data['LOGIN'],$this->data['PASSWORD'],$this->data['DB']);
- if($this->initialy_was_account){
- $this->handle->removeComputerInformations($this->dn);
+ if(!$this->initialy_was_account){
+ return;
+ }
+ if(function_exists("mysql_pconnect")){
+ $this->handle = new glpiDB($this->data['SERVER'],$this->data['LOGIN'],$this->data['PASSWORD'],$this->data['DB']);
+ if($this->initialy_was_account){
+ $this->handle->removeComputerInformations($this->dn);
+ }
+ }else{
+ print_red(_("Can't remove glpi account, while mysql extension is missing."));
}
}
@@ -547,10 +687,13 @@ class glpiAccount extends plugin
/* Save data to object */
function save_object()
{
+ if(!isset($_POST['glpi_tpl_posted'])) {
+ return ;
+ }
plugin::save_object();
foreach($this->attributes as $attrs){
if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
+ $this->$attrs = stripslashes ($_POST[$attrs]);
}
}
}
@@ -559,7 +702,8 @@ class glpiAccount 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.");
@@ -580,34 +724,38 @@ class glpiAccount extends plugin
$attrs['name'] = $this->dn;
unset($attrs['ID']);
$this->handle = new glpiDB($this->data['SERVER'],$this->data['LOGIN'],$this->data['PASSWORD'],$this->data['DB']);
+
+ /* check if we have to update, add */
if($this->initialy_was_account&&$this->is_account){
- $this->handle->updateComputerInformations($attrs,$this->dn);
+ $this->handle->updateComputerInformations($attrs,$this->orig_dn);
}elseif($this->is_account){
$this->handle->addComputerInformations($attrs,$this->dn);
}
$tmp = $this->handle->getComputerInformations($this->dn);
$this->handle->addDevicesToComputer($this->usedDevices,$tmp[0]['ID']);
- $this->handle->addAttachmentsToComputer($this->usedAttachments,$tmp[0]['ID']);
}
}
/* 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);