index 3ee246aca9c9781b2e3b23c062a79f253a3690f8..bd2ebf893b2aef9c60421eac6f799f9d3a808ab1 100644 (file)
/* Attributes to initialise for each subObject */
var $subAttributes = array("cn","description","FAIpriority","FAIscript");
/* Attributes to initialise for each subObject */
var $subAttributes = array("cn","description","FAIpriority","FAIscript");
- var $sub64coded = array("FAIscript");
+ var $sub64coded = array();
/* Specific attributes */
var $cn = ""; // The class name for this object
/* Specific attributes */
var $cn = ""; // The class name for this object
}
foreach($this->sub64coded as $codeIt){
}
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]));
}
}
+
+ foreach($this->subAttributes as $attrs){
+ $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]]['status'] = "edited";
$this->SubObjects[$object['cn'][0]]['dn'] = $object['dn'];
}
$this->SubObjects[$object['cn'][0]]['status'] = "edited";
$this->SubObjects[$object['cn'][0]]['dn'] = $object['dn'];
}
+ ksort($this->SubObjects);
}
}
function execute()
{
}
}
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Fill templating stuff */
$smarty= get_smarty();
$display= "";
/* Fill templating stuff */
$smarty= get_smarty();
$display= "";
$this->is_dialog=true;
}
$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']]);
/* 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=true;
}
unset($this->dialog);
$this->dialog=NULL;
}
unset($this->dialog);
$this->dialog=NULL;
}
+ ksort($this->SubObjects);
}
/* Cancel Dialog */
}
/* Cancel Dialog */
$smarty->assign("SubObjects",$this->getList());
$smarty->assign("SubObjectKeys",array_flip($this->getList()));
$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){
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('faiScript.tpl', TRUE));
}
$display.= $smarty->fetch(get_template_path('faiScript.tpl', TRUE));
$a_return=array();
foreach($this->SubObjects as $obj){
if($obj['status'] != "delete"){
$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']))){
+ $a_return[$obj['cn']]= $obj['cn']." [".$obj['description']."]";
+ }else{
+ $a_return[$obj['cn']]= $obj['cn'];
+ }
}
}
return($a_return);
}
}
return($a_return);
*/
function save_object()
{
*/
function save_object()
{
- plugin::save_object();
- foreach($this->attributes as $attrs){
- if(isset($_POST[$attrs])){
- $this->$attrs = $_POST[$attrs];
+ if(isset($_POST['FAIscript_posted'])){
+ plugin::save_object();
+ foreach($this->attributes as $attrs){
+ if(isset($_POST[$attrs])){
+ $this->$attrs = $_POST[$attrs];
+ }
}
}
}
}
}
}
function check()
{
$message= array();
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);
}
return ($message);
}
$ldap->modify($this->attrs);
}else{
/* Write FAIscript to ldap*/
$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);
}
$ldap->cd($this->dn);
$ldap->add($this->attrs);
}
foreach($Objects as $name => $obj){
foreach($this->sub64coded as $codeIt){
foreach($Objects as $name => $obj){
foreach($this->sub64coded as $codeIt){
- $obj[$codeIt]=base64_encode($obj[$codeIt]);
+ $obj[$codeIt]=base64_encode(stripslashes($obj[$codeIt]));
}
$tmp = array();
}
$tmp = array();
if(empty($obj[$attrs])){
$obj[$attrs] = array();
}
if(empty($obj[$attrs])){
$obj[$attrs] = array();
}
- $tmp[$attrs] = $obj[$attrs];
+ if(!is_array($obj[$attrs])){
+ $tmp[$attrs] = stripslashes($obj[$attrs]);
+ }else{
+ $tmp[$attrs] = $obj[$attrs];
+ }
}
$tmp['objectClass'] = $this->subClasses;
$sub_dn = "cn=".$obj['cn'].",".$this->dn;
}
$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(empty($tmp['FAIpriority'])){
+ $tmp['FAIpriority'] ="0";
+ }
+
if($obj['status'] == "delete"){
$ldap->cd($sub_dn);
$ldap->rmdir_recursive($sub_dn);
if($obj['status'] == "delete"){
$ldap->cd($sub_dn);
$ldap->rmdir_recursive($sub_dn);
$ldap->modify($tmp);
$this->handle_post_events("modify");
}elseif($obj['status']=="new"){
$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']);
+ }
+ if($tmp['FAIscript']==array()){
+ $tmp['FAIscript']=" ";
+ }
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
$ldap->cd($sub_dn);
$ldap->add($tmp);
$this->handle_post_events("add");
$ldap->cd($sub_dn);
$ldap->add($tmp);
$this->handle_post_events("add");
show_ldap_error($ldap->get_error());
}
}
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:
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: