X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_systemManagement.inc;h=a039c2ecca8e3ef1f5715b2cb9340b44c47e326c;hb=b9a665f8e5359cbfdf540f344f0419668521027f;hp=6ab007d1f3c9bb47fe3273a38786a81c8ed572b0;hpb=2654833be336545f1fb302cf6180957ed7b9e64b;p=gosa.git
diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc
index 6ab007d1f..a039c2ecc 100644
--- a/plugins/admin/systems/class_systemManagement.inc
+++ b/plugins/admin/systems/class_systemManagement.inc
@@ -38,6 +38,7 @@ class systems extends plugin
var $terminals= array();
var $ui= NULL;
var $acl= "";
+ var $DivListSystem;
function systems ($config, $ui)
{
@@ -45,64 +46,25 @@ class systems extends plugin
$this->config= $config;
$this->ui= $ui;
- /* Get global filter config */
- if (!is_global("terminalfilter")){
- $ui= get_userinfo();
- $base= get_base_from_people($ui->dn);
- $terminalfilter= array("workstations" => "checked",
- "thins" => "checked",
- "winstations" => "checked",
- "servers" => "checked",
- "printers" => "checked",
- "phones" => "checked",
- "netdev" => "checked",
- "user" => "*",
- "depselect" => $base,
- "regex" => "*");
- register_global("terminalfilter", $terminalfilter);
- }
+ /* Creat dialog object */
+ $this->DivListSystem = new divListSystem($this->config,$this);
}
function execute()
{
- /* Save data */
- $terminalfilter= get_global("terminalfilter");
- foreach( array("depselect", "user", "regex") as $type){
- if (isset($_POST[$type])){
- $terminalfilter[$type]= $_POST[$type];
- }
- }
- if (isset($_POST['depselect'])){
- foreach( array("workstations", "thins", "winstations", "printers", "phones", "servers", "netdev") as $type){
+ /* Call parent execute */
+ plugin::execute();
- if (isset($_POST[$type])) {
- $terminalfilter[$type]= "checked";
- } else {
- $terminalfilter[$type]= "";
- }
- }
- }
- if (isset($_GET['search'])){
- $s= mb_substr($_GET['search'], 0, 1, "UTF8")."*";
- if ($s == "**"){
- $s= "*";
- }
- $terminalfilter['regex']= $s;
- }
+ $_SESSION['LOCK_VARS_TO_USE'] = array("/^user_edit_/i","/^user_del_/","/^act/","/^id/");
+ /********************
+ Check for functional posts, edit|delete|add|... system devices
+ ********************/
$s_action = ""; // Contains the action to proceed
$s_entry = ""; // The value for s_action
$base_back = ""; // The Link for Backbutton
$smarty = get_smarty();
- /* Start for New List Managment */
- if(isset($_GET['act'])&&($_GET['act']=="dep_open")){
- $s_action="open";
- $s_entry = base64_decode($_GET['dep_id']);
- $terminalfilter['depselect']= "".$this->config->departments[trim($s_entry)];
- $this->reload();
- }
-
/* Test Posts */
foreach($_POST as $key => $val){
// Post for delete
@@ -114,63 +76,42 @@ class systems extends plugin
$s_action="edit";
$s_entry = preg_replace("/user_".$s_action."_/i","",$key);
// Post for new
- }elseif(preg_match("/dep_back.*/i",$key)){
- $s_action="back";
}elseif(preg_match("/user_new.*/",$key)){
$s_action="new";
- }elseif(preg_match("/dep_home.*/i",$key)){
- $s_action="home";
}elseif(preg_match("/user_tplnew.*/i",$key)){
$s_action="new_tpl";
}elseif(preg_match("/user_setpwd_.*/i",$key)){
$s_action="change_pw";
$s_entry = preg_replace("/user_setpwd_/i","",$key);
- }elseif(preg_match("/dep_root.*/i",$key)){
- $s_action="root";
+ }elseif(preg_match("/gen_cd_.*/i",$key)){
+ $s_action="gen_cd";
+ $s_entry = preg_replace("/gen_cd_/i","",$key);
}elseif(preg_match("/newsystem_.*/i",$key)){
$s_action="newsystem";
$s_entry = preg_replace("/newsystem_/i","",$key);
}
}
- if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){
- $s_action ="edit";
- $s_entry = $_GET['id'];
+ /* Incoming handling
+ * If someone made a systemtype and ogroup selection
+ * Display the new requested entry type ... servtab in case of server and so on.
+ */
+ if(isset($_POST['SystemTypeChoosen'])){
+ $s_action = "SelectedSystemType";
+ $s_entry = $_POST['SystemType'];
+ $_SESSION['SelectedSystemType']['ogroup'] = $_POST['ObjectGroup'];
+ $this->systab = NULL;
}
+ /* remove image tags from posted entry (posts looks like this 'name_x')*/
$s_entry = preg_replace("/_.$/","",$s_entry);
- /* Department changed? */
- if(isset($_POST['depselect']) && $_POST['depselect']){
- $terminalfilter['depselect']= $_POST['depselect'];
- }
-
- /* Homebutton is posted */
- if($s_action=="home"){
- $terminalfilter['depselect']=(preg_replace("/^[^,]+,/","",$this->ui->dn));
- $terminalfilter['depselect']=(preg_replace("/^[^,]+,/","",$terminalfilter['depselect']));
- }
-
- if($s_action=="root"){
- $terminalfilter['depselect']=($this->config->current['BASE']);
- }
-
-
- /* If Backbutton is Posted */
- if($s_action=="back"){
- $base_back = preg_replace("/^[^,]+,/","",$terminalfilter['depselect']);
- $base_back = convert_department_dn($base_back);
-
- if(isset($this->config->departments[trim($base_back)])){
- $terminalfilter['depselect']= $this->config->departments[trim($base_back)];
- }else{
- $terminalfilter['depselect']= $this->config->departments["/"];
- }
+ /* Edit was requested by pressing the name(link) of an item */
+ if((isset($_GET['act']))&&($_GET['act']=="edit_entry")){
+ $s_action ="edit";
+ $s_entry = $_GET['id'];
}
- register_global("terminalfilter", $terminalfilter);
- $this->reload();
-
/* Check for exeeded sizelimit */
if (($message= check_sizelimit()) != ""){
return($message);
@@ -181,64 +122,60 @@ class systems extends plugin
return ($smarty->fetch(get_template_path('chooser.tpl', TRUE)));
}
- /* Create new default terminal */
- if (isset($_POST['create_system'])||$s_action=="newsystem") {
- $this->dn= "new";
- $this->acl= array(":all");
+ /********************
+ Create new system ...
+ ********************/
+ /* Create new default terminal
+ * Or create specified object of selected system type, from given incoming object
+ */
+
+ $save_object_directly = false;
+ if(($s_action == "SelectedSystemType") && (isset($_POST['ObjectGroup']) && ($_POST['ObjectGroup'] != "none"))){
+ $save_object_directly = true;
+ }
+
+ if (isset($_POST['create_system'])||$s_action=="newsystem"||$s_action == "SelectedSystemType") {
- if(isset($_POST['system'])){
- $sw = $_POST['system'];
+ /* If the current entry is an incoming object
+ * $sw = System type as posted in new incoming handling dialog
+ */
+ if($s_action == "SelectedSystemType") {
+ $sw = $s_entry;
}else{
- $sw = $s_entry;
+ if(isset($_POST['system'])){
+ $sw = $_POST['system'];
+ }else{
+ $sw = $s_entry;
+ }
+ $this->dn= "new";
}
+ $this->acl= array(":all");
+ $tabs = array(
+ "terminal" => array("CLASS"=>"TERMTABS", "TABNAME"=>"termgeneric", "TABCLASS" =>"termtabs"),
+ "workstation" => array("CLASS"=>"WORKTABS", "TABNAME"=>"workgeneric", "TABCLASS" =>"worktabs"),
+ "server" => array("CLASS"=>"SERVTABS", "TABNAME"=>"servgeneric", "TABCLASS" =>"servtabs"),
+ "printer" => array("CLASS"=>"PRINTTABS", "TABNAME"=>"printgeneric", "TABCLASS" =>"printtabs"),
+ "phone" => array("CLASS"=>"PHONETABS", "TABNAME"=>"phonegeneric", "TABCLASS" =>"phonetabs"),
+ "component" => array("CLASS"=>"COMPONENTTABS","TABNAME"=>"componentgeneric","TABCLASS" =>"componenttabs"));
- switch ($sw){
- case 'terminal':
- $this->systab= new termtabs($this->config,
- $this->config->data['TABS']['TERMTABS'], $this->dn);
- $this->systab->set_acl ($this->acl);
- $this->systab->by_object['termgeneric']->cn= "default";
- $this->systab->by_object['termservice']->cn= "default";
- break;
-
- case 'workstation':
- $this->systab= new worktabs($this->config,
- $this->config->data['TABS']['WORKTABS'], $this->dn);
- $this->systab->set_acl ($this->acl);
- $this->systab->by_object['workgeneric']->cn= "wdefault";
- $this->systab->by_object['termservice']->cn= "default";
- break;
-
- case 'server':
- $this->systab= new servtabs($this->config,
- $this->config->data['TABS']['SERVTABS'], $this->dn);
- $this->systab->set_acl ($this->acl);
- break;
-
- case 'printer':
- $this->systab= new printtabs($this->config,
- $this->config->data['TABS']['PRINTTABS'], $this->dn);
- $this->systab->set_acl ($this->acl);
- break;
-
- case 'phone':
- $this->systab= new phonetabs($this->config,
- $this->config->data['TABS']['PHONETABS'], $this->dn);
- $this->systab->set_acl ($this->acl);
- break;
-
- case 'component':
- $this->systab= new componenttabs($this->config,
- $this->config->data['TABS']['COMPONENTTABS'], $this->dn);
- $this->systab->set_acl ($this->acl);
- break;
+ if(isset($tabs[$sw])){
+ $class = $tabs[$sw]["CLASS"];
+ $tabname = $tabs[$sw]["TABNAME"];
+ $tabclass = $tabs[$sw]["TABCLASS"];
+ $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn);
+ $this->systab->set_acl ($this->acl);
+ $this->systab->by_object[$tabname]->base = $this->DivListSystem->selectedBase;
+ $this->systab->base = $this->DivListSystem->selectedBase;
}
}
+ /********************
+ Edit system ...
+ ********************/
+
/* User wants to edit data? */
- if ($s_action == "edit"){
+ if (($s_action == "edit") && (!isset($this->systab->config))){
- /* Get 'dn' from posted 'cn', must be unique */
$this->dn= $this->terminals[$s_entry]['dn'];
/* Check locking, save current plugin in 'back_plugin', so
@@ -252,79 +189,107 @@ class systems extends plugin
/* Find out more about the object type */
$ldap= $this->config->get_ldap_link();
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn, array('objectClass'));
$attrs= $ldap->fetch();
$type= $this->get_system_type($attrs['objectClass']);
/* Lock the current entry, so everyone will get the
above dialog */
- add_lock ($this->dn, $this->ui->dn);
-
- switch ($type){
- case "terminal":
- /* Register systab to trigger edit dialog */
- $this->systab= new termtabs($this->config,
- $this->config->data['TABS']['TERMTABS'], $this->dn);
- $this->systab->set_acl($acl);
- $_SESSION['objectinfo']= $this->dn;
- break;
-
- case "server":
- /* Register systab to trigger edit dialog */
- $this->systab= new servtabs($this->config,
- $this->config->data['TABS']['SERVTABS'], $this->dn);
- $this->systab->set_acl($acl);
- $_SESSION['objectinfo']= $this->dn;
- break;
-
- case "workstation":
- /* Register systab to trigger edit dialog */
- $this->systab= new worktabs($this->config,
- $this->config->data['TABS']['WORKTABS'], $this->dn);
- $this->systab->set_acl($acl);
- $_SESSION['objectinfo']= $this->dn;
- break;
-
- case "printer":
- /* Register systab to trigger edit dialog */
- $this->systab= new printtabs($this->config,
- $this->config->data['TABS']['PRINTTABS'], $this->dn);
- $this->systab->set_acl($acl);
- $_SESSION['objectinfo']= $this->dn;
- break;
-
- case "phone":
- /* Register systab to trigger edit dialog */
- $this->systab= new phonetabs($this->config,
- $this->config->data['TABS']['PHONETABS'], $this->dn);
- $this->systab->set_acl($acl);
- $_SESSION['objectinfo']= $this->dn;
- break;
-
- case "component":
- /* Register systab to trigger edit dialog */
- $this->systab= new componenttabs($this->config,
- $this->config->data['TABS']['COMPONENTTABS'], $this->dn);
- $this->systab->set_acl($acl);
- $_SESSION['objectinfo']= $this->dn;
- break;
-
- case "winstation":
- /* Register systab to trigger edit dialog */
- $this->systab= new wintabs($this->config,
- $this->config->data['TABS']['WINTABS'], $this->dn);
- $this->systab->set_acl($acl);
- $_SESSION['objectinfo']= $this->dn;
- break;
-
-
- default:
- print_red (_("You can't edit this object type yet!"));
- del_lock($this->dn);
- break;
+ $tabs = array(
+ "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs"),
+ "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs"),
+ "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs"),
+ "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs"),
+ "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs"),
+ "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs"),
+ "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs"));
+
+
+ if($type == "NewDevice"){
+ $this->systab = new SelectDeviceType($this->config,$this->dn) ;
+ }elseif(isset($tabs[$type])){
+
+ $class = $tabs[$type]["CLASS"];
+ $tabclass = $tabs[$type]["TABCLASS"];
+
+ $this->systab= new $tabclass($this->config, $this->config->data['TABS'][$class], $this->dn);
+ $this->systab->set_acl($acl);
+ $_SESSION['objectinfo']= $this->dn;
+ add_lock ($this->dn, $this->ui->dn);
+ }else{
+ print_red (_("You can't edit this object type yet!"));
+ del_lock($this->dn);
}
}
+ /********************
+ Create FAI CD ...
+ ********************/
+ if ($s_action=="gen_cd"){
+echo "ACL CHECK!";
+ $this->dn= $this->terminals[$s_entry]['dn'];
+ $_SESSION['objectinfo']= $this->dn;
+ return ($smarty->fetch(get_template_path('gencd.tpl', TRUE)));
+ }
+
+
+ /* Start CD-Creation */
+ if (isset($_POST["cd_create"])){
+echo "ACL CHECK!";
+ $smarty->assign("src", "?plug=".$_GET['plug']."&PerformIsoCreation");
+ return ($smarty->fetch(get_template_path('gencd_frame.tpl', TRUE)));
+ }
+
+ if ($this->dn != "" && isset($_GET['PerformIsoCreation'])){
+echo "ACL CHECK!";
+
+ $command= search_config($this->config->data['TABS'], "workgeneric", "ISOCMD");
+ if (check_command($command)){
+ @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execute");
+
+ $dsc= array(0 => array("pipe", "r"), 1 => array("pipe", "w"), 2 => array("pipe", "w"));
+ echo "";
+ echo "";
+ echo "";
+ echo "";
+ $process= proc_open($command, $dsc, $pipes, '/tmp');
+ if (is_resource($process)) {
+ fclose($pipes[0]);
+ while (!feof($pipes[1])){
+ echo fgets($pipes[1], 1024);
+ flush();
+ }
+ }
+ $buffer= stream_get_contents($pipes[2]);
+ fclose($pipes[1]);
+ fclose($pipes[2]);
+ $ret= proc_close($process);
+ echo " ";
+
+ if ($ret == 0){
+ echo "hier der runterladen button";
+ } else {
+ echo ""._("Creating the image failed. Please see the report below.")." ";
+ echo "$buffer ";
+ }
+
+ } else {
+ $tmp= "".sprintf(_("Command '%s', specified for ISO creation doesn't seem to exist."), $command)." ";
+ echo $tmp;
+ }
+
+ echo ""._("Disable auto scroll")." ";
+ echo "";
+
+ exit;
+ }
+
+
+
+ /********************
+ Change password ...
+ ********************/
+
/* Set terminals root password */
if ($s_action=="change_pw"){
$this->dn= $this->terminals[$s_entry]['dn'];
@@ -332,6 +297,11 @@ class systems extends plugin
return ($smarty->fetch(get_template_path('password.tpl', TRUE)));
}
+
+ /********************
+ Password cahnge finish, but check if entered data is ok
+ ********************/
+
/* Correctly specified? */
if (isset($_POST['password_finish'])){
if ($_POST['new_password'] != $_POST['repeated_password']){
@@ -340,6 +310,10 @@ class systems extends plugin
}
}
+ /********************
+ Password change finish
+ ********************/
+
/* Change terminal password */
if (isset($_POST['password_finish']) &&
$_POST['new_password'] == $_POST['repeated_password']){
@@ -366,12 +340,22 @@ class systems extends plugin
unset($_SESSION['objectinfo']);
}
+
+ /********************
+ Delete system cancel
+ ********************/
+
/* Delete terminal canceled? */
if (isset($_POST['delete_cancel']) || isset($_POST['password_cancel'])){
del_lock ($this->dn);
unset($_SESSION['objectinfo']);
}
+
+ /********************
+ Delete system, confirm dialog
+ ********************/
+
/* Remove terminal was requested */
if ($s_action=="del"){
@@ -392,7 +376,7 @@ class systems extends plugin
/* Lock the current entry, so nobody will edit it during deletion */
add_lock ($this->dn, $this->ui->dn);
- $smarty->assign("warning", sprintf(_("You're about to delete all information about the component at '%s'."), $this->dn));
+ $smarty->assign("warning", sprintf(_("You're about to delete all information about the component at '%s'."), @LDAP::fix($this->dn)));
return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
} else {
@@ -402,6 +386,10 @@ class systems extends plugin
}
}
+
+ /********************
+ Delete system, confirmed
+ ********************/
/* Confirmation for deletion has been passed. Terminal should be deleted. */
if (isset($_POST['delete_terminal_confirm'])){
@@ -411,53 +399,45 @@ class systems extends plugin
/* Find out more about the object type */
$ldap= $this->config->get_ldap_link();
- $ldap->cat($this->dn);
+ $ldap->cat($this->dn, array('objectClass'));
$attrs= $ldap->fetch();
$type= $this->get_system_type($attrs['objectClass']);
- switch ($type){
- case "terminal":
- $tabtype= "termtabs";
- break;
-
- case "workstation":
- $tabtype= "worktabs";
- break;
-
- case "phone":
- $tabtype= "phonetabs";
- break;
-
- case "server":
- $tabtype= "servtabs";
- break;
-
- default:
-#print_red (_("You can't remove this object type yet!"));
-#del_lock($this->dn);
-#return;
- $tabtype= "termtabs";
- break;
+ $tabs = array(
+ "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs"),
+ "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs"),
+ "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs"),
+ "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs"),
+ "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs"),
+ "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs"),
+ "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs"));
+
+ /* get object type */
+ $tabtype = "termtabs";
+ $tabobj = "TERMTABS";
+ if(isset($tabs[$type])){
+ $tabtype = $tabs[$type]['TABCLASS'];
+ $tabobj = $tabs[$type]['CLASS'];
}
/* Delete request is permitted, perform LDAP action */
if($tabtype=="phonetabs"){
$this->systab= new $tabtype($this->config,
- $this->config->data['TABS']['PHONETABS'], $this->dn);
+ $this->config->data['TABS'][$tabobj], $this->dn);
$this->systab->set_acl(array($this->acl));
$this->systab->by_object['phonegeneric']->remove_from_parent ();
}else{
$this->systab= new $tabtype($this->config,
- $this->config->data['TABS']['TERMTABS'], $this->dn);
+ $this->config->data['TABS'][$tabobj], $this->dn);
$this->systab->set_acl(array($this->acl));
- $this->systab->by_object['termgeneric']->remove_from_parent ();
+ $this->systab->delete();
+#$this->systab->by_object['termgeneric']->remove_from_parent ();
}
unset ($this->systab);
gosa_log ("System object'".$this->dn."' has been removed");
$this->systab= NULL;
/* Terminal list has changed, reload it. */
- $this->reload ();
} else {
/* Normally this shouldn't be reached, send some extra
@@ -471,20 +451,81 @@ class systems extends plugin
del_lock ($this->dn);
}
+
+ /********************
+ Edit system type finished, check if everything went ok
+ ********************/
/* Finish user edit is triggered by the tabulator dialog, so
the user wants to save edited data. Check and save at this
point. */
- if (isset($_POST['edit_finish'])){
+ if ((isset($_POST['edit_finish'])) && (isset($this->systab->config)) || $save_object_directly){
/* Check tabs, will feed message array */
- $message= $this->systab->check();
+ $message = array();
+ if(!$save_object_directly){
+ $message = $this->systab->check();
+ }else{
+ $found = false;
+
+ /* Set gotoMode to active if we there was an ogroup selected . (save_object_directly) */
+ foreach(array("workgeneric"=>"active","servgeneric"=>"active","termgeneric"=>"graphic") as $tab => $value){
+ if(isset($this->systab->by_object[$tab]->gotoMode)) {
+ $found = true;
+ $this->systab->by_object[$tab]->gotoMode = $value;
+ }
+ }
+ if(!$found){
+ print_red(sprintf(_("Can't set gotoMode to status 'avtice', the current object couldn't be identified.")));
+ }
+ }
/* Save, or display error message? */
if (count($message) == 0){
/* Save terminal data to ldap */
- gosa_log ("System object'".$this->dn."' has been saved");
+ if(isset($_SESSION['SelectedSystemType']['ogroup']) && $_SESSION['SelectedSystemType']['ogroup'] != 'none'){
+ foreach (array("workservice", "termservice") as $cls){
+ if (isset($this->systab->by_object[$cls])){
+ $this->systab->by_object[$cls]->gotoXMouseport= "";
+ $this->systab->by_object[$cls]->gotoXMouseType= "";
+ $this->systab->by_object[$cls]->gotoXResolution= "";
+ $this->systab->by_object[$cls]->gotoXColordepth= "";
+ }
+ }
+ }
+
$this->systab->save();
+ gosa_log ("System object'".$this->dn."' has been saved");
+
+ /* Incoming behavior; you can select a system type and an ogroup membership.
+ * If this object is an Incoming object, $_SESSION['SelectedSystemType'] isset.
+ * Check if we must add the new object to an object group.
+ *
+ * If this is done, delete the old incoming entry... it is still there, because this is a new
+ * entry and not an edited one, so we will delete it.
+ */
+
+ if(isset($_SESSION['SelectedSystemType'])){
+ $SelectedSystemType= $_SESSION['SelectedSystemType'];
+ unset($_SESSION['SelectedSystemType']);
+ if($SelectedSystemType['ogroup'] != "none"){
+ $og = new ogroup($this->config,$SelectedSystemType['ogroup']);
+ if($og){
+ $og->AddDelMembership($this->systab->dn);
+ $og->save();
+ }
+ }
+ if(!isset($ldap)){
+ $ldap = $this->config->get_ldap_link();
+ }
+ $ldap->cd ($this->dn);
+ $ldap->cat($this->dn, array('dn'));
+ if(count($ldap->fetch())){
+ $ldap->cd($this->dn);
+ $ldap->rmDir($this->dn);
+ }
+ $ldap->cd($this->config->current['BASE']);
+ }
/* Terminal has been saved successfully, remove lock from
LDAP. */
@@ -492,232 +533,67 @@ class systems extends plugin
del_lock ($this->dn);
}
- /* There's no page reload so we have to read new terminals at
- this point. */
- $this->reload ();
unset ($this->systab);
$this->systab= NULL;
unset($_SESSION['objectinfo']);
-
} else {
/* Ok. There seem to be errors regarding to the tab data,
show message and continue as usual. */
show_errors($message);
}
-
}
+ /********************
+ Edit system was canceled
+ ********************/
/* Cancel dialogs */
- if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel'])){
+ if (isset($_POST['edit_cancel']) || isset($_POST['password_cancel']) || isset($_POST['SystemTypeAborted'])){
if (isset($this->systab)){
del_lock ($this->systab->dn);
unset ($this->systab);
}
$this->systab= NULL;
unset($_SESSION['objectinfo']);
+
+ /* Remove ogroup selection, which was set while editing a new incoming entry */
+ if(isset($_SESSION['SelectedSystemType'])){
+ unset($_SESSION['SelectedSystemType']);
+ }
}
+ /********************
+ Display edit dialog, or some other
+ ********************/
+
/* Show tab dialog if object is present */
- if ($this->systab){
+ if (isset($this->systab->config)){
$display= $this->systab->execute();
/* Don't show buttons if tab dialog requests this */
- if (!$this->systab->by_object[$this->systab->current]->dialog){
+ if ((isset($this->systab->by_object))&&(!$this->systab->by_object[$this->systab->current]->dialog)){
$display.= "\n";
- $display.= "
";
}
return ($display);
}
+ /* Display dialog with system list */
+ $this->DivListSystem->parent = $this;
+ $this->DivListSystem->execute();
-
-
-
-
- /* Prepare departments */
- $options= "";
- foreach ($this->config->idepartments as $key => $value){
- if ($terminalfilter['depselect'] == $key){
- $options.= "$value ";
- } else {
- $options.= "$value ";
- }
- }
-
-
- /* NEW LIST MANAGMENT */
- $listhead = "";
-
-
-
- $action= "%s ";
-
- 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" => "%s ";
-
- // Pictures for Extensions
- $img1 = " 
".
- " ".
- " ".
- " ".
- " ".
- " ".
- " ".
- " ![department](images/".$non_empty."folder.png)
");
- $field2 = array("string" => sprintf($linkopen,base64_encode($key),$val));
- $field3 = array("string" => " ", "attach" => "style='border:none'");
- $divlist->AddEntry(array($field1,$field2,$field3));
- }
-
- // Space
- $empty =" ";
-
- // User and Template Images
- $editlink = "%s";
-
- // Pictures for Extensions
- $img1 = "
";
- $img2 = "
";
- $img3 = "
";
- $img4 = "
";
- $img5 = "
";
- $img6 = "
";
- $img7 = "
";
- $img8 = "
";
-
- // Test Every Entry and generate divlist Array
- foreach($this->terminals as $key => $val){
- // Specify Pics for Extensions
- if(in_array("goCupsServer" ,$val['objectClass'])) $cups = $img1; else $cups =$empty;
- if(in_array("goLogDBServer" ,$val['objectClass'])) $logdb = $img2; else $logdb =$empty;
- if(in_array("goSyslogServer" ,$val['objectClass'])) $syslog = $img3; else $syslog=$empty;
- if(in_array("goImapServer" ,$val['objectClass'])) $imap = $img4; else $imap =$empty;
- if(in_array("sambaSamAccount" ,$val['objectClass'])) $samba = $img5; else $samba =$empty;
- if(in_array("goNfsServer" ,$val['objectClass'])) $nfs = $img6; else $nfs =$empty;
- if(in_array("goKrbServer" ,$val['objectClass'])) $krb = $img7; else $krb =$empty;
- if(in_array("goFonServer" ,$val['objectClass'])) $fon = $img8; else $fon =$empty;
- if(in_array("goFaxServer" ,$val['objectClass'])) $fax = $img9; else $fax =$empty;
- if(in_array("goLdapServer" ,$val['objectClass'])) $ldap = $img10; else $ldap =$empty;
-
- $pics = $cups.$logdb.$syslog.$imap.$samba.$nfs.$krb.$fon.$fax.$ldap;
- $pics = "";
- // Generate Array to Add
- if((isset($val['is_new']))&&(!empty($val['is_new']))){
- $display= "".$val["cn"][0]." ".$val['is_new'];
- }else{
- $display= "".$val["cn"][0]."";
- }
-
- if(in_array("gotoTerminal",$val['objectClass'])){
- $action2 = "";
- }else{
- $action2 = "";
- }
-
-
- if(isset($val['message'])){
- $display.= " (".$val['message']." '".$this->config->idepartments[$terminalfilter['depselect']]."' )";
- }
-
- $img=$this->convert_list($val);
-
- $field1 = array("string" => sprintf($img['img'],$val['dn']),"attach"=>"style='width:20px;align:middle;'");
- $field2 = array("string" => sprintf($editlink,$key,$display),"attach"=>"title='".$val['dn']."'");
- $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action),"attach" => "style='border:none; text-align:right;width:48px'");
- $divlist->AddEntry( array($field1,$field2,$field3));
- }
-
-
-
-
-
- /* Show main page */
- $smarty->assign("terminalshead", $listhead);
- $smarty->assign("terminals", $divlist->DrawList());
- $smarty->assign("search_image", get_template_path('images/search.png'));
- $smarty->assign("searchu_image", get_template_path('images/search_user.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'));
- foreach( array("depselect", "user", "regex", "workstations", "thins", "servers",
- "winstations", "printers", "phones", "netdev") as $type){
-
- $smarty->assign("$type", $terminalfilter[$type]);
+ /* Add departments if subsearch is disabled */
+ if(!$this->DivListSystem->SubSearch){
+ $this->DivListSystem->AddDepartments($this->DivListSystem->selectedBase);
}
- $smarty->assign("deplist", $this->config->idepartments);
-
- /* 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)));
+ $this->reload();
+ $this->DivListSystem->setEntries($this->terminals);
+ return($this->DivListSystem->Draw());
}
- function convert_list($input)
- {
- $temp= "";
- $conv= array(
- "D" => array("select_default.png",_("Template")),
- "T" => array("select_terminal.png",_("Terminal")),
- "L" => array("select_workstation.png",_("Workstation")),
- "F" => array("select_phone.png",_("Phone")),
- "S" => array("select_server.png",_("Server")),
- "NT"=> array("select_new_terminal.png",_("New Terminal")),
- "NL"=> array("select_new_workstation.png",_("New Workstation")),
- "W" => array("select_winstation.png",_("Winstation")),
- "C" => array("select_component.png",_("Network Device")),
- "P" => array("select_printer.png",_("Printer")));
-
- if((isset($input['is_new']))&&(!empty($input['is_new']))){
- $input['type']="N".$input['type'];
- }
- foreach ($conv as $key => $value){
- if($input['type']==$key){
- $tmp['img'] ="