From 7b13bebc56d31334a7e1dbdd46ba1b1ba6fe43d6 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 24 Apr 2006 06:32:44 +0000 Subject: [PATCH] Switched html_options from values+output to options git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3083 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/admin/fai/askClassName.tpl | 2 +- plugins/admin/fai/class_askClassName.inc | 1 - plugins/admin/fai/class_faiHook.inc | 1 - plugins/admin/fai/class_faiManagement.inc | 1 - plugins/admin/fai/class_faiPackageNew.inc | 1 - plugins/admin/fai/class_faiPartitionTable.inc | 10 ++++++++-- plugins/admin/fai/class_faiScript.inc | 5 ----- plugins/admin/fai/class_faiTemplate.inc | 1 - plugins/admin/fai/class_faiTemplateEntry.inc | 2 +- plugins/admin/fai/class_faiVariable.inc | 2 -- plugins/admin/fai/class_faiVariableEntry.inc | 2 +- plugins/admin/fai/faiHook.tpl | 7 ------- plugins/admin/fai/faiHookEntry.tpl | 2 +- plugins/admin/fai/faiPackageNew.tpl | 2 +- plugins/admin/fai/faiPartitionTable.tpl | 2 +- plugins/admin/fai/faiScript.tpl | 7 ------- plugins/admin/fai/faiScriptEntry.tpl | 2 +- plugins/admin/fai/faiTemplate.tpl | 2 +- plugins/admin/fai/faiVariable.tpl | 2 +- plugins/admin/fai/headpage.tpl | 2 +- 20 files changed, 18 insertions(+), 38 deletions(-) diff --git a/plugins/admin/fai/askClassName.tpl b/plugins/admin/fai/askClassName.tpl index d772f503c..526b6a587 100644 --- a/plugins/admin/fai/askClassName.tpl +++ b/plugins/admin/fai/askClassName.tpl @@ -52,7 +52,7 @@   {t}Class name{/t}  diff --git a/plugins/admin/fai/class_askClassName.inc b/plugins/admin/fai/class_askClassName.inc index a06c77e6d..727e46ca6 100644 --- a/plugins/admin/fai/class_askClassName.inc +++ b/plugins/admin/fai/class_askClassName.inc @@ -110,7 +110,6 @@ class askClassName extends plugin $smarty->assign("grey", ""); } $smarty->assign("ClassNames", $used); - $smarty->assign("ClassNameKeys", $used); $display.= $smarty->fetch(get_template_path('askClassName.tpl', TRUE)); return($display); } diff --git a/plugins/admin/fai/class_faiHook.inc b/plugins/admin/fai/class_faiHook.inc index 21433ac06..ff867e57f 100644 --- a/plugins/admin/fai/class_faiHook.inc +++ b/plugins/admin/fai/class_faiHook.inc @@ -275,7 +275,6 @@ class faiHook extends plugin */ $smarty->assign("SubObjects",$this->getList()); - $smarty->assign("SubObjectKeys",array_flip($this->getList())); /* Magic quotes GPC, escapes every ' " \, to solve some security risks * If we post the escaped strings they will be escaped again diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index 6f3b0e30e..3f1be86de 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -829,7 +829,6 @@ class faiManagement extends plugin $branches = $this->getBranches(); asort($branches); - $smarty->assign("branchKeys",array_flip($branches)); $smarty->assign("branches",$branches); $smarty->assign("faihead" , $faihead); diff --git a/plugins/admin/fai/class_faiPackageNew.inc b/plugins/admin/fai/class_faiPackageNew.inc index 8866bdf3c..e9aaa6d26 100644 --- a/plugins/admin/fai/class_faiPackageNew.inc +++ b/plugins/admin/fai/class_faiPackageNew.inc @@ -49,7 +49,6 @@ class faiPackageNew extends plugin } $smarty->assign("releases" ,$releases); - $smarty->assign("releaseKeys" ,array_flip($releases)); $smarty->assign("release" ,$this->FAIdebianRelease); $smarty->assign("sections",$this->generateSections($sections)); diff --git a/plugins/admin/fai/class_faiPartitionTable.inc b/plugins/admin/fai/class_faiPartitionTable.inc index 26a7132e7..3e44dcbf3 100644 --- a/plugins/admin/fai/class_faiPartitionTable.inc +++ b/plugins/admin/fai/class_faiPartitionTable.inc @@ -137,7 +137,14 @@ class faiPartitionTable extends plugin $this->dialog = new faiPartitionTableEntry($this->config,$this->dn,$usedDiskNames,$this->disks[$Udisk]); $this->dialog->acl = $this->acl; $this->dialog->FAIstate = $this->FAIstate; - $_SESSION['objectinfo'] = $this->disks[$Udisk]['dn']; + + /* Set object info string, which will be displayed in plugin info line */ + if(isset($this->disks[$Udisk]['dn'])){ + $_SESSION['objectinfo'] = $this->disks[$Udisk]['dn']; + }else{ + $_SESSION['objectinfo'] = ""; + } + $this->is_dialog = true; } @@ -240,7 +247,6 @@ class faiPartitionTable extends plugin $disks = $this->getDisks(); $smarty->assign("disks" ,$disks); - $smarty->assign("diskKeys",array_flip($disks)); $display.= $smarty->fetch(get_template_path('faiPartitionTable.tpl', TRUE)); return($display); } diff --git a/plugins/admin/fai/class_faiScript.inc b/plugins/admin/fai/class_faiScript.inc index 9a6649f30..ce3f9e36d 100644 --- a/plugins/admin/fai/class_faiScript.inc +++ b/plugins/admin/fai/class_faiScript.inc @@ -247,11 +247,6 @@ class faiScript extends plugin "attach"=>"style='border-right: 0px;width:50px;text-align:right;'"))); } $smarty->assign("Entry_divlist",$divlist->DrawList()); - /* Divlist creation complete - */ - - $smarty->assign("SubObjects",$this->getList()); - $smarty->assign("SubObjectKeys",array_flip($this->getList())); /* Magic quotes GPC, escapes every ' " \, to solve some security risks * If we post the escaped strings they will be escaped again diff --git a/plugins/admin/fai/class_faiTemplate.inc b/plugins/admin/fai/class_faiTemplate.inc index befb92022..daf503fff 100644 --- a/plugins/admin/fai/class_faiTemplate.inc +++ b/plugins/admin/fai/class_faiTemplate.inc @@ -189,7 +189,6 @@ class faiTemplate extends plugin } $smarty->assign("SubObjects",$this->getList()); - $smarty->assign("SubObjectKeys",array_flip($this->getList())); /* Magic quotes GPC, escapes every ' " \, to solve some security risks * If we post the escaped strings they will be escaped again diff --git a/plugins/admin/fai/class_faiTemplateEntry.inc b/plugins/admin/fai/class_faiTemplateEntry.inc index 9fec3e07b..a82b75ec0 100644 --- a/plugins/admin/fai/class_faiTemplateEntry.inc +++ b/plugins/admin/fai/class_faiTemplateEntry.inc @@ -32,7 +32,7 @@ class faiTemplateEntry extends plugin { plugin::plugin ($config, $dn); - if($dn != "new"){ + if((isset($object['cn'])) && (!empty($object['cn']))){ $this->orig_cn= $object['cn']; $this->dn=$object['dn']; foreach($object as $name=>$value){ diff --git a/plugins/admin/fai/class_faiVariable.inc b/plugins/admin/fai/class_faiVariable.inc index 81a411dc7..f0949890e 100644 --- a/plugins/admin/fai/class_faiVariable.inc +++ b/plugins/admin/fai/class_faiVariable.inc @@ -116,7 +116,6 @@ class faiVariable extends plugin if((isset($_POST['EditSubObject']))&&(isset($_POST['SubObject']))){ $var = $_POST['SubObject'][0]; - $this->dialog= new $this->subClassName($this->config,$this->dn,$this->SubObjects[$var]); $this->dialog->acl = $this->acl; $_SESSION['objectinfo'] = $this->SubObjects[$var]['dn']; @@ -188,7 +187,6 @@ class faiVariable extends plugin } $smarty->assign("SubObjects",$this->getList()); - $smarty->assign("SubObjectKeys",array_flip($this->getList())); /* Magic quotes GPC, escapes every ' " \, to solve some security risks * If we post the escaped strings they will be escaped again diff --git a/plugins/admin/fai/class_faiVariableEntry.inc b/plugins/admin/fai/class_faiVariableEntry.inc index 46614d0cb..5a0e04f2e 100644 --- a/plugins/admin/fai/class_faiVariableEntry.inc +++ b/plugins/admin/fai/class_faiVariableEntry.inc @@ -24,7 +24,7 @@ class faiVariableEntry extends plugin function faiVariableEntry ($config, $dn= NULL,$object=false) { plugin::plugin ($config, $dn); - if($dn != "new"){ + if((isset($object['cn'])) && (!empty($object['cn']))){ $this->orig_cn= $object['cn']; $this->dn=$object['dn']; foreach($object as $name=>$value){ diff --git a/plugins/admin/fai/faiHook.tpl b/plugins/admin/fai/faiHook.tpl index 3bd5c80b1..94f3650a0 100644 --- a/plugins/admin/fai/faiHook.tpl +++ b/plugins/admin/fai/faiHook.tpl @@ -38,13 +38,6 @@ {$Entry_divlist} - diff --git a/plugins/admin/fai/faiHookEntry.tpl b/plugins/admin/fai/faiHookEntry.tpl index ad25455ce..2c3279bb6 100644 --- a/plugins/admin/fai/faiHookEntry.tpl +++ b/plugins/admin/fai/faiHookEntry.tpl @@ -34,7 +34,7 @@ {t}Task{/t}  diff --git a/plugins/admin/fai/faiPackageNew.tpl b/plugins/admin/fai/faiPackageNew.tpl index c23e489d8..22ded91ef 100644 --- a/plugins/admin/fai/faiPackageNew.tpl +++ b/plugins/admin/fai/faiPackageNew.tpl @@ -22,7 +22,7 @@ diff --git a/plugins/admin/fai/faiPartitionTable.tpl b/plugins/admin/fai/faiPartitionTable.tpl index 43db0eb56..a62397906 100644 --- a/plugins/admin/fai/faiPartitionTable.tpl +++ b/plugins/admin/fai/faiPartitionTable.tpl @@ -38,7 +38,7 @@
diff --git a/plugins/admin/fai/faiScript.tpl b/plugins/admin/fai/faiScript.tpl index 4c235c361..ee1c93c9f 100644 --- a/plugins/admin/fai/faiScript.tpl +++ b/plugins/admin/fai/faiScript.tpl @@ -38,13 +38,6 @@ {$Entry_divlist} - diff --git a/plugins/admin/fai/faiScriptEntry.tpl b/plugins/admin/fai/faiScriptEntry.tpl index 9f60e8a17..ab9c5c152 100644 --- a/plugins/admin/fai/faiScriptEntry.tpl +++ b/plugins/admin/fai/faiScriptEntry.tpl @@ -36,7 +36,7 @@ diff --git a/plugins/admin/fai/faiTemplate.tpl b/plugins/admin/fai/faiTemplate.tpl index 9e380d77a..e7b4666b0 100644 --- a/plugins/admin/fai/faiTemplate.tpl +++ b/plugins/admin/fai/faiTemplate.tpl @@ -36,7 +36,7 @@
diff --git a/plugins/admin/fai/faiVariable.tpl b/plugins/admin/fai/faiVariable.tpl index 6d07486a4..3eff2719e 100644 --- a/plugins/admin/fai/faiVariable.tpl +++ b/plugins/admin/fai/faiVariable.tpl @@ -39,7 +39,7 @@
diff --git a/plugins/admin/fai/headpage.tpl b/plugins/admin/fai/headpage.tpl index 6a4e562c1..61cd16ddd 100644 --- a/plugins/admin/fai/headpage.tpl +++ b/plugins/admin/fai/headpage.tpl @@ -34,7 +34,7 @@ {t}Current release{/t}  -- 2.30.2