index 6ba262020c0ce7a4ae87a14ed2de02a5dd9f9b62..371a57c56c69de091b97bbba99442c35ade46404 100644 (file)
$this->SubObjects[$object['cn'][0]][$attrs]=addslashes($this->SubObjects[$object['cn'][0]][$attrs]);
}
- $this->SubObjects[$object['cn'][0]]['FAIscript'] = addslashes ($this->readBinary("FAIscript",$object['dn']));
+ $this->SubObjects[$object['cn'][0]]['FAIscript'] = addslashes ($ldap->get_attribute($object['dn'], "FAIscript",$r_array=0));
$this->SubObjects[$object['cn'][0]]['status'] = "edited";
$this->SubObjects[$object['cn'][0]]['dn'] = $object['dn'];
Containing FAIscripts
*/
$divlist = new divSelectBox("FAIscripts");
+ $divlist->setHeight(400);
if((chkacl($this->acl,"cn")!="") || ($this->FAIstate == "freeze")){
$img_edit = "<input type='image' src='images/edit.png' name='editscript_%s' title='"._("edit")."' alt='"._("edit")."'>";
$img_remo = "";
if(($this->SubObjects[$key]['status'] == "new") || ($this->SubObjects[$key]['dn'] == "new")){
$down = "";
}else{
- $down = "<a href='getFAIscript.php?id=".base64_encode($name['dn'])."' target='_blank'>
+ $down = "<a href='getFAIscript.php?id=".base64_encode($name['dn'])."' >
<img src='images/save.png' alt='"._("Download")."' title='"._("Download")."' border=0>
</a>";
}
"attach"=>"style='border-right: 0px;width:50px;text-align:right;'")));
}
$smarty->assign("Entry_divlist",$divlist->DrawList());
- /* Divlist creation complete
- */
-
- $smarty->assign("SubObjects",$this->getList());
- $smarty->assign("SubObjectKeys",array_flip($this->getList()));
/* Magic quotes GPC, escapes every ' " \, to solve some security risks
* If we post the escaped strings they will be escaped again
$ldap = $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$ldap->rmdir_recursive($this->dn);
+ show_ldap_error($ldap->get_error(), _("Removing FAI script base failed"));
$this->handle_post_events("remove");
}
$ldap = $this->config->get_ldap_link();
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn,array("objectClass"));
if($ldap->count()!=0){
/* Write FAIscript to ldap*/
$ldap->cd($this->dn);
$ldap->cd($this->dn);
$ldap->add($this->attrs);
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Creating FAI script base failed"));
+
+ /* Do object tagging */
+ $this->handle_object_tagging();
/* Prepare FAIscriptEntry to write it to ldap
* First sort array.
$sub_dn = "cn=".$obj['cn'].",".$this->dn;
if($obj['status']=="new"){
- $ldap->cat($sub_dn);
+ $ldap->cat($sub_dn,array("objectClass"));
if($ldap->count()){
- $obj['status']="modify";
+ $obj['status']="edited";
}
}
$tmp['FAIpriority'] ="0";
}
+ /* Check if gosaAdministrativeUnitTag is required as object class */
+ if($obj['status'] == "edited"){
+ $ldap->cat($sub_dn,array("objectClass"));
+ $attrs = $ldap->fetch();
+ if(isset($attrs['objectClass'])){
+ if(in_array_ics("gosaAdministrativeUnitTag",$attrs['objectClass'])){
+ $tmp['objectClass'][] = "gosaAdministrativeUnitTag";
+ }
+ }
+ }
+
if($obj['status'] == "delete"){
$ldap->cd($sub_dn);
$ldap->rmdir_recursive($sub_dn);
$this->handle_post_events("remove");
+ show_ldap_error($ldap->get_error(), _("Removing FAI script failed"));
}elseif($obj['status'] == "edited"){
$ldap->cd($sub_dn);
$this->cleanup();
$ldap->cd($sub_dn);
$ldap->add($tmp);
$this->handle_post_events("add");
+ show_ldap_error($ldap->get_error(), _("Saving FAI script failed"));
}
- show_ldap_error($ldap->get_error());
- }
- }
-
- function readBinary($attr,$dn){
- $Data ="";
- $ds= ldap_connect($this->config->current['SERVER']);
- ldap_set_option($ds, LDAP_OPT_PROTOCOL_VERSION, 3);
- if (function_exists("ldap_set_rebind_proc") && isset($this->config->current['RECURSIVE']) && $this->config->current['RECURSIVE'] == "true") {
- ldap_set_option($this->cid, LDAP_OPT_REFERRALS, 1);
- ldap_set_rebind_proc($ds, array(&$this, "rebind"));
+ $this->handle_object_tagging($sub_dn, $this->gosaUnitTag);
}
-
- if(isset($this->config->current['TLS']) && $this->config->current['TLS'] == "true"){
- ldap_start_tls($ds);
- }
-
- $r = ldap_bind($ds);
- $sr = @ldap_read($ds, $dn, $attr."=*", array($attr));
-
- if ($sr) {
- $ei=ldap_first_entry($ds, $sr);
- if ($ei) {
- if ($info = ldap_get_values_len($ds, $ei, $attr)){
- $Data= $info[0];
- }
- }
- }
-
- /* close conncetion */
- ldap_unbind($ds);
- return($Data);
}
-
-
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: