Mercurial > hg > fapweb
changeset 637:a376521c7bd1
Move some code around, for more appropriate placement in the modules.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Mon, 03 Nov 2014 00:04:40 +0200 |
parents | 4ea7a88cdb2f |
children | 79bbd09114c5 |
files | msite.inc.php msitegen.inc.php |
diffstat | 2 files changed, 34 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/msite.inc.php Mon Nov 03 00:00:20 2014 +0200 +++ b/msite.inc.php Mon Nov 03 00:04:40 2014 +0200 @@ -328,29 +328,26 @@ } -function stGetOptionListStart($id, $indent, $outer, $size = 10, $onChange = "") +function stGetTDEditTextItem($edit, $size, $len, $name, $id, $prefix, $value, $extra = "") { return - ($outer ? $indent."<div id=\"".$id."\">\n" : ""). - $indent."<select class=\"selectBox\" id=\"".$id."Sel\" size=\"".$size."\"". - ($onChange != "" ? " onChange=\"".$onChange."\"" : "").">\n"; + "<td class=\"".$name."\">". + ($edit ? stGetFormTextInput($size, $len, $name, $id, $prefix, $value, $extra) : chentities($value)). + "</td>"; } -function stGetOptionListItem($value, $active, $name) +function stPrintFormTextInput($text1, $text2, $size, $len, $name, $extra="") { - return - "<option value=\"".$value."\"". - ($active ? " selected=\"selected\"" : ""). - ">".str_replace(" ", " ", chentities($name))."</option>\n"; + echo " <tr><th>".chentities($text1)."</th><td>". + stGetFormTextInput($size, $len, $name, "", "", stGetRequestItem($name), $extra). + "</td><td>".chentities($text2)."</td></tr>\n"; } -function stGetOptionListEnd($indent, $outer) +function stPrintFormHiddenInput($name, $value) { - return - $indent."</select>\n". - ($outer ? $indent."</div>\n" : ""); + echo " ".stGetFormHiddenInput($name, $value)."\n"; }
--- a/msitegen.inc.php Mon Nov 03 00:00:20 2014 +0200 +++ b/msitegen.inc.php Mon Nov 03 00:04:40 2014 +0200 @@ -265,26 +265,40 @@ } -function stGetTDEditTextItem($edit, $size, $len, $name, $id, $prefix, $value, $extra = "") +function stGetOptionListStart($id, $indent, $outer, $size = 10, $onChange = "") { return - "<td class=\"".$name."\">". - ($edit ? stGetFormTextInput($size, $len, $name, $id, $prefix, $value, $extra) : chentities($value)). - "</td>"; + ($outer ? $indent."<div id=\"".$id."\">\n" : ""). + $indent."<select class=\"selectBox\" id=\"".$id."Sel\" size=\"".$size."\"". + ($onChange != "" ? " onChange=\"".$onChange."\"" : "").">\n"; } -function stPrintFormTextInput($text1, $text2, $size, $len, $name, $extra="") +function stGetOptionListItem($value, $active, $name) { - echo " <tr><th>".chentities($text1)."</th><td>". - stGetFormTextInput($size, $len, $name, "", "", stGetRequestItem($name), $extra). - "</td><td>".chentities($text2)."</td></tr>\n"; + return + "<option value=\"".$value."\"". + ($active ? " selected=\"selected\"" : ""). + ">".str_replace(" ", " ", chentities($name))."</option>\n"; } -function stPrintFormHiddenInput($name, $value) +function stGetOptionListEnd($indent, $outer) { - echo " ".stGetFormHiddenInput($name, $value)."\n"; + return + $indent."</select>\n". + ($outer ? $indent."</div>\n" : ""); +} + + +function stGetOptionListFromArray($id, $indent, $outer, $data, $active, $size = 10, $onChange = "") +{ + $str = stGetOptionListStart($id, $indent, $outer, $size, $onChange); + + foreach ($data as $name => $value) + $str .= stGetOptionListItem($value, ($value === $active), $name); + + return $str.stGetOptionListEnd($indent, $outer); }