![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/admin/systems/class_glpiAccount.inc b/plugins/admin/systems/class_glpiAccount.inc
index f07dd853ef822b9e926b899dc3923de9eec320df..643503a2fd6c4db528b82673baddbcfb7f20c8a2 100644 (file)
var $cli_parameters= array("eins" => "Eins ist toll", "zwei" => "Zwei ist noch besser");
/* attribute list for save action */
- var $ignore_account= TRUE;
+ var $ignore_account= FALSE;
var $attributes= array("ID","name","contact",
"tech_num","comments","date_mod","os","location","domain","network","contact_num",
"model","type","is_template","FK_glpi_enterprise","deleted");
- var $ID ;
- var $name ="";
- var $contact ="";
- var $contact_num ="";
-
- var $tech_num ="";
- var $comments ="";
-
- var $addUser ="";
+ var $ID ; // Is set if this entry is edited
+ var $name = ""; // This should be the dn of this entry
+ var $contact = ""; // Empty
+
+ var $comments = ""; // Comment
+
+ var $contact_num = ""; // Contact person
+ var $tech_num = ""; // Technical responsible person
+
+ var $addUser = ""; // This is used to remember if a dialog was opened for tech_num or contact_num
- var $date_mod ="";
- var $os =0;
- var $location =0;
- var $domain =0;
- var $network =0;
+ var $date_mod = ""; // Modification timestamp
+ var $os = 0; // Operating system
+ var $location = 0; // Not used yet
+ var $domain = 0; // ? Set to 0
+ var $network = 0; // ? Set to 0
- var $model =0;
- var $type =0;
- var $is_template =0;
- var $FK_glpi_enterprise =0;
- var $deleted ="N";
+ var $model = 0; // ? Can't remember this, it isn't used in GOsa
+ var $type = 0; // System type id
+ var $is_template = 0; // Used as template ?
+ var $FK_glpi_enterprise = 0; // Manufacturer id
+ var $deleted = "N"; // Deleted entries should have this set to Y
+ /* Not necessary, cause we use mysql databse */
var $objectclasses= array("whatever");
+ /* Used to remember if this was an account (simply: is this an edited entry) */
var $initialy_was_account = false;
- var $edit_type =false;
- var $edit_os =false;
+ /* Remember current dialog */
+ var $edit_type = false;
+ var $edit_os = false;
var $data;
- var $handle = NULL;
+ var $handle = NULL; // Glpi class handle used to query database
- var $cur_dialog = NULL;
+ var $cur_dialog = NULL; // This contains the sub dialog handle
- var $orig_dn;
- var $ui;
+ var $orig_dn; // To check if dn, has changed
+ var $ui; // Some GOsa specific user informations
- var $usedDevices = array();
- var $usedAttachments = array();
+ var $usedDevices = array(); // Which devices are currently selected
+ var $usedAttachments = array(); // Used Attachments
/* Contructor
Sets default values and checks if we already have an existing glpi account
plugin::plugin ($config, $dn);
$this->ui= get_userinfo();
+ /* Abort class construction, if no db is defined */
if(!isset($this->config->data['SERVERS']['GLPI'])){
return;
}
+ // Get informations about databse connection
$this->data = $this->config->data['SERVERS']['GLPI'];
+ // Abort if mysql extension is missing
if(!is_callable("mysql_connect")){
return;
}
+ // Create handle of glpi class, and check if database connection is established
$this->handle = new glpiDB($this->data['SERVER'],$this->data['LOGIN'],$this->data['PASSWORD'],$this->data['DB']);
if(!$this->handle->is_connected){
return;
}
+ // If this dn is already used in database, then get all informations for this entry
if($this->handle->is_account($this->dn)){
$this->is_account = true;
$tmp = ($this->handle->getComputerInformations($this->dn));
$this->is_account = false;
}
- $this->name = $this->dn;
- $this->orig_dn = $this->dn;
+ /* set defaults */
+ $this->name = $this->dn;
+ $this->orig_dn = $this->dn;
$this->initialy_was_account = $this->is_account;
To avoid undefined indexes, if there is an error with the glpi db
*/
foreach(array("SystemTypes","SystemTypeKeys","Manufacturers",
- "OSs","TechnicalResponsibles","InstalledDevices","Attachments",
+ "OSs","TechnicalResponsibles","InstalledDevices","Attachments","AttachmentKeys",
"OSKeys","OSs","ManufacturerKeys","InstalledDeviceKeys") as $attr){
$smarty->assign($attr,array());
$smarty->assign($attr."ACL"," disabled ");
/* Remove Attachment fro this tab
*/
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]);
+ }
}
}
/* 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
/* 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['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
/* Abort user selection
*/
+ $smarty->assign("AbortSelectUser","SelectUserCancel");
if(isset($_POST['SelectUserCancel'])){
$this->dialog = false;
$this->addUser ="";
*/
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*/
/* Assign smarty defaults */
foreach(array("SystemTypes","SystemTypeKeys","Manufacturers","OSs","TechnicalResponsibles","InstalledDevices","Attachments") as $attr){
$smarty->assign($attr,array());
+ }
+
+ foreach($this->attributes as $attr){
$smarty->assign($attr."ACL",chkacl($this->acl,$attr));
}
/* 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));
}
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);
+ }
+
}
function getDevices(){
}
}
+ /* Return used attachments */
function getUsedAttachments()
{
$atts =$this->handle->getAttachments();