projects
/
fa-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed many issues in output HTML code according to HTML 4.01 Transitional format.
[fa-stable.git]
/
includes
/
ui
/
ui_input.inc
diff --git
a/includes/ui/ui_input.inc
b/includes/ui/ui_input.inc
index 5c0cacd163818dde63bb504fb98c88d990357d2e..4f02f9b26b8e4aa89504dc5f7c0dd58cf5306e5e 100644
(file)
--- a/
includes/ui/ui_input.inc
+++ b/
includes/ui/ui_input.inc
@@
-85,10
+85,11
@@
function input_num($postname=null, $dflt=0)
}
//---------------------------------------------------------------------------------
}
//---------------------------------------------------------------------------------
+$hidden_fields = array(); // store for hiddn fields attached just before form end (for proper html validation)
function hidden($name, $value=null, $echo=true)
{
function hidden($name, $value=null, $echo=true)
{
- global $Ajax;
+ global $Ajax
, $hidden_fields
;
if ($value === null)
$value = get_post($name);
if ($value === null)
$value = get_post($name);
@@
-96,7
+97,7
@@
function hidden($name, $value=null, $echo=true)
$ret = "<input type=\"hidden\" name=\"$name\" value=\"$value\">";
$Ajax->addUpdate($name, $name, $value);
if ($echo)
$ret = "<input type=\"hidden\" name=\"$name\" value=\"$value\">";
$Ajax->addUpdate($name, $name, $value);
if ($echo)
-
echo $ret."\n"
;
+
$hidden_fields[] = $ret
;
else
return $ret;
}
else
return $ret;
}
@@
-127,7
+128,7
@@
function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
} elseif (!is_bool($atype)) { // necessary: switch uses '=='
} elseif (!is_bool($atype)) { // necessary: switch uses '=='
- $aspect = "aspect='$atype' ";
+ $aspect = "
aspect='$atype' ";
$types = explode(' ', $atype);
foreach ($types as $type) {
$types = explode(' ', $atype);
foreach ($types as $type) {
@@
-155,7
+156,7
@@
function submit($name, $value, $echo=true, $title=false, $atype=false, $icon=fal
." name=\"$name\" id=\"$name\" value=\"$value\""
.($title ? " title='$title'" : '')
.">"
." name=\"$name\" id=\"$name\" value=\"$value\""
.($title ? " title='$title'" : '')
.">"
- .($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon' height='12'>" : '')
+ .($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon' height='12'
alt=''
>" : '')
."<span>$value</span>"
."</button>\n";
if ($echo)
."<span>$value</span>"
."</button>\n";
if ($echo)
@@
-268,7
+269,7
@@
function set_icon($icon, $title=false)
global $path_to_root;
if (basename($icon) === $icon) // standard icons does not contain path separator
$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
global $path_to_root;
if (basename($icon) === $icon) // standard icons does not contain path separator
$icon = "$path_to_root/themes/".user_theme()."/images/$icon";
- return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")."
/>\n";
+ return "<img src='$icon' width='12' height='12' border='0'".($title ? " title='$title'" : "")."
>\n";
}
function button($name, $value, $title=false, $icon=false, $aspect='')
}
function button($name, $value, $title=false, $icon=false, $aspect='')
@@
-290,7
+291,7
@@
function button($name, $value, $title=false, $icon=false, $aspect='')
."' value='1'" . ($title ? " title='$title'":" title='$value'")
. ($aspect ? " aspect='$aspect'" : '')
. $rel
."' value='1'" . ($title ? " title='$title'":" title='$value'")
. ($aspect ? " aspect='$aspect'" : '')
. $rel
- ."
/
>".set_icon($icon)."</button>\n";
+ ." >".set_icon($icon)."</button>\n";
}
else
return "<input type='submit' class='editbutton' name='"
}
else
return "<input type='submit' class='editbutton' name='"
@@
-300,7
+301,7
@@
function button($name, $value, $title=false, $icon=false, $aspect='')
.($title ? " title='$title'":'')
. ($aspect ? " aspect='$aspect'" : '')
. $rel
.($title ? " title='$title'":'')
. ($aspect ? " aspect='$aspect'" : '')
. $rel
- ."
/
>\n";
+ ." >\n";
}
function button_cell($name, $value, $title=false, $icon=false, $aspect='')
}
function button_cell($name, $value, $title=false, $icon=false, $aspect='')
@@
-464,14
+465,14
@@
function qty_cell($label, $bold=false, $dec=null, $id=null)
label_cell(number_format2($label, $dec), "nowrap align=right", $id);
}
label_cell(number_format2($label, $dec), "nowrap align=right", $id);
}
-function label_cells($label, $value, $params="", $params2="", $id=
''
)
+function label_cells($label, $value, $params="", $params2="", $id=
null
)
{
if ($label != null)
echo "<td $params>$label</td>\n";
label_cell($value, $params2, $id);
}
{
if ($label != null)
echo "<td $params>$label</td>\n";
label_cell($value, $params2, $id);
}
-function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=
''
)
+function label_row($label, $value, $params="", $params2="", $leftfill=0, $id=
null
)
{
echo "<tr>";
if ($params == "")
{
echo "<tr>";
if ($params == "")
@@
-666,7
+667,7
@@
function date_row($label, $name, $title=null, $check=null, $inc_days=0, $inc_mon
function password_row($label, $name, $value)
{
echo "<tr><td class='label'>$label</td>";
function password_row($label, $name, $value)
{
echo "<tr><td class='label'>$label</td>";
- label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value'
/
>");
+ label_cell("<input type='password' name='$name' size=20 maxlength=20 value='$value' >");
echo "</tr>\n";
}
echo "</tr>\n";
}
@@
-675,7
+676,7
@@
function file_cells($label, $name, $id="")
{
if ($id != "")
$id = "id='$id'";
{
if ($id != "")
$id = "id='$id'";
- label_cells($label, "<input type='file' name='$name' $id
/
>");
+ label_cells($label, "<input type='file' name='$name' $id >");
}
function file_row($label, $name, $id = "")
{
}
function file_row($label, $name, $id = "")
{