![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 744eb76)
raw | patch | inline | side by side (parent: 744eb76)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 24 Apr 2006 06:32:44 +0000 (06:32 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Mon, 24 Apr 2006 06:32:44 +0000 (06:32 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3083 594d385d-05f5-0310-b6e9-bd551577e9d8
20 files changed:
index d772f503c6523f8dd769f8923105405f0aa07936..526b6a587a2be3b450d087100ef0cd4d92ce3842 100644 (file)
<td> </td>
<td>
{t}Class name{/t} <select name="SelectedClass" title="{t}Choose class name{/t}" style="width:120px;" {$ClassNamesAvailable}>
- {html_options values=$ClassNameKeys output=$ClassNames}
+ {html_options options=$ClassNames}
</select>
</td>
</tr>
index a06c77e6d27da0afc3a1de69d5fe2fe5fa46561d..727e46ca6323c56dd31bc052820912aa310e7632 100644 (file)
$smarty->assign("grey", "");
}
$smarty->assign("ClassNames", $used);
- $smarty->assign("ClassNameKeys", $used);
$display.= $smarty->fetch(get_template_path('askClassName.tpl', TRUE));
return($display);
}
index 21433ac06bffa99c78860e0eba41d88b419474f8..ff867e57f20a56e6f671dd7b5aadfd0aa1c02eb6 100644 (file)
*/
$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
index 6f3b0e30ed9c14cb69ea4bdd0be63c1e9e17c62b..3f1be86de5082e1b58b6595dd2998633c43c290b 100644 (file)
$branches = $this->getBranches();
asort($branches);
- $smarty->assign("branchKeys",array_flip($branches));
$smarty->assign("branches",$branches);
$smarty->assign("faihead" , $faihead);
index 8866bdf3c5c3d788ebadce84afc1bd17fc797bb9..e9aaa6d2625fbfe616bce67a57de50e2caf0c758 100644 (file)
}
$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 26a7132e74e6af559914bc3f6becb1a07cb3d4b6..3e44dcbf3df6f208113de7d6eedbef764744afcc 100644 (file)
$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;
}
$disks = $this->getDisks();
$smarty->assign("disks" ,$disks);
- $smarty->assign("diskKeys",array_flip($disks));
$display.= $smarty->fetch(get_template_path('faiPartitionTable.tpl', TRUE));
return($display);
}
index 9a6649f304ea4356610075a5839d421ab6777f26..ce3f9e36ddcbf2f3898ba96d08f4f7c2cef18c0f 100644 (file)
"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
index befb92022d9f77cb8aaa8344476e3e5921692164..daf503fff379e79ddd15e9e063d23b9be4dcb646 100644 (file)
}
$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 9fec3e07b879fcd8ca7109f37a681acba53b1daa..a82b75ec0996fd298dbb71b01f0a4dd504994c7f 100644 (file)
{
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){
index 81a411dc725e6aa5dcf3bbf469b3833b88abcb20..f0949890e14ea2aa1469139846b6845a96264108 100644 (file)
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'];
}
$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 46614d0cb339932535cc7954ad939197b106f67e..5a0e04f2ef08421922c5758b78baef2087fbfcf2 100644 (file)
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){
index 3bd5c80b1ba127e5b6ea22284a7823997a5d540c..94f3650a069ba992fc467bd395311c1219061b32 100644 (file)
<tr>
<td>
{$Entry_divlist}
- <!--
- <select name="SubObject[]" title="{t}Choose a hook to delete or edit{/t}" style="width:100%" size="20" id="SubObject" multiple>
- {html_options values=$SubObjectKeys output=$SubObjects}
- </select><br>
- <input type="submit" name="EditSubObject" value="{t}Edit{/t}" title="{t}Edit{/t}">
- <input type="submit" name="DelSubObject" value="{t}Delete{/t}" title="{t}Delete{/t}">
- -->
<input type="submit" name="AddSubObject" value="{t}Add{/t}" title="{t}Add{/t}" {$cnACL}>
</td>
</tr>
index ad25455ce0f51fa7594c614c8323b29df3c78ce4..2c3279bb60e39cd843c994d03f61345edd376bc5 100644 (file)
{t}Task{/t}
</LABEL>
<select name="FAItask" title="{t}Choose an existing FAI task{/t}" {$FAItaskACL}>
- {html_options values=$tasks output=$tasks selected=$FAItask}
+ {html_options options=$tasks selected=$FAItask}
</select>
</td>
</tr>
index c23e489d80883686ad477d1a38483bdd9853394e..22ded91efb74e354610fc11f8199c318944567b4 100644 (file)
</td>
<td>
<select name="FAIdebianReleaseS" title="{t}Release{/t}">
- {html_options options=$releases values=$releaseKeys selected=$release}
+ {html_options options=$releases selected=$release}
</select>
</td>
</tr>
index 43db0eb5676fac4bfe8dace8b8a2ca8a73f941d7..a62397906728ba7304354965c2f764842e0f999f 100644 (file)
<tr>
<td>
<select name="disks[]" title="{t}Choose a disk to delete or edit{/t}" style="width:100%" size="20" id="SubObject" multiple>
- {html_options values=$diskKeys output=$disks}
+ {html_options options=$disks}
</select><br>
<input type="submit" name="AddDisk" value="{t}Add{/t}" title="{t}Add{/t}" {$cnACL}>
<input type="submit" name="EditDisk" value="{t}Edit{/t}" title="{t}Edit{/t}" >
index 4c235c3613643fbcbbe0c2abeca4f91532f6762b..ee1c93c9f52cf08e7f55057176e0e5345d352d79 100644 (file)
<tr>
<td>
{$Entry_divlist}
- <!--
- <select name="SubObject[]" title="{t}Choose a script to delete or edit{/t}" style="width:100%;" size="20" id="SubObject" multiple>
- {html_options values=$SubObjectKeys output=$SubObjects}
- </select><br>
- <input type="submit" name="EditSubObject" value="{t}Edit{/t}" title="{t}Edit{/t}">
- <input type="submit" name="DelSubObject" value="{t}Delete{/t}" title="{t}Delete{/t}">
- -->
<input type="submit" name="AddSubObject" value="{t}Add{/t}" title="{t}Add{/t}" {$cnACL}>
</td>
</tr>
index 9f60e8a17eba42fd1d5d275da1254d7489d949a9..ab9c5c15227e746bc6d27decb919533e9354f36a 100644 (file)
</td>
<td>
<select name="FAIpriority" title="{t}Choose a priority{/t}" {$FAIpriorityACL}>
- {html_options values=$FAIprioritys output=$FAIprioritys selected=$FAIpriority}
+ {html_options options=$FAIprioritys selected=$FAIpriority}
</select>
</td>
</tr>
index 9e380d77a68d385cc8713f79cd3a23736474fc73..e7b4666b027bc9171f1e82f73ef8283d7ec6407d 100644 (file)
<td>
<select name="SubObject[]" multiple}
title="{t}Choose a template to delete or edit{/t}" style="width:100%;" size="20" id="SubObject">
- {html_options values=$SubObjectKeys output=$SubObjects}
+ {html_options options=$SubObjects}
</select><br>
<input type="submit" name="AddSubObject" value="{t}Add{/t}" title="{t}Add{/t}" {$cnACL}>
<input type="submit" name="EditSubObject" value="{t}Edit{/t}" title="{t}Edit{/t}">
index 6d07486a4d2a73c4e1c49647e3aac134282b3e71..3eff2719e672d8d2b1e98c0f0bd750b9daf37876 100644 (file)
<td>
<select name="SubObject[]" multiple title="{t}Choose a variable to delete or edit{/t}"
style="width:100%;" size="20" id="SubObject">
- {html_options values=$SubObjectKeys output=$SubObjects}
+ {html_options options=$SubObjects}
</select><br>
<input type="submit" name="AddSubObject" value="{t}Add{/t}" title="{t}Add{/t}" {$cnACL}>
<input type="submit" name="EditSubObject" value="{t}Edit{/t}" title="{t}Edit{/t}" >
index 6a4e562c186f92c4a273cf16156713d7696c3668..61cd16dddf294008f3470cc6a938c9ad7e220d8c 100644 (file)
<td>
{t}Current release{/t}
<select name="select_branch" onChange="document.mainform.submit();">
- {html_options values=$branchKeys output=$branches selected=$select_branch}
+ {html_options options=$branches selected=$select_branch}
</select>
</td>
</tr>