![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index c9c2363e5d6e103c1927fe7307e2679f6688d206..d540e03c27b30e0fb2ecc4f49ba777c589bf8470 100644 (file)
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
require "tabsPartition.inc";
require "tabsVariable.inc";
require "tabsHook.inc";
/* Headpage attributes */
var $departments= array();
var $deptabs= NULL;
+ var $lock_type = ""; // should be branch/freeze
+ var $lock_name = "";
+ var $lock_dn = "";
/* attribute list for save action */
- var $attributes = array(); // Attributes Managed by this plugin, none,
+ var $attributes = array("lock_type","lock_name","lock_dn"); // Attributes Managed by this plugin, none,
// because this is only an overview over all objects already defined in FAI.
var $objectclasses = array(); // ObjectClasses which the attributes are related to
var $dialog = array(); // This object contains every dialog we have currently opened
if (!is_global("faifilter")){
$base = get_base_from_people($ui->dn);
$faifilter= array("base" => $base,
- "regex" => "*");
+ "regex" => "*","branch" => "main");
$faifilter['ShowProfiles'] = true;
$faifilter['ShowTemplates'] = true;
$faifilter['ShowScripts'] = true;
$display = "";
$smarty = get_smarty();
- $s_action = "";
+ $smarty->assign("BranchName","");
+ $s_action = "";
$s_entry = "";
/* filter management
* Filter will be changed if POST['regex'] or $_GET['search'] isset
* New Filter will be stored in session and is used to generate list contents
*/
$faifilter = $_SESSION['faifilter'];
+
+ if((isset($_POST['select_branch']))&&(!empty($_POST['select_branch']))){
+ $faifilter['branch'] = $_POST['select_branch'];
+ }
/* Filter is posted by apply button
* Check every single chkbox
}
}
+
/* Check ImageButton posts
* Create new tab ich new_xx is posted
*/
}elseif(preg_match("/^entry_delete_.*/",$key)){
$s_entry = preg_replace("/^entry_delete_/","",$key);
$s_entry = preg_replace("/_.*$/","",$s_entry);
- $s_action = "delete";
- }elseif(preg_match("/dep_back.*/i",$key)){
- $s_action="back";
- }elseif(preg_match("/dep_home.*/i",$key)){
- $s_action="home";
- }elseif(preg_match("/dep_root.*/i",$key)){
- $s_action="root";
- }
+ $s_action = "delete";
+ }elseif(preg_match("/dep_back.*/i",$key)){
+ $faifilter['branch'] = "main";
+ $s_action="back";
+ }elseif(preg_match("/dep_home.*/i",$key)){
+ $faifilter['branch'] = "main";
+ $s_action="home";
+ }elseif(preg_match("/dep_root.*/i",$key)){
+ $faifilter['branch'] = "main";
+ $s_action="root";
+ }
- }
+ }
if($s_action=="root"){
$faifilter['base']=($this->config->current['BASE']);
$this->dialog= NULL;
/* Terminal list has changed, reload it. */
- $this->reload ();
} else {
/* Normally this shouldn't be reached, send some extra
/* Create new branch */
if((isset($_POST['UseBranchName']))&&($this->dispNewBranch)){
-
+
/* Check branch name */
$name = $_POST['BranchName'];
$is_ok = true;
+ $smarty->assign("BranchName",$name);
$base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
/* Check used characters */
- if(preg_match("/[^0-9a-z]/i",$name)){
+ if(preg_match("/[^0-9a-z \ö\ä\ü\.-_:,]/i",$name)){
print_red(_("Specified branch name is invalid."));
$is_ok = false;
}
/* Check if this name is already in use */
- if(!$this->CheckNewBranchName($_POST['BranchName'])){
+ if(!$this->CheckNewBranchName($_POST['BranchName'],$faifilter['branch'])){
print_red(_("This name is already in use."));
- $this->is_ok = false;
+ $is_ok = false;
}
if($is_ok){
/* Create it know */
-
$ldap = $this->config->get_ldap_link();
-
-// $ldap->cd ("ou=".$name.",".$base);
-// $ldap->recursive_remove();
+
+ $baseToUse = $base;
+ if($_SESSION['faifilter']['branch']!="main"){
+ $baseToUse = $_SESSION['faifilter']['branch'];
+ }
+
+ $ldap->cd($this->config->current['BASE']);
+ $ldap->create_missing_trees($baseToUse);
+ $ldap->cd ("ou=".$name.",".$baseToUse);
+ $ldap->recursive_remove();
$ldap->cd ($this->config->current['BASE']);
- $ldap->copy_recursive($base,"ou=".$name.",".$base);
+ $ldap->copy_FAI_resource_recursive($baseToUse,"ou=".$name.",".$baseToUse,"branch",true);
-
-
- print "created new branch .... bla";
+ /* Postcreate */
+
+ /* Assign possible attributes */
+ $this->lock_type = "branch";
+ $this->lock_name = $name;
+ $this->lock_dn = "ou=".$name.",".$baseToUse;
+ $this->postcreate();
$this->dispNewBranch = false;
}
}
/* Abort creating new branch */
if(isset($_POST['CancelBranchName'])){
$this->dispNewBranch = false;
+ $this->dispNewFreeze = false;
}
/* Open dialog to insert new branch name */
/* Remove branch */
if($s_action == "remove_branch"){
- $base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+ $base= $faifilter['branch'];
/* Load permissions for selected 'dn' and check if
we're allowed to remove this 'dn' */
- $acl= get_permissions ($base, $this->ui->subtreeACL);
+ $acl= get_permissions ($faifilter['base'], $this->ui->subtreeACL);
$this->acl= get_module_permission($acl, "fai", $base);
if (chkacl($this->acl, "delete") == ""){
- $smarty->assign("warning", sprintf(_("You're about to delete a fai branch / freeze '%s'."), $base));
+ $smarty->assign("info", sprintf(_("You're about to delete a fai branch / freeze '%s'."), $faifilter['branch']));
return($smarty->fetch(get_template_path('remove_branch.tpl',TRUE)));
} else {
print_red (_("You are not allowed to delete this user!"));
/* Delete this entry */
if(isset($_POST['delete_branch_confirm'])){
- print "branch removed ";
+ $bb = $faifilter['branch'];
+ if(!isset($ldap)){
+ $ldap = $this->config->get_ldap_link();
+ }
+
+ $br = $this->getBranches();
+
+ if(isset($br[$bb])){
+
+ $name = $br[$bb];
+
+ $ldap->cd($bb);
+ $ldap->recursive_remove();
+ $faifilter['branch'] = "main";
+
+ /* Post remove */
+
+// $this->lock_type is set from this->reload
+ $this->lock_name = $name;
+ $this->lock_dn = $bb;
+
+ $this->postremove();
+ }
}
- if($s_action == "freeze_branch"){
- $base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
- $ldap = $this->config->get_ldap_link();
- $ldap->cd ($base);
-
- $attrs = $ldap->fetch($ldap->cat ($base));
- if(!in_array("FAIbranch",$attrs)){
- $attrs['objectClass'][] = "FAIbranch";
+ if((isset($_POST['UseBranchName']))&&($this->dispNewFreeze)){
+ /* Check branch name */
+ $name = $_POST['BranchName'];
+ $is_ok = true;
+
+ $smarty->assign("BranchName",$name);
+
+ $base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+
+ /* Check used characters */
+ if(preg_match("/[^0-9a-z \ö\ä\ü\.-_:,]/i",$name)){
+ print_red(_("Specified branch name is invalid."));
+ $is_ok = false;
}
-
- if((!isset($attrs['FAIstate']))||($attrs['FAIstate'] != "frozen")){
- $attrs['FAIstate']= "frozen";
+
+ /* Check if this name is already in use */
+ if(!$this->CheckNewBranchName($_POST['BranchName'],$faifilter['branch'])){
+ print_red(_("This name is already in use."));
+ $is_ok = false;
}
-
- print "Freeze ";
+
+ if($is_ok){
+ /* Create it know */
+ $ldap = $this->config->get_ldap_link();
-
+ $baseToUse = $base;
+ if($_SESSION['faifilter']['branch']!="main"){
+ $baseToUse = $_SESSION['faifilter']['branch'];
+ }
+
+ $ldap->cd ("ou=".$name.",".$baseToUse);
+ $ldap->recursive_remove();
+
+ $ldap->cd ($this->config->current['BASE']);
+ $ldap->copy_FAI_resource_recursive($baseToUse,"ou=".$name.",".$baseToUse,"freeze",true);
+
+ $this->dispNewFreeze = false;
+
+ /* Postcreate */
-
+ /* Assign possible attributes */
+ $this->lock_type = "branch";
+ $this->lock_name = $name;
+ $this->lock_dn = "ou=".$name.",".$baseToUse;
+ $this->postcreate();
+ }
+ }
+ if(($s_action == "freeze_branch")||($this->dispNewFreeze)){
+ $this->dispNewFreeze = true;
+ $display .= $smarty->fetch(get_template_path('faiNewBranch.tpl', TRUE, dirname(__FILE__)));
+ return($display);
}
/* ENDE Branch handling
}
}
-
/* Search is set */
if(isset($_GET['search'])){
$faifilter['regex']=$_GET['search']."*";
$faifilter['base']=$_POST['base'];
}
+ $base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+
+ $br = $this->getBranches($base);
+ if(!isset($br[$faifilter['branch']])){
+ $faifilter['branch'] = "main";
+ }
+
+ $smarty->assign("select_branch",$faifilter['branch']);
+
/* remove double asterisks and save new filter */
$faifilter['regex'] = preg_replace("/\*\*/","*",$faifilter['regex']);
$_SESSION['faifilter']= $faifilter;
" <img class='center' src='images/list_seperator.png' align='middle' alt='' height='16' width='1'> ".
- _("Current base")." <select name='base' onChange='mainform.submit()' class='center'>$options</select>".
+ _("Base")." <select name='base' onChange='mainform.submit()' class='center'>$options</select>".
" <input class='center' type='image' src='images/list_submit.png' align='middle' title='"._("Submit department")."' name='submit_department' alt='"._("Submit")."'> ".
"</div>";
$divlist->AddEntry( array($field0,$field1,$field2,$field3));
}
-
-
+
/* Attach objects */
foreach($this->objects as $key => $value){
$info= "";
$desc= "";
}
+ if($value['FAIstate'] == "freeze"){
+ $acti = "";
+ $edi = "%NAME%";
+ }else{
+ $acti = $action;
+ $edi = $editlink;
+ }
+
$field1 = array("string" => $img , "attach" => "style='text-align:center;width:20px;'");
- $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$editlink) , "attach" => "style=''");
+ $field2 = array("string" => preg_replace(array("/%KEY%/","/%NAME%/"),array($key,$value['cn'].$desc),$edi) , "attach" => "style=''");
$field3 = array("string" => $info, "attach" => "style='width:200px;'");
- $field4 = array("string" => preg_replace("/%KEY%/",$key,$action) , "attach" => "style='width:60px;border-right:0px;text-align:right;'");
+ $field4 = array("string" => preg_replace("/%KEY%/",$key,$acti) , "attach" => "style='width:60px;border-right:0px;text-align:right;'");
$divlist->AddEntry(array($field1,$field2,$field3,$field4));
}
/* Assign all reguired vars to template engine */
- $smarty->assign("branchKeys",array());
- $smarty->assign("branches",array());
+ $branches = $this->getBranches();
+ asort($branches);
+ $smarty->assign("branchKeys",array_flip($branches));
+ $smarty->assign("branches",$branches);
$smarty->assign("faihead" , $faihead);
$smarty->assign("failist" , $divlist->DrawList());
$smarty->assign("regex" , $faifilter['regex']);
$smarty->assign("infoimage" , get_template_path('images/info.png'));
+ $smarty->assign("branchimage" , get_template_path('images/branch.png'));
$smarty->assign("launchimage" , get_template_path('images/launch.png'));
$smarty->assign("alphabet" , generate_alphabet());
$smarty->assign("apply" , apply_filter());
return ($display);
}
- function getBranches()
+ function getBranches($base = false,$prefix = "")
{
+ $ret = array("main"=>"/");
$ldap = $this->config->get_ldap_link();
$ldap->cd($this->config->current['BASE']);
- $ldap->search("(objectClass=FAIbranch)",array("FAIstate","cn","ou"));
+ $faifilter = $_SESSION['faifilter'];
+
+
+ if(!$base){
+ $base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+ }
+ $ldap->cd($base);
+ $ldap->ls("(objectClass=FAIbranch)",$base);
while($attrs = $ldap->fetch()){
- print_a($attrs);
+
+ if((isset($attrs['ou']))&&($attrs['dn']!=$base)){
+ $ret[$attrs['dn']]= $prefix.$attrs['ou'][0];
+ $ret = array_merge($ret,$this->getBranches($attrs['dn'],"".$prefix.$attrs['ou'][0]."/"));
+ }
}
+ return($ret);
}
function reload()
/* Set base for all searches */
$base= "ou=fai,ou=configs,ou=systems,".$faifilter['base'];
+
+ if($faifilter['branch'] !="main"){
+ $base = $faifilter['branch'];
+ }
+
$regex = $faifilter['regex'];
/* Array to save objects */
$res= get_list($this->ui->subtreeACL, "(objectClass=organizationalUnit)",
FALSE, $base, array("cn","description","objectClass"),TRUE);
+ $str = "";
+
foreach($res as $objecttypes){
$res2 = get_list($this->ui->subtreeACL, "(&(objectClass=*)(cn=".$regex."))",
- FALSE, $objecttypes['dn'], array("cn","description","objectClass","FAIclass"),TRUE);
+ FALSE, $objecttypes['dn'], array("cn","description","objectClass","FAIclass","FAIstate"),TRUE);
foreach($res2 as $object){
$type= "";
unset($object['objectClass']['count']);
$obj['description'] = $object['description'][0];
$obj['objectClass'] = $object['objectClass'];
+ if(isset($object['FAIstate'])){
+ $obj['FAIstate'] = $object['FAIstate'][0];
+
+ /* Append type to this string, to be able to check if the selected
+ * entry is of type 'freeze' or 'branch'
+ */
+ $str.="|".$obj['FAIstate'];
+ }else{
+ $obj['FAIstate'] ="";
+ }
+
if(in_array("FAIpartitionTable",$obj['objectClass'])){
$type = "FAIpartitionTable";
}elseif(in_array("FAIpackageList",$obj['objectClass'])){
}
}
+
+ /* Tell class what we have currently opened
+ 'main' has type ''
+ */
+ if(preg_match("/freeze/",$str)){
+ $this->lock_type = "freeze";
+ }elseif(preg_match("/branch/",$str)){
+ $this->lock_type = "branch";
+ }else{
+ $this->lock_type = "";
+ }
+
ksort($this->objects);
reset ($this->objects);
}
}
- function checknewbranchname($name){
-
+ function CheckNewBranchName($name,$base){
+ $f = $_SESSION['faifilter']['branch'];
+
+ if($f == "main"){
+ $f = $_SESSION['faifilter']['base'];
+ }
+
+ if(in_array($name,$this->getBranches($f))) {
+ return(false);
+ }
+
+ if(empty($name)){
+ return(false);
+ }
return(true);
}