From: cajus Date: Thu, 3 Apr 2008 12:52:11 +0000 (+0000) Subject: Updated FAI stuff X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=0e18d29f78a782f1328668d201313e335ce42c2e;p=gosa.git Updated FAI stuff -Removed Special tabs, because this tabs can't save their data if this object is inherited from an earlier release. it does not exists in this case. -Fixed ldap errors. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10146 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/fai/admin/fai/class_faiHook.inc b/gosa-plugins/fai/admin/fai/class_faiHook.inc index d509e4a27..82e14b4a8 100644 --- a/gosa-plugins/fai/admin/fai/class_faiHook.inc +++ b/gosa-plugins/fai/admin/fai/class_faiHook.inc @@ -465,9 +465,6 @@ class faiHook extends plugin $ldap = $this->config->get_ldap_link(); FAI::prepare_to_save_FAI_object($this->dn,$this->attrs); - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); - } if($this->initially_was_account){ new log("modify","fai/".get_class($this),$this->dn,$this->attributes); diff --git a/gosa-plugins/fai/admin/fai/class_faiPackage.inc b/gosa-plugins/fai/admin/fai/class_faiPackage.inc index d76d2dd78..075d80072 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPackage.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPackage.inc @@ -471,9 +471,6 @@ class faiPackage extends plugin } FAI::prepare_to_save_FAI_object($this->dn,$this->attrs); - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); - } if($this->initially_was_account){ new log("modify","fai/".get_class($this),$this->dn,$this->attributes); diff --git a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc index 161deb2c5..2ef87bc1f 100644 --- a/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiPartitionTable.inc @@ -410,9 +410,6 @@ class faiPartitionTable extends plugin $ldap = $this->config->get_ldap_link(); FAI::prepare_to_save_FAI_object($this->dn,$this->attrs); - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); - } if($this->initially_was_account){ new log("modify","fai/".get_class($this),$this->dn,$this->attributes); diff --git a/gosa-plugins/fai/admin/fai/class_faiProfile.inc b/gosa-plugins/fai/admin/fai/class_faiProfile.inc index 4eec15fa0..9fb9ae0f7 100644 --- a/gosa-plugins/fai/admin/fai/class_faiProfile.inc +++ b/gosa-plugins/fai/admin/fai/class_faiProfile.inc @@ -442,10 +442,6 @@ class faiProfile extends plugin }else{ new log("create","fai/".get_class($this),$this->dn,$this->attributes); } - - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); - } } diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc index ce8a710a4..331ca3799 100644 --- a/gosa-plugins/fai/admin/fai/class_faiScript.inc +++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc @@ -512,9 +512,6 @@ class faiScript extends plugin $ldap = $this->config->get_ldap_link(); FAI::prepare_to_save_FAI_object($this->dn,$this->attrs); - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); - } if($this->initially_was_account){ new log("modify","fai/".get_class($this),$this->dn,$this->attributes); diff --git a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc index 23f43c33e..0fdd00ed4 100644 --- a/gosa-plugins/fai/admin/fai/class_faiTemplate.inc +++ b/gosa-plugins/fai/admin/fai/class_faiTemplate.inc @@ -442,9 +442,6 @@ class faiTemplate extends plugin $ldap = $this->config->get_ldap_link(); FAI::prepare_to_save_FAI_object($this->dn,$this->attrs); - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); - } if($this->initially_was_account){ new log("modify","fai/".get_class($this),$this->dn,$this->attributes); diff --git a/gosa-plugins/fai/admin/fai/class_faiVariable.inc b/gosa-plugins/fai/admin/fai/class_faiVariable.inc index e13a8f38b..1c819c096 100644 --- a/gosa-plugins/fai/admin/fai/class_faiVariable.inc +++ b/gosa-plugins/fai/admin/fai/class_faiVariable.inc @@ -332,9 +332,6 @@ class faiVariable extends plugin $ldap = $this->config->get_ldap_link(); FAI::prepare_to_save_FAI_object($this->dn,$this->attrs); - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, 0, get_class())); - } if($this->initially_was_account){ new log("modify","fai/".get_class($this),$this->dn,$this->attributes); diff --git a/gosa-plugins/fai/admin/fai/tabsHook.inc b/gosa-plugins/fai/admin/fai/tabsHook.inc index bf4709073..ad41dbdf8 100644 --- a/gosa-plugins/fai/admin/fai/tabsHook.inc +++ b/gosa-plugins/fai/admin/fai/tabsHook.inc @@ -8,7 +8,7 @@ class tabsHook extends tabs { tabs::tabs($config, $data, $dn,$category); /* Add references/acls/snapshots */ - $this->addSpecialTabs(); +# $this->addSpecialTabs(); } function check($ignore_account= FALSE) diff --git a/gosa-plugins/fai/admin/fai/tabsPackage.inc b/gosa-plugins/fai/admin/fai/tabsPackage.inc index 94dca4e20..197f86370 100644 --- a/gosa-plugins/fai/admin/fai/tabsPackage.inc +++ b/gosa-plugins/fai/admin/fai/tabsPackage.inc @@ -9,7 +9,7 @@ class tabsPackage extends tabs tabs::tabs($config, $data, $dn,$category); /* Add references/acls/snapshots */ - $this->addSpecialTabs(); +# $this->addSpecialTabs(); } function check($ignore_account= FALSE) diff --git a/gosa-plugins/fai/admin/fai/tabsPartition.inc b/gosa-plugins/fai/admin/fai/tabsPartition.inc index 9d409e6c7..b1aab1e09 100644 --- a/gosa-plugins/fai/admin/fai/tabsPartition.inc +++ b/gosa-plugins/fai/admin/fai/tabsPartition.inc @@ -9,7 +9,7 @@ class tabsPartition extends tabs tabs::tabs($config, $data, $dn,$category); /* Add references/acls/snapshots */ - $this->addSpecialTabs(); +# $this->addSpecialTabs(); } function check($ignore_account= FALSE) diff --git a/gosa-plugins/fai/admin/fai/tabsProfile.inc b/gosa-plugins/fai/admin/fai/tabsProfile.inc index f67b22c0c..64fc7025c 100644 --- a/gosa-plugins/fai/admin/fai/tabsProfile.inc +++ b/gosa-plugins/fai/admin/fai/tabsProfile.inc @@ -9,7 +9,7 @@ class tabsProfile extends tabs tabs::tabs($config, $data, $dn,$category); /* Add references/acls/snapshots */ - $this->addSpecialTabs(); +# $this->addSpecialTabs(); } function check($ignore_account= FALSE) diff --git a/gosa-plugins/fai/admin/fai/tabsScript.inc b/gosa-plugins/fai/admin/fai/tabsScript.inc index eb283a2c6..01cafc149 100644 --- a/gosa-plugins/fai/admin/fai/tabsScript.inc +++ b/gosa-plugins/fai/admin/fai/tabsScript.inc @@ -9,7 +9,7 @@ class tabsScript extends tabs tabs::tabs($config, $data, $dn,$category); /* Add references/acls/snapshots */ - $this->addSpecialTabs(); +# $this->addSpecialTabs(); } function check($ignore_account= FALSE) diff --git a/gosa-plugins/fai/admin/fai/tabsTemplate.inc b/gosa-plugins/fai/admin/fai/tabsTemplate.inc index 8b1af36e3..3c8576e3c 100644 --- a/gosa-plugins/fai/admin/fai/tabsTemplate.inc +++ b/gosa-plugins/fai/admin/fai/tabsTemplate.inc @@ -9,7 +9,7 @@ class tabsTemplate extends tabs tabs::tabs($config, $data, $dn, $category); /* Add references/acls/snapshots */ - $this->addSpecialTabs(); +# $this->addSpecialTabs(); } function check($ignore_account= FALSE) diff --git a/gosa-plugins/fai/admin/fai/tabsVariable.inc b/gosa-plugins/fai/admin/fai/tabsVariable.inc index c0476577e..0a4dcfbc6 100644 --- a/gosa-plugins/fai/admin/fai/tabsVariable.inc +++ b/gosa-plugins/fai/admin/fai/tabsVariable.inc @@ -9,7 +9,7 @@ class tabsVariable extends tabs tabs::tabs($config, $data, $dn, $category); /* Add references/acls/snapshots */ - $this->addSpecialTabs(); +# $this->addSpecialTabs(); } function check($ignore_account= FALSE)