X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Ffai%2Fclass_faiTemplate.inc;h=f8d4c6b8b20e235aa37634cbe0f68f9f77b5d3e1;hb=ca98ca8c7d1adccfcf78ccc86faa5d9e2d69967e;hp=2c43775436fd570e98393b3b1c8c00dfaebd3621;hpb=1d9578d8ee2d5a59bd4f9777785ef8567ab8cef1;p=gosa.git diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc index 2c4377543..f8d4c6b8b 100644 --- a/plugins/admin/fai/class_faiTemplate.inc +++ b/plugins/admin/fai/class_faiTemplate.inc @@ -24,8 +24,8 @@ class faiTemplate extends plugin var $subClassName = "faiTemplateEntry"; /* Attributes to initialise for each subObject */ - var $subAttributes = array("cn","description","FAItemplateFile","FAItemplatePath"); - var $sub64coded = array("FAItemplateFile","FAItemplatePath"); + var $subAttributes = array("cn","description","FAItemplateFile","FAItemplatePath","FAIowner","FAImode"); + var $sub64coded = array(); /* Specific attributes */ var $cn = ""; // The class name for this object @@ -64,17 +64,23 @@ class faiTemplate extends plugin } foreach($this->sub64coded as $codeIt){ - $this->SubObjects[$object['cn'][0]][$codeIt]=base64_decode($this->SubObjects[$object['cn'][0]][$codeIt]); + $this->SubObjects[$object['cn'][0]][$codeIt]= base64_decode($this->SubObjects[$object['cn'][0]][$codeIt]); } - - $this->SubObjects[$object['cn'][0]]['status'] = "edited"; - $this->SubObjects[$object['cn'][0]]['dn'] = $object['dn']; + + $this->SubObjects[$object['cn'][0]]['FAItemplateFile']= $this->readBinary("FAItemplateFile",$object['dn']); + + $this->SubObjects[$object['cn'][0]]['status']= "edited"; + $this->SubObjects[$object['cn'][0]]['dn']= $object['dn']; } + ksort($this->SubObjects); } } function execute() { + /* Call parent execute */ + plugin::execute(); + /* Fill templating stuff */ $smarty= get_smarty(); $display= ""; @@ -85,9 +91,15 @@ class faiTemplate extends plugin $this->is_dialog=true; } + if($this->dn != "new"){ + $_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; } @@ -125,6 +137,7 @@ class faiTemplate extends plugin $this->is_dialog=false; unset($this->dialog); $this->dialog=NULL; + ksort($this->SubObjects); } } @@ -144,11 +157,19 @@ class faiTemplate extends plugin $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('faiTemplate.tpl', TRUE)); return($display); } @@ -159,7 +180,15 @@ class faiTemplate extends plugin $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']))){ + if(strlen($obj['description']) > 60){ + $obj['description'] = substr($obj['description'],0,60)."..."; + } + $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]"; + }else{ + $a_return[$obj['cn']]= $obj['cn']; + } } } return($a_return); @@ -180,10 +209,12 @@ class faiTemplate extends plugin */ function save_object() { - plugin::save_object(); - foreach($this->attributes as $attrs){ - if(isset($_POST[$attrs])){ - $this->$attrs = $_POST[$attrs]; + if(isset($_POST['FAItemplate_posted'])){ + plugin::save_object(); + foreach($this->attributes as $attrs){ + if(isset($_POST[$attrs])){ + $this->$attrs = $_POST[$attrs]; + } } } } @@ -193,10 +224,6 @@ class faiTemplate extends plugin 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); } @@ -215,8 +242,8 @@ class faiTemplate extends plugin $ldap->modify($this->attrs); }else{ /* Write FAIscript to ldap*/ - $ldap->cd($this->dn); - $ldap->create_missing_trees($this->dn); + $ldap->cd($this->config->current['BASE']); + $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn)); $ldap->cd($this->dn); $ldap->add($this->attrs); } @@ -240,6 +267,7 @@ class faiTemplate extends plugin } foreach($Objects as $name => $obj){ + foreach($this->sub64coded as $codeIt){ $obj[$codeIt]=base64_encode($obj[$codeIt]); } @@ -255,6 +283,13 @@ class faiTemplate extends plugin $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->rmdir_recursive($sub_dn); @@ -264,8 +299,12 @@ class faiTemplate extends plugin $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($this->config->current['BASE']); + $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $sub_dn)); $ldap->cd($sub_dn); $ldap->add($tmp); $this->handle_post_events("add"); @@ -273,6 +312,36 @@ class faiTemplate extends plugin 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")); + } + + 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: