From: hickert Date: Wed, 11 Jan 2006 14:58:37 +0000 (+0000) Subject: Some changes for branches X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c4d86b1071435370dad915becf21a89680f18ded;p=gosa.git Some changes for branches git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2450 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index 17971a305..099905f38 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -93,13 +93,18 @@ class faiManagement extends plugin $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 @@ -115,11 +120,6 @@ class faiManagement extends plugin } } - if((isset($_POST['select_branch']))&&(!empty($_POST['select_branch']))){ - $faifilter['branch'] = $_POST['select_branch']; - } - - $smarty->assign("select_branch",$_SESSION['faifilter']['branch']); /* Check ImageButton posts * Create new tab ich new_xx is posted @@ -154,16 +154,19 @@ class faiManagement extends plugin }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']); @@ -297,23 +300,24 @@ class faiManagement extends plugin /* 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){ @@ -338,6 +342,7 @@ class faiManagement extends plugin /* Abort creating new branch */ if(isset($_POST['CancelBranchName'])){ $this->dispNewBranch = false; + $this->dispNewFreeze = false; } /* Open dialog to insert new branch name */ @@ -350,13 +355,13 @@ class faiManagement extends plugin /* 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!")); @@ -365,32 +370,40 @@ class faiManagement extends plugin /* Delete this entry */ if(isset($_POST['delete_branch_confirm'])){ - print "branch removed "; - } + $bb = $faifilter['branch']; + if(!isset($ldap)){ + $ldap = $this->config->get_ldap_link(); + } - if($s_action == "freeze_branch"){ - $this->dispNewFreeze = true; - $display .= $smarty->fetch(get_template_path('faiNewBranch.tpl', TRUE, dirname(__FILE__))); - return($display); + $br = $this->getBranches(); + + if(isset($br[$bb])){ + $ldap->cd($bb); + $ldap->recursive_remove(); + $faifilter['branch'] = "main"; + } } + 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)){ + 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){ @@ -412,6 +425,11 @@ class faiManagement extends plugin } } + 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 */ @@ -484,6 +502,14 @@ class faiManagement extends plugin if((isset($_POST['base']))&&($s_action=="")){ $faifilter['base']=$_POST['base']; } + + + $br = $this->getBranches(); + 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']); @@ -756,6 +782,7 @@ class faiManagement extends plugin $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/action.png')); $smarty->assign("launchimage" , get_template_path('images/launch.png')); $smarty->assign("alphabet" , generate_alphabet()); $smarty->assign("apply" , apply_filter()); @@ -933,8 +960,18 @@ class faiManagement extends plugin } } - function CheckNewBranchName($name){ - if(in_array($name,$this->getBranches())) { + 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); diff --git a/plugins/admin/fai/faiNewBranch.tpl b/plugins/admin/fai/faiNewBranch.tpl index e3ec48045..183c6a3e9 100755 --- a/plugins/admin/fai/faiNewBranch.tpl +++ b/plugins/admin/fai/faiNewBranch.tpl @@ -22,7 +22,7 @@ - {t}Branch name{/t}  + {t}Branch name{/t}  diff --git a/plugins/admin/fai/headpage.tpl b/plugins/admin/fai/headpage.tpl index e8ccfbf03..d035268f5 100644 --- a/plugins/admin/fai/headpage.tpl +++ b/plugins/admin/fai/headpage.tpl @@ -26,21 +26,26 @@
-

[F]{t}Filters{/t}

+

[F]{t}Branches{/t}

- + {t}Selected branch{/t}  + {if $select_branch != "main"}
{t}Delete this branch.{/t} +   + {/if}
{t}Create a new branch{/t} +  
{t}Freeze this{/t} +