X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fapplications%2Fclass_applicationManagement.inc;h=d0f1d793476a2ef5f571538296cc0abd6e6cbf5c;hb=4a8a69391d4992e98e383d4b23bb1f7f603d802e;hp=61a6fff0a181cc54f2f04be0b96b91db08439a1b;hpb=8acef413400fb0ebca1a3f875c19e75f6d98828b;p=gosa.git
diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc
index 61a6fff0a..d0f1d7934 100644
--- a/plugins/admin/applications/class_applicationManagement.inc
+++ b/plugins/admin/applications/class_applicationManagement.inc
@@ -22,63 +22,59 @@ require "tabs_application.inc";
class applicationManagement extends plugin
{
/* Definitions */
- var $plHeadline= "Applications";
- var $plDescription= "This does something";
+ var $plHeadline = "Applications";
+ var $plDescription = "This does something";
/* Dialog attributes */
- var $apptabs= NULL;
- var $applications= array();
- var $ui= NULL;
- var $acl= "";
-
- var $CopyPasteHandler ;
-
- var $Release = "";
- var $Releases = array();
-
- var $enableCopyPaste = false;
+ var $apptabs = NULL;
+ var $ui = NULL;
+ var $CopyPasteHandler = NULL;
+ var $DivListApplication = NULL;
+ var $applications = array();
+ var $acl = "";
+ var $enableReleaseManagement = false;
+
+ function IsReleaseManagementActivated()
+ {
+ /* Check if we should enable the release selection */
+ $tmp = search_config($this->config->data,"faiManagement","CLASS");
+ if(!empty($tmp)){
+ return(true);
+ }
+ return(false);
+ }
function applicationManagement ($config, $ui)
{
/* Save configuration for internal use */
- $this->config= $config;
- $this->ui= $ui;
+ $this->config = $config;
+ $this->ui = $ui;
- if( (isset($this->config->data['MAIN']['ENABLECOPYPASTE']))
- &&
- (preg_match("/true/i",$this->config->data['MAIN']['ENABLECOPYPASTE'] ))){
- $this->enableCopyPaste = true;
+ /* Check if copy & paste is activated */
+ if($this->config->boolValueIsTrue("MAIN","ENABLECOPYPASTE")){
+ $this->CopyPasteHandler = new CopyPasteHandler($this->config);
}
- $this->CopyPasteHandler = new CopyPasteHandler($this->config);
-
- /* Get global filter config */
- if (!is_global("appfilter")){
- $base= get_base_from_people($ui->dn);
+ /* Creat dialog object */
+ $this->DivListApplication = new divListApplication($this->config,$this);
- $appfilter= array("depselect" => $base,
- "regex" => "*" ,
- "release" => "ou=apps,".$base);
+ if($this->IsReleaseManagementActivated()){
+ /* Check if we should enable the release selection */
+ $this->enableReleaseManagement = true;
- register_global("appfilter", $appfilter);
+ /* Hide SubSearch checkbox */
+ $this->DivListApplication->DisableCheckBox("SubSearch");
}
-
- $appfilter = get_global("appfilter");
- $this->Releases = $this->getReleases($appfilter['depselect']);
- $this->Release = $appfilter['release'];
}
function getReleases($base)
{
- $dn = "ou=apps,".$base;
-
- $ret = array();
-
- $ret ["ou=apps,".$base] = "/";
+ $ldap = $this->config->get_ldap_link();
+ $dn = "ou=apps,".$base;
+ $ret = array();
+ $ret [$base] = "/";
- $ldap = $this->config->get_ldap_link();
$ldap->cd($dn);
-
$ldap->search("objectClass=organizationalUnit",array("ou"));
while($attrs = $ldap->fetch()){
@@ -87,11 +83,14 @@ class applicationManagement extends plugin
$str = "";
foreach($tmp as $val){
$val = trim(preg_replace("/,/","",$val));
- if($val == "apps") break;
+ if(empty($val)) break;
$str .= "/".$val;
+ }
+ if(!empty($str)){
+ $ret[$attrs['dn']]= preg_replace("/^\//","",$str);
}
- $ret[$attrs['dn']]= $str;
}
+ asort($ret);
return($ret);
}
@@ -100,33 +99,20 @@ class applicationManagement extends plugin
/* Call parent execute */
plugin::execute();
+
+ /****************
+ Variable init
+ ****************/
+
+ /* These vars will be stored if you try to open a locked app,
+ to be able to perform your last requests after showing a warning message */
$_SESSION['LOCK_VARS_TO_USE'] = array("/^act$/","/^id$/","/^appl_edit_/","/^appl_del_/");
- /* Save data */
- $appfilter = get_global("appfilter");
$smarty = get_smarty(); // Smarty instance
$s_action = ""; // Contains the action to proceed
$s_entry = ""; // The value for s_action
$base_back = ""; // The Link for Backbutton
- /* Start for New List Managment */
- if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
- $s_action="open";
- $s_entry = base64_decode($_GET['dep_id']);
- $appfilter['depselect']= "".$this->config->departments[trim($s_entry)];
- }
-
- /* Get posted release */
- if(isset($_POST['select_release'])){
- $r = $_POST['select_release'];
- if((isset($this->Releases[$r])) && ($this->Release != $r)){
- $this->Release = $r;
- $appfilter = get_global("appfilter");
- $appfilter['release'] = $r;
- register_global("appfilter",$appfilter);
- }
- }
-
/* Test Posts */
foreach($_POST as $key => $val){
// Post for delete
@@ -145,14 +131,8 @@ class applicationManagement extends plugin
$s_action="cut";
$s_entry = preg_replace("/^cut_/i","",$key);
// Post for new
- }elseif(preg_match("/^dep_back.*/i",$key)){
- $s_action="back";
}elseif(preg_match("/^appl_new.*/",$key)){
$s_action="new";
- }elseif(preg_match("/^dep_home.*/i",$key)){
- $s_action="home";
- }elseif(preg_match("/^dep_root.*/i",$key)){
- $s_action="root";
}elseif(preg_match("/^editPaste.*/i",$key)){
$s_action="editPaste";
}
@@ -165,96 +145,23 @@ class applicationManagement extends plugin
$s_entry = preg_replace("/_.$/","",$s_entry);
- /* Department changed? */
- if(isset($_POST['depselect']) && $_POST['depselect']){
- $appfilter['depselect']= $_POST['depselect'];
- }
-
- /* Homebutton is posted */
- if($s_action=="home"){
- $appfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
- $appfilter['depselect']=(preg_replace("/^[^,]+,/","",$appfilter['depselect']));
- }
-
- if($s_action=="root"){
- $appfilter['depselect']=($this->config->current['BASE']);
- }
-
- /* If Backbutton is Posted */
- if($s_action=="back"){
- $base_back = preg_replace("/^[^,]+,/","",$appfilter['depselect']);
- $base_back = convert_department_dn($base_back);
-
- if(isset($this->config->departments[trim($base_back)])){
- $appfilter['depselect']= $this->config->departments[trim($base_back)];
- }else{
- $appfilter['depselect']= $this->config->departments["/"];
- }
- }
-
- if (isset($_POST['regex'])){
- $appfilter['regex']= $_POST['regex'];
- }
- if (isset($_GET['search'])){
- $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
- if ($s == "**"){
- $s= "*";
- }
- $appfilter['regex']= $s;
- }
-
- $this->Releases = $this->getReleases($appfilter['depselect']);
- if(!isset($this->Releases[$this->Release])){
- $this->Release = key($this->Releases);
- $appfilter['release'] = $this->Release;
- register_global("appfilter",$appfilter);
- }
-
- register_global("appfilter", $appfilter);
-
- /* Check sorting variable */
- $this->reload();
- $smarty= get_smarty();
-
- /* Check for exeeded sizelimit */
- if (($message= check_sizelimit()) != ""){
- return($message);
- }
+ /****************
+ Copy & Paste handling
+ ****************/
/* Only perform copy / paste if it is enabled
*/
- if($this->enableCopyPaste){
-
- /* Paste copied/cutted object in here
- */
- if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){
- $this->CopyPasteHandler->save_object();
- $this->CopyPasteHandler->SetVar("base",$appfilter['depselect']);
- return($this->CopyPasteHandler->execute());
- }
-
-
- /* Copy current object to CopyHandler
- */
- if($s_action == "copy"){
- $this->CopyPasteHandler->Clear();
- $dn = $this->applications[$s_entry]['dn'];
- $obj = new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], $dn);
- $objNew = new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], "new");
- $this->CopyPasteHandler->Copy($obj,$objNew);
- }
+ if($this->CopyPasteHandler){
+ if($str = $this->copyPasteHandling($s_action,$s_entry)){
+ return($str);
+ };
+ }
- /* Copy current object to CopyHandler
- */
- if($s_action == "cut"){
- $this->CopyPasteHandler->Clear();
- $dn = $this->applications[$s_entry]['dn'];
- $obj = new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], $dn);
- $this->CopyPasteHandler->Cut($obj);
- }
- }
+ /****************
+ Create a new app
+ ****************/
/* New application? */
if ($s_action=="new"){
@@ -269,6 +176,11 @@ class applicationManagement extends plugin
$this->apptabs->set_acl(array(':all'));
}
+
+ /****************
+ Edit entry canceled
+ ****************/
+
/* Cancel dialogs */
if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
del_lock ($this->apptabs->dn);
@@ -277,6 +189,11 @@ class applicationManagement extends plugin
unset ($_SESSION['objectinfo']);
}
+
+ /****************
+ Edit entry finished
+ ****************/
+
/* Finish apps edit is triggered by the tabulator dialog, so
the user wants to save edited data. Check and save at this
point. */
@@ -291,6 +208,7 @@ class applicationManagement extends plugin
if (count($message) == 0){
/* Save data data to ldap */
+ $this->apptabs->set_release($this->DivListApplication->selectedRelease);
$this->apptabs->save();
gosa_log ("Application object'".$this->dn."' has been saved");
@@ -299,10 +217,6 @@ class applicationManagement extends plugin
if ($this->dn != "new"){
del_lock ($this->dn);
}
-
- /* There's no page reload so we have to read new apps at
- this point. */
- $this->reload ();
unset ($this->apptabs);
$this->apptabs= NULL;
unset ($_SESSION['objectinfo']);
@@ -313,6 +227,11 @@ class applicationManagement extends plugin
}
}
+
+ /****************
+ Edit entry
+ ****************/
+
/* User wants to edit data? */
if (($s_action=="edit") && (!isset($this->apptabs->config))){
@@ -339,6 +258,11 @@ class applicationManagement extends plugin
$_SESSION['objectinfo']= $this->dn;
}
+
+ /****************
+ Delete app
+ ****************/
+
/* Remove user was requested */
if ($s_action == "del"){
@@ -360,7 +284,7 @@ class applicationManagement extends plugin
/* Lock the current entry, so nobody will edit it during deletion */
add_lock ($this->dn, $this->ui->dn);
$smarty= get_smarty();
- $smarty->assign("intro", sprintf(_("You're about to delete the application '%s'."), LDAP::fix($this->dn)));
+ $smarty->assign("intro", sprintf(_("You're about to delete the application '%s'."), @LDAP::fix($this->dn)));
return($smarty->fetch (get_template_path('remove.tpl', TRUE)));
} else {
@@ -370,6 +294,11 @@ class applicationManagement extends plugin
}
}
+
+ /****************
+ Delete app confirmed
+ ****************/
+
/* Confirmation for deletion has been passed. Group should be deleted. */
if (isset($_POST['delete_app_confirm'])){
@@ -386,8 +315,6 @@ class applicationManagement extends plugin
unset ($this->apptabs);
$this->apptabs= NULL;
- /* Group list has changed, reload it. */
- $this->reload ();
} else {
/* Normally this shouldn't be reached, send some extra
@@ -401,6 +328,10 @@ class applicationManagement extends plugin
}
+ /****************
+ Delete app canceled
+ ****************/
+
/* Delete application canceled? */
if (isset($_POST['delete_cancel'])){
del_lock ($this->dn);
@@ -414,7 +345,7 @@ class applicationManagement extends plugin
/* Don't show buttons if tab dialog requests this */
if (!$this->apptabs->by_object[$this->apptabs->current]->dialog){
$display.= "\n";
- $display.= "\n";
+ $display.= "\n";
$display.= " \n";
$display.= "\n";
$display.= "
";
@@ -422,221 +353,59 @@ class applicationManagement extends plugin
return ($display);
}
- /* Show main page */
-
- /* Prepare departments */
- $options= "";
- foreach ($this->config->idepartments as $key => $value){
- if ($appfilter['depselect'] == $key){
- $options.= "";
- } else {
- $options.= "";
- }
- }
-
- if($this->enableCopyPaste){
- $Copy_Paste = " 
";
-
- if($this->CopyPasteHandler->isCurrentObjectPastAble()){
- if($this->CopyPasteHandler->isCurrentCutted()){
- $img = "images/cutpaste.png";
- }else{
- $img = "images/copypaste.png";
- }
+ /****************
+ Dialog display
+ ****************/
- $Copy_Paste .= " ";
- }else{
- $Copy_Paste .= "
";
- }
- }else{
- $Copy_Paste ="";
- }
-
- // Managment
- $listhead = "";
-
-
-
- if($this->enableCopyPaste){
- $actions = " ";
- $actions.= " ";
- $actions.= "";
- $actions.= "";
- }else{
-
- $actions = "";
- $actions.= "";
- }
-
-
- // Defining Links
- $linkopen = "%s";
-
- // image Buttons
- $editlink = "%s";
- $userimg = "
";
-
- // Extension images
- $applimg = "
";
-
- // Space
- $empty = "
";
-
-
- $divlist = new divlist("applicationtabs");
- $divlist->SetHeader(array(
- array("string" => " ", "attach" => "style='text-align:center;width:20px;'"),
- array("string" => _("Application name")." / "._("Department"), "attach" => "style=''"),
- array("string" => _("Actions"), "attach" => "style='width:80px;border-right:0px;text-align:right;'")
- ));
-
-
- $divlist->SetSummary(_("This table displays all groups, in the selected tree."));
- $divlist->SetEntriesPerPage(0);
-
- foreach($this->departments as $key=> $val){
-
- if(!isset($this->config->departments[trim($key)])){
- $this->config->departments[trim($key)]="";
- }
-
- $non_empty="";
- $keys= str_replace("/","\/",$key);
- foreach($this->config->departments as $keyd=>$vald ){
- if(preg_match("/".$keys."\/.*/",$keyd)){
- $non_empty="full";
- }
- }
-
- $field1 = array("string" => "![department](images/".$non_empty."folder.png)
", "attach" => "style='text-align:center;width:20px;'");
- $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val), "attach" => "style=''");
- $field3 = array("string" => " ", "attach" => "style='width:80px;border-right:0px;text-align:right;'");
-
- $divlist->AddEntry(array($field1,$field2,$field3));
- }
-
- foreach($this->applications as $key => $val){
- $title = "title='dn : ".$val['dn']."'";
-
- if(!isset($val['description'][0])){
- $desc = "";
- }else{
- $desc = " - [ ".$val['description'][0]." ]";
- }
- $field1 = array("string" => sprintf($applimg,$val['dn']), "attach" => "style='text-align:center;width:20px;'");
- $field2 = array("string" => sprintf($editlink,$key,($val['cn']['0'].$desc)), "attach" => "style='' ".$title);
- $field3 = array("string" => preg_replace("/%KEY%/", $key, $actions), "attach" => "style='width:80px;border-right:0px;text-align:right;'");
-
- $divlist->AddEntry(array($field1,$field2,$field3));
- }
-
- $smarty->assign("applicationshead", $listhead);
- $smarty->assign("applications", $divlist->DrawList());
- $smarty->assign("search_image", get_template_path('images/search.png'));
- $smarty->assign("tree_image", get_template_path('images/tree.png'));
- $smarty->assign("infoimage", get_template_path('images/info.png'));
- $smarty->assign("launchimage", get_template_path('images/launch.png'));
- $smarty->assign("releaseimage" , get_template_path('images/branch.png'));
- $smarty->assign("deplist", $this->config->idepartments);
- $smarty->assign("regex", $appfilter['regex']);
-
- $smarty->assign("releases", $this->Releases );
- $smarty->assign("releaseKeys", array_flip($this->Releases));
- $smarty->assign("select_release",$this->Release);
-
- /* Extend if we are not using javascript */
- $smarty->assign("apply", apply_filter());
- $smarty->assign("alphabet", generate_alphabet());
- $smarty->assign("hint", print_sizelimit_warning());
-
- return($smarty->fetch(get_template_path('headpage.tpl', TRUE)));
+ /* Display dialog with system list */
+ $this->DivListApplication->execute();
+ $this->DivListApplication->AddDepartments($this->DivListApplication->selectedBase);
+ $this->reload();
+ $this->DivListApplication->setEntries($this->applications);
+ return($this->DivListApplication->Draw());
}
function reload()
{
- /* Get config */
- $appfilter= get_global('appfilter');
-
- /* Set base for all searches */
- $base= $this->Release;
-
- /* Regex filter? */
- if ($appfilter['regex'] != ""){
- $regex= $appfilter['regex'];
- } else {
- $regex= "*";
- }
-
- /* Generate application list */
- $res= get_list($this->ui->subtreeACL, "(&(cn=$regex)(objectClass=gosaApplication))", FALSE, $base, array("*"), FALSE);
$this->applications= array();
- foreach ($res as $value){
- $this->applications[]= $value;
- }
- reset ($this->applications);
-
-
-
- /* NEW LIST MANAGMENT
- * We also need to search for the departments
- * So we are able to navigate like in konquerer
- */
- $peopleOU = get_people_ou();
-
- $base2 = $appfilter['depselect'];
-
- $res3 = get_list2($this->ui->subtreeACL, "(&(|(ou=$regex)(description=$regex))(objectClass=gosaDepartment))",
- TRUE, $base2, array("ou", "description"), TRUE);
- $this->departments= array();
- $tmp = array();
- foreach ($res3 as $value){
- $tmp[strtolower($value['dn']).$value['dn']]=$value;
- }
- ksort($tmp);
- foreach($tmp as $value){
- if(isset($value["description"][0])){
- $this->departments[$value['dn']]=convert_department_dn2($value['dn'])." - [".$value["description"][0]."]";
+ /* Set base for all searches */
+ $base = $this->DivListApplication->selectedBase;
+ $release = $this->DivListApplication->selectedRelease;
+ $Regex = $this->DivListApplication->Regex;
+ $SubSearch = $this->DivListApplication->SubSearch;
+ $Flags = GL_NONE | GL_SIZELIMIT;
+ $Filter = "(&(cn=".$Regex.")(objectClass=gosaApplication))";
+ $tmp = array();
+ $Releases = $this->getReleases($base);
+
+ if(!$this->enableReleaseManagement){
+ $use_base = $base;
+ }else{
+ if(isset($Releases[$release])){
+ $use_base = $release;
}else{
- $this->departments[$value['dn']]=convert_department_dn2($value['dn']);//$value["description"][0];
+ $use_base = $base;
}
}
-
- /* END NEW LIST MANAGMENT
- */
-
- $tmp=array();
- foreach($this->applications as $tkey => $val ){
+ if($SubSearch){
+ $Flags |= GL_SUBSEARCH;
+ }
+
+ $res= get_list($Filter, $this->ui->subtreeACL,$use_base, array("cn","description","dn","objectClass"), $Flags);
+ foreach ($res as $val){
$tmp[strtolower($val['cn'][0]).$val['cn'][0]]=$val;
}
+
ksort($tmp);
$this->applications=array();
foreach($tmp as $val){
$this->applications[]=$val;
}
reset ($this->applications);
-
-
}
function remove_from_parent()
@@ -646,18 +415,39 @@ class applicationManagement extends plugin
}
- /* Save data to object */
- function save_object()
+ function copyPasteHandling($s_action,$s_entry)
{
- }
+ /* Paste copied/cutted object in here
+ */
+ if(($s_action == "editPaste") || ($this->CopyPasteHandler->stillOpen())){
+ $this->CopyPasteHandler->save_object();
+ $this->CopyPasteHandler->SetVar("base", $this->DivListApplication->selectedBase);
+
+ if($str = $this->CopyPasteHandler->execute()) {
+ return($str);
+ }
+ }
+ /* Copy current object to CopyHandler
+ */
+ if($s_action == "copy"){
+ $this->CopyPasteHandler->Clear();
+ $dn = $this->applications[$s_entry]['dn'];
+ $obj = new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], $dn);
+ $objNew = new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], "new");
+ $this->CopyPasteHandler->Copy($obj,$objNew);
+ }
- /* Check values */
- function check()
- {
+ /* Copy current object to CopyHandler
+ */
+ if($s_action == "cut"){
+ $this->CopyPasteHandler->Clear();
+ $dn = $this->applications[$s_entry]['dn'];
+ $obj = new apptabs($this->config, $this->config->data['TABS']['APPSTABS'], $dn);
+ $this->CopyPasteHandler->Cut($obj);
+ }
}
-
/* Save to LDAP */
function save()
{
@@ -665,18 +455,6 @@ class applicationManagement extends plugin
$this->postcreate();
}
- function adapt_from_template($dn)
- {
- }
-
- function password_change_needed()
- {
- }
-
- function show_header($button_text, $text, $disabled= FALSE)
- {
- }
-
function remove_lock()
{
if (isset($this->apptabs->dn)){
@@ -684,6 +462,14 @@ class applicationManagement extends plugin
}
}
+ function save_object() {
+ $this->DivListApplication->save_object();
+ }
+
+ function check() {}
+ function adapt_from_template($dn) {}
+ function password_change_needed() {}
+ function show_header($button_text, $text, $disabled= FALSE) {}
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>