index 606f18c3ed99a55f883124fc076fa62911413151..2e17bb2d02d87937839665b1a7c0b9df9ee006d2 100644 (file)
/* Attributes to initialise for each subObject */
var $subAttributes = array("cn","description","FAIvariableContent");
- var $sub64coded = array("FAIvariableContent");
+ var $sub64coded = array();
/* Specific attributes */
var $cn = ""; // The class name for this object
$this->SubObjects[$object['cn'][0]]['status'] = "edited";
$this->SubObjects[$object['cn'][0]]['dn'] = $object['dn'];
}
+ ksort($this->SubObjects);
}
}
$this->is_dialog=true;
}
+ $_SESSION['objectinfo'] = $this->dn;
/* Edit selected Sub Object */
if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){
$this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$_POST['SubObject']]);
+ $_SESSION['objectinfo'] = $this->SubObjects[$_POST['SubObject']]['dn'];
$this->is_dialog=true;
}
$this->is_dialog=false;
unset($this->dialog);
$this->dialog=NULL;
+ ksort($this->SubObjects);
}
}
$smarty->assign("SubObjects",$this->getList());
$smarty->assign("SubObjectKeys",array_flip($this->getList()));
- /* Assign variables */
+
+ /* Magic quotes GPC, escapes every ' " \, to solve some security risks
+ * If we post the escaped strings they will be escaped again
+ */
foreach($this->attributes as $attrs){
- $smarty->assign($attrs,$this->$attrs);
+ if(get_magic_quotes_gpc()){
+ $smarty->assign($attrs,stripslashes($this->$attrs));
+ }else{
+ $smarty->assign($attrs,($this->$attrs));
+ }
}
+
$display.= $smarty->fetch(get_template_path('faiVariable.tpl', TRUE));
return($display);
}
$a_return=array();
foreach($this->SubObjects as $obj){
if($obj['status'] != "delete"){
- $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]";
+
+ if((isset($obj['description']))&&(!empty($obj['description']))&&(!preg_match("/\[\*\]/",$obj['description']))){
+ if (preg_match("/\[\*\]/", $obj['description'])){
+ $a_return[$obj['cn']]= $obj['cn']." [".preg_replace("/\s*\[\*\]\s*/", "", $obj['description'])."]";
+ } else {
+ $a_return[$obj['cn']]= $obj['cn']."=".$obj['FAIvariableContent']." [".$obj['description']."]";
+ }
+ }else{
+ if (preg_match("/\[\*\]/", $obj['description'])){
+ $a_return[$obj['cn']]= $obj['cn'];
+ } else {
+ $a_return[$obj['cn']]= $obj['cn']."=".$obj['FAIvariableContent'];
+ }
+ }
}
}
return($a_return);
*/
function save_object()
{
- plugin::save_object();
- foreach($this->attributes as $attrs){
- if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
+ if(isset($_POST['FAIvariable_posted'])){
+ plugin::save_object();
+ foreach($this->attributes as $attrs){
+ if(isset($_POST[$attrs])){
+ $this->$attrs = $_POST[$attrs];
+ }
}
}
}
function check()
{
$message= array();
- $str = utf8_encode("üöä");
- if((empty($this->description))||(preg_match("/[^a-z0-9".$str."\.,;:\-_\? ]/i",$this->description))){
- $message[]=_("Please enter a valid description.");
- }
return ($message);
}
$ldap->modify($this->attrs);
}else{
/* Write FAIscript to ldap*/
- $ldap->cd($this->dn);
- $ldap->create_missing_trees($this->dn);
+ $ldap->cd(preg_replace('/^[^,]+,[^,]+,/', '', $this->dn));
+ $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($this->dn);
$ldap->add($this->attrs);
}
$tmp['objectClass'] = $this->subClasses;
$sub_dn = "cn=".$obj['cn'].",".$this->dn;
+
+ if($obj['status']=="new"){
+ $ldap->cat($sub_dn);
+ if($ldap->count()){
+ $obj['status']="modify";
+ }
+ }
if($obj['status'] == "delete"){
$ldap->cd($sub_dn);
$ldap->modify($tmp);
$this->handle_post_events("modify");
}elseif($obj['status']=="new"){
- $ldap->cd($sub_dn);
- $ldap->create_missing_trees($sub_dn);
+
+ if($tmp['description'] == array()){
+ unset($tmp['description']);
+ }
+
+ $ldap->cd(preg_replace('/^[^,]+,[^,]+,/', '', $sub_dn));
+ $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $sub_dn));
$ldap->cd($sub_dn);
$ldap->add($tmp);
$this->handle_post_events("add");