X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Ffai%2Fadmin%2Ffai%2Fclass_faiScript.inc;h=2703ae7219a1bc6b6f793396f920c84f7922642e;hb=89f67cee6e7bd74cbc0f1d489d573b8101d48ac3;hp=d94b760c24e9e159ac6dd1b6182422f7117eab56;hpb=6d7573648de097813245616c1027236001b34db3;p=gosa.git diff --git a/gosa-plugins/fai/admin/fai/class_faiScript.inc b/gosa-plugins/fai/admin/fai/class_faiScript.inc index d94b760c2..2703ae721 100644 --- a/gosa-plugins/fai/admin/fai/class_faiScript.inc +++ b/gosa-plugins/fai/admin/fai/class_faiScript.inc @@ -30,7 +30,7 @@ class faiScript extends plugin var $is_dialog = false; // specifies which buttons will be shown to save or abort var $SubObjects = array(); // All leafobjects of this object - var $FAIstate = ""; + var $FAIstate = "branch"; var $sort_by = "name"; var $sort_order = "up"; @@ -47,46 +47,55 @@ class faiScript extends plugin * First read SubObjects from ldap ... and then the partition definitions for the SubObjects. */ if($dn != "new"){ - $this->dn =$dn; - /* Get FAIstate - */ - if(isset($this->attrs['FAIstate'][0])){ - $this->FAIstate = $this->attrs['FAIstate'][0]; - } - /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry) */ - $ldap = $this->config->get_ldap_link(); - $ldap->cd ($this->dn); - - $attrs_to_search = $this->subAttributes; - $attrs_to_search[] = "FAIstate"; - $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search); - $data = array(); - while($object = $ldap->fetch()){ - $data[] = $object; - } - foreach($data as $object){ + $res = FAI::get_all_objects_for_given_base($this->dn,"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); + foreach($res as $obj){ - /* Skip objects, that are tagged as removed */ - if(isset($object['FAIstate'][0])){ - if(preg_match("/removed$/",$object['FAIstate'][0])){ - continue; - } - } + /* Skip not relevant objects */ + if(!preg_match("/".preg_quote($this->dn, '/')."$/i",$obj['dn'])) continue; - /* Set status for save management */ $objects = array(); $objects['status'] = "FreshLoaded"; - $objects['dn'] = $object['dn']; + $objects['dn'] = $obj['dn']; $objects = $this->get_object_attributes($objects,$this->subAttributes); $this->SubObjects[$objects['cn']] = $objects; } - } + + $this->is_new = FALSE; + if($this->dn == "new"){ + $this->is_new =TRUE; + } + $this->ui = get_userinfo(); + + $this->scriptListWidget= new sortableListing($this->convertList(TRUE), $this->convertList()); + $this->scriptListWidget->setDeleteable(true); + $this->scriptListWidget->setInstantDelete(false); + $this->scriptListWidget->setEditable(true); + $this->scriptListWidget->setWidth("100%"); + $this->scriptListWidget->setHeight("140px"); + $this->scriptListWidget->setHeader(array(_("Name"),_("Description"))); + } + + + function convertList($type = FALSE) + { + $data = array(); + $s_acl = $this->ui->get_permissions($this->dn,"fai/faiScriptEntry","FAIscript"); + foreach($this->SubObjects as $cn => $entry){ + if($entry['status'] == "delete") continue; + if($type){ + $data[$cn] = $entry; + }else{ + if(!isset($entry['description'])) $entry['description']=""; + $data[$cn] = array('data' => array($entry['cn'], $entry['description'])); + } + } + return($data); } @@ -124,9 +133,9 @@ class faiScript extends plugin /* Return a valid dn to fetch acls. Because 'new' will not work. */ function acl_base_for_current_object($dn) { - if($dn == "new"){ + if($dn == "new" || $dn == ""){ if($this->dn == "new"){ - $dn= "cn=dummy,".session::get('CurrentMainBase'); + $dn= $this->parent->parent->acl_base; }else{ $dn = $this->dn; } @@ -150,8 +159,9 @@ class faiScript extends plugin $display= ""; /* Add new sub object */ - if(isset($_POST['AddSubObject'])){ + if(isset($_POST['AddSubObject']) && !preg_match("/freeze/i",$this->FAIstate)){ $this->dialog= new $this->subClassName($this->config,"new"); + $this->dialog->FAIstate = $this->FAIstate; $this->dialog->set_acl_base($this->acl_base); $this->dialog->set_acl_category("fai"); $this->dialog->parent = &$this; @@ -159,80 +169,53 @@ class faiScript extends plugin } if($this->dn != "new"){ - session::set('objectinfo',$this->dn); + set_object_info($this->dn); } - /* File download requested */ - if(isset($_GET['getFAIscript'])){ - if(isset($this->SubObjects[base64_decode($_GET['getFAIscript'])])){ - $obj = $this->SubObjects[base64_decode($_GET['getFAIscript'])]; - $obj = $this->get_object_attributes($obj,$this->sub_Load_Later); - send_binary_content(stripslashes($obj['FAIscript']),$obj['cn'].".FAIscript"); - } - } - - /* Handle posts */ - $s_action = $s_entry = ""; - foreach($_POST as $name => $value){ - - /* Edit script posted */ - if(preg_match("/^editscript_/",$name)){ - $s_action = "edit"; - $s_entry = preg_replace("/^editscript_/","",$name); - $s_entry = base64_decode(preg_replace("/_.*/","",$s_entry)); - break; - } - - /* Delete script requested */ - if(preg_match("/^deletescript_/",$name)){ - $s_action = "remove"; - $s_entry = preg_replace("/^deletescript_/","",$name); - $s_entry = base64_decode(preg_replace("/_.*/","",$s_entry)); - break; - } - } + $this->scriptListWidget->setAcl($this->getacl("")); + $this->scriptListWidget->save_object(); + $action = $this->scriptListWidget->getAction(); + if($action['action'] =="edit"){ + $s_entry = $this->scriptListWidget->getKey($action['targets'][0]); + if(isset($this->SubObjects[$s_entry])){ - if(isset($_GET['act']) && $_GET['act'] == "edit" && isset($_GET['id'])){ - $s_entry = base64_decode($_GET['id']); - if(isset($this->SubObjects[$s_entry])){ - $s_action = "edit"; - } - } + $obj = $this->SubObjects[$s_entry]; + if($obj['status'] == "FreshLoaded"){ + $obj = $this->get_object_attributes($obj,$this->sub_Load_Later); + } - if($s_action =="edit" && isset($this->SubObjects[$s_entry])){ + /* Create new dialog and set acl attributes */ + $this->dialog= new $this->subClassName($this->config,$this->dn,$obj); + $this->dialog->FAIstate = $this->FAIstate; + $this->dialog->set_acl_base($this->acl_base_for_current_object($obj['dn'])); + $this->dialog->set_acl_category("fai"); - /* Get object, and load missing entry values */ - $obj = $this->SubObjects[$s_entry]; - if($obj['status'] == "FreshLoaded"){ - $obj = $this->get_object_attributes($obj,$this->sub_Load_Later); + /* Assign some additional dialog informations like headline and parent */ + set_object_info($obj['dn']); + $this->dialog->parent = &$this; + $this->is_dialog=true; } - - /* Create new dialog and set acl attributes */ - $this->dialog= new $this->subClassName($this->config,$this->dn,$obj); - $this->dialog->set_acl_base($this->acl_base_for_current_object($obj['dn'])); - $this->dialog->set_acl_category("fai"); - - /* Assign some additional dialog informations like headline and parent */ - session::set('objectinfo',$obj['dn']); - $this->dialog->parent = &$this; - $this->is_dialog=true; } /* Check acls, are we allowed to delete an entry */ - if($s_action == "remove" && isset($this->SubObjects[$s_entry])){ - $entry = $this->SubObjects[$s_entry]; - $acl = $this->ui->get_permissions($this->acl_base_for_current_object($entry['dn']),"fai/faiScriptEntry") ; - if(preg_match("/d/",$acl)){ - $status = $entry['status']; - if($status == "edited" || $status == "FreshLoaded"){ - $this->SubObjects[$s_entry]['status']= "delete"; - }else{ - unset($this->SubObjects[$s_entry]); + if($action['action'] =="delete"){ + $s_entry = $this->scriptListWidget->getKey($action['targets'][0]); + if(isset($this->SubObjects[$s_entry])){ + $entry = $this->SubObjects[$s_entry]; + $acl = $this->ui->get_permissions($this->acl_base_for_current_object($entry['dn']),"fai/faiScriptEntry") ; + if(preg_match("/d/",$acl)){ + $status = $entry['status']; + if($status == "edited" || $status == "FreshLoaded"){ + $this->SubObjects[$s_entry]['status']= "delete"; + }else{ + unset($this->SubObjects[$s_entry]); + } } } } - /* Save the edited entry */ + + /* Save the edited entry */ if(isset($_POST['SaveSubObject'])){ /* Check if there are still errors remaining that must be fixed before saving */ @@ -279,30 +262,6 @@ class faiScript extends plugin } } - /* Sort entries */ - $tmp = $keys = array(); - - if($this->sort_by == "name"){ - foreach($this->SubObjects as $key => $entry){ - $keys[$key]=$entry['cn']; - } - }elseif($this->sort_by == "priority"){ - foreach($this->SubObjects as $key => $entry){ - $keys[$key]=$entry['FAIpriority']; - } - } - - natcasesort($keys); - - if($this->sort_order == "down"){ - $keys =array_reverse($keys); - } - - foreach($keys as $key => $order_var){ - $tmp[$key]=$this->SubObjects[$key]; - } - $this->SubObjects = $tmp; - /* Cancel Dialog */ if(isset($_POST['CancelSubObject'])){ $this->is_dialog=false; @@ -317,73 +276,9 @@ class faiScript extends plugin return($display); } - /* Divlist added 23.02.2006 - Containing FAIscripts - */ - $divlist = new divlist("FAIscripts"); - $divlist->SetEntriesPerPage(0); - $plug = $_GET['plug']; - - if($this->sort_order == "up"){ - $dir = "\/"; - }else{ - $dir = "/\"; - } - - if($this->sort_by == "name"){ - $sort_name = $dir; - $sort_prio = ""; - }else{ - $sort_name = ""; - $sort_prio = $dir; - } - - $divlist->SetHeader(array( array("string"=>""._("Name").$sort_name.""), - array("string"=>"".$sort_prio._("Priority")."", - "attach"=>"style='width:100px;'"), - array("string"=>_("Download"), - "attach"=>"style='width:100px;'"), - array("string"=>_("Action"), - "attach"=>"style='border-right: 0px;width:100px;text-align:right;'"))); - $divlist->SetHeight(300); - $divlist->SetWidth("100%"); - foreach($this->getList(true) as $key => $name){ - - $dn= $this->acl_base_for_current_object($name['dn']); - $acl = $this->ui->get_permissions($dn,"fai/faiScriptEntry") ; - $act = ""; - - /* Hide delete icon if this object is freezed */ - if(preg_match("/freeze/", $this->FAIstate)){ - $act .= ""; - }else{ - $act .= ""; - if(preg_match("/d/",$acl)){ - $act .=""; - } - } - - /* Check acls for download icon */ - $s_acl = $this->ui->get_permissions($dn,"fai/faiScriptEntry","FAIscript") ; - if(($this->SubObjects[$key]['status'] == "new") || ($this->SubObjects[$key]['dn'] == "new") || !preg_match("/r/",$s_acl)){ - $down = ""; - }else{ - $down = " - "._("Download")." - "; - } - - /* Check if we are allowed to view this object */ - $s_acl = $this->ui->get_permissions($dn,"fai/faiScriptEntry","cn") ; - if(preg_match("/r/",$s_acl)){ - $divlist->AddEntry(array( array("string"=>"".$name['name'].""), - array("string"=>$name['FAIpriority'] , "attach" => "style='width:100px;'"), - array("string"=>$down , "attach" => "style='width:100px;'"), - array("string"=>str_replace("%s",base64_encode($key),$act), - "attach"=>"style='border-right: 0px;width:100px;text-align:right;'"))); - } - } - $smarty->assign("Entry_divlist",$divlist->DrawList()); + $this->scriptListWidget->setListData($this->convertList(TRUE), $this->convertList()); + $this->scriptListWidget->update(); + $smarty->assign("Entry_listing",$this->scriptListWidget->render()); /* Magic quotes GPC, escapes every ' " \, to solve some security risks * If we post the escaped strings they will be escaped again @@ -445,21 +340,13 @@ class faiScript extends plugin if($this->acl_is_removeable()){ $ldap = $this->config->get_ldap_link(); $ldap->cd ($this->dn); - $faifilter = session::get('faifilter'); - $use_dn = preg_replace("/".normalizePreg(FAI::get_release_dn($this->dn))."/i", $faifilter['branch'], $this->dn); - if($faifilter['branch'] == "main"){ - $use_dn = $this->dn; - } - + $release = $this->parent->parent->fai_release; + $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn), '/')."/i", $release, $this->dn); new log("remove","fai/".get_class($this),$use_dn,$this->attributes); - FAI::prepare_to_save_FAI_object($use_dn,array(),true); - + foreach($this->SubObjects as $name => $obj){ - $use_dn = preg_replace("/".normalizePreg(FAI::get_release_dn($this->dn))."/i", $faifilter['branch'], $obj['dn']); - if($faifilter['branch'] == "main"){ - $use_dn = $obj['dn']; - } + $use_dn = preg_replace("/".preg_quote(FAI::get_release_dn($this->dn), '/')."/i", $release, $obj['dn']); FAI::prepare_to_save_FAI_object($use_dn,array(),true); } $this->handle_post_events("remove"); @@ -473,11 +360,6 @@ class faiScript extends plugin { if((isset($_POST['FAIscript_posted'])) && !preg_match("/freeze/", $this->FAIstate)){ plugin::save_object(); - foreach($this->attributes as $attrs){ - if(isset($_POST[$attrs])){ - $this->$attrs = $_POST[$attrs]; - } - } } /* Get sort order */ @@ -503,12 +385,8 @@ class faiScript extends plugin /* Ensure that we do not overwrite an allready existing entry */ if($this->is_new){ - $new_dn= 'cn='.$this->cn.",".get_ou('faiscriptou').get_ou('faiou').session::get('CurrentMainBase'); - $faifilter = session::get('faifilter'); - if($faifilter['branch']!="main"){ - $new_dn ='cn='.$this->cn.",".get_ou('faiscriptou').$faifilter['branch']; - } - + $release = $this->parent->parent->fai_release; + $new_dn= 'cn='.$this->cn.",".get_ou('faiScriptRDN').get_ou('faiBaseRDN').$release; $res = faiManagement::check_class_name("FAIscript",$this->cn,$new_dn); if(isset($res[$this->cn])){ $message[] = msgPool::duplicated(_("Name")); @@ -568,8 +446,8 @@ class faiScript extends plugin $tmp = array(); $attributes = array_merge($this->sub_Load_Later,$this->subAttributes); foreach($attributes as $attrs){ - - if(empty($obj[$attrs])){ + if(!isset($obj[$attrs])) continue; + if($obj[$attrs] == ""){ $obj[$attrs] = array(); } if(!is_array($obj[$attrs])){ @@ -617,29 +495,17 @@ class faiScript extends plugin /* Read all leaf objects of this object (For FAIscript this would be FAIscriptEntry) */ - $ldap = $this->config->get_ldap_link(); - $ldap->cd ($source['dn']); - - $attrs_to_search = $this->subAttributes; - $attrs_to_search[] = "FAIstate"; - $ldap->search("(&(objectClass=FAIclass)(objectClass=".$this->subClass."))",$attrs_to_search); + $res = FAI::get_all_objects_for_given_base($source['dn'],"(&(objectClass=FAIclass)(objectClass=".$this->subClass."))"); + foreach($res as $obj){ - while($object = $ldap->fetch()){ + /* Skip not relevant objects */ + if(!preg_match("/".preg_quote($source['dn'], '/')."$/i",$obj['dn'])) continue; - /* Skip objects, that are tagged as removed */ - if(isset($object['FAIstate'][0])){ - if(preg_match("/removed$/",$object['FAIstate'][0])){ - continue; - } - } - - /* Set status for save management */ $objects = array(); $objects['status'] = "edited"; - $objects['dn'] = $object['dn']; + $objects['dn'] = $obj['dn']; $objects = $this->get_object_attributes($objects,$this->subAttributes); $objects = $this->get_object_attributes($objects,$this->sub_Load_Later); - $this->SubObjects[$objects['cn']] = $objects; } }