commit 199e0ea91646c2b4941a162fb80f5e97d64c380d parent 6c903f95ea2512d20cd0fe30141ea4a6fccaa589 Author: dankert <devnull@localhost> Date: Sat, 6 Nov 2010 00:45:46 +0100 Alle Template umgewandelt. Diffstat:
70 files changed, 464 insertions(+), 370 deletions(-)
diff --git a/themes/default/pages/html/element/name.tpl.php b/themes/default/pages/html/element/name.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/element/properties.tpl.php b/themes/default/pages/html/element/properties.tpl.php @@ -278,11 +278,12 @@ if (count($$a8_list)==1) echo '<input type="hidden" name="'.$a8_name.'" value="' <?php unset($a7_not,$a7_present) ?><?php $a8_class='text';$a8_default='';$a8_type='text';$a8_name='subtype';$a8_size='40';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php } ?></td></tr><?php } ?><?php $a4_present='with_icon'; ?><?php +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php } ?></td></tr><?php } ?><?php $a4_present='with_icon'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -458,11 +459,12 @@ if ( $a7_readonly && $checked ) ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='width';$a7_size='10';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='height'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='height'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -500,11 +502,12 @@ if ($a7_readonly) { ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='height';$a7_size='10';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='dateformat'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='dateformat'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -682,11 +685,12 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='decimals';$a7_size='10';$a7_maxlength='2';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='dec_point'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='dec_point'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -724,11 +728,12 @@ if ($a7_readonly) { ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='dec_point';$a7_size='10';$a7_maxlength='5';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='thousand_sep'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='thousand_sep'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -766,11 +771,12 @@ if ($a7_readonly) { ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='thousand_sep';$a7_size='10';$a7_maxlength='1';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='default_text'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='default_text'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -808,11 +814,12 @@ if ($a7_readonly) { ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='default_text';$a7_size='40';$a7_maxlength='255';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='default_longtext'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='default_longtext'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) diff --git a/themes/default/pages/html/element/remove.tpl.php b/themes/default/pages/html/element/remove.tpl.php @@ -224,7 +224,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/file/compress.tpl.php b/themes/default/pages/html/file/compress.tpl.php @@ -274,7 +274,7 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('OPTIONS'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('OPTIONS'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/file/prop.tpl.php b/themes/default/pages/html/file/prop.tpl.php @@ -203,11 +203,12 @@ ><?php unset($a5_class) ?><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -237,11 +238,12 @@ if ($a6_readonly) { ><?php unset($a5_class) ?><?php $a6_class='filename';$a6_default='';$a6_type='text';$a6_name='filename';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -271,11 +273,12 @@ if ($a6_readonly) { ><?php unset($a5_class) ?><?php $a6_class='extension';$a6_default='';$a6_type='text';$a6_name='extension';$a6_size='10';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -428,7 +431,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_false=$mode=="edit"; ?><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_false=$mode=="edit"; ?><?php if (gettype($a4_false) === '' && gettype($a4_false) === '1') $a4_tmp_exec = $$a4_false == false; else @@ -845,7 +848,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/file/size.tpl.php b/themes/default/pages/html/file/size.tpl.php @@ -267,7 +267,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a7_colspan) ?><?php $a8_title=lang('IMAGE_NEW_SIZE'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php +><?php unset($a7_colspan) ?><?php $a8_title=lang('IMAGE_NEW_SIZE'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php if(isset($a8_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a8_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -419,11 +419,12 @@ if (count($$a8_list)==1) echo '<input type="hidden" name="'.$a8_name.'" value="' ><?php $a8_class='text';$a8_default='';$a8_type='text';$a8_name='width';$a8_size='10';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php $a8_class='text';$a8_raw='_*_';$a8_escape=true;$a8_cut='both'; ?><?php +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php $a8_class='text';$a8_raw='_*_';$a8_escape=true;$a8_cut='both'; ?><?php $a8_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php @@ -435,11 +436,12 @@ if ($a8_readonly) { ?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_raw,$a8_escape,$a8_cut) ?><?php $a8_class='text';$a8_default='';$a8_type='text';$a8_name='height';$a8_size='10';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -453,7 +455,7 @@ if ($a8_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a7_colspan) ?><?php $a8_title=lang('options'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php +><?php unset($a7_colspan) ?><?php $a8_title=lang('options'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php if(isset($a8_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a8_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/file/uncompress.tpl.php b/themes/default/pages/html/file/uncompress.tpl.php @@ -186,7 +186,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/filebrowser/browse.tpl.php b/themes/default/pages/html/filebrowser/browse.tpl.php @@ -588,11 +588,12 @@ else ?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_raw,$a7_escape,$a7_cut) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='name';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_class='text';$a7_raw='__';$a7_escape=true;$a7_cut='both'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_class='text';$a7_raw='__';$a7_escape=true;$a7_cut='both'; ?><?php $a7_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php diff --git a/themes/default/pages/html/folder/create.tpl.php b/themes/default/pages/html/folder/create.tpl.php @@ -186,7 +186,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=lang('folder'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('folder'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -234,11 +234,12 @@ ><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='folder_name';$a6_size='30';$a6_maxlength='250';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -252,7 +253,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=lang('file'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('file'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -338,7 +339,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=lang('page'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('page'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -476,11 +477,12 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' ><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='page_name';$a6_size='30';$a6_maxlength='250';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -494,7 +496,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=lang('link'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('link'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -542,11 +544,12 @@ if ($a6_readonly) { ><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='link_name';$a6_size='30';$a6_maxlength='250';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/createfile.tpl.php b/themes/default/pages/html/folder/createfile.tpl.php @@ -281,11 +281,12 @@ else ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='url';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -299,7 +300,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('description'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('description'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -331,11 +332,12 @@ if ($a6_readonly) { ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/createfolder.tpl.php b/themes/default/pages/html/folder/createfolder.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='20';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/createlink.tpl.php b/themes/default/pages/html/folder/createlink.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='20';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/createpage.tpl.php b/themes/default/pages/html/folder/createpage.tpl.php @@ -287,11 +287,12 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='20';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/edit.tpl.php b/themes/default/pages/html/folder/edit.tpl.php @@ -301,7 +301,7 @@ else class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a6_colspan) ?><?php $a7_title=lang('folder_select_target_folder'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php $a5_list='folder';$a5_extract=false;$a5_key='list_key';$a5_value='list_value'; ?><?php +><?php unset($a6_colspan) ?><?php $a7_title=lang('folder_select_target_folder'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php if(isset($a7_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php $a5_list='folder';$a5_extract=false;$a5_key='list_key';$a5_value='list_value'; ?><?php $a5_list_tmp_key = $a5_key; $a5_list_tmp_value = $a5_value; $a5_list_extract = $a5_extract; @@ -382,11 +382,12 @@ else ><?php unset($a6_colspan) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='filename';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='ask_commit'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $a4_present='ask_commit'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -406,7 +407,7 @@ if ($a7_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a6_colspan) ?><?php $a7_title=lang('options'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php +><?php unset($a6_colspan) ?><?php $a7_title=lang('options'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php if(isset($a7_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/prop.tpl.php b/themes/default/pages/html/folder/prop.tpl.php @@ -289,7 +289,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_false=$mode=="edit"; ?><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_false=$mode=="edit"; ?><?php if (gettype($a4_false) === '' && gettype($a4_false) === '1') $a4_tmp_exec = $$a4_false == false; else @@ -387,7 +387,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=lang('PROP_USERINFO'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('PROP_USERINFO'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php @@ -283,7 +283,7 @@ if ( $a8_readonly && $checked ) <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> -><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/select.tpl.php b/themes/default/pages/html/folder/select.tpl.php @@ -422,7 +422,7 @@ if ( $a8_readonly && $checked ) class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/group/add.tpl.php b/themes/default/pages/html/group/add.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/group/edit.tpl.php b/themes/default/pages/html/group/edit.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/group/remove.tpl.php b/themes/default/pages/html/group/remove.tpl.php @@ -224,7 +224,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/group/rights.tpl.php b/themes/default/pages/html/group/rights.tpl.php @@ -175,7 +175,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="14" -><?php unset($a5_colspan) ?><?php $a6_title=$projectname; ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_empty='acls'; ?><?php +><?php unset($a5_colspan) ?><?php $a6_title=$projectname; ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_empty='acls'; ?><?php if ( !isset($$a4_empty) ) $a4_tmp_exec = empty($a4_empty); elseif ( is_array($$a4_empty) ) diff --git a/themes/default/pages/html/index/password.tpl.php b/themes/default/pages/html/index/password.tpl.php @@ -213,11 +213,12 @@ ><?php unset($a6_width) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='username';$a7_value='';$a7_size='30';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_value,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_value,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/index/passwordinputcode.tpl.php b/themes/default/pages/html/index/passwordinputcode.tpl.php @@ -217,11 +217,12 @@ ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='code';$a7_size='30';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/index/projectmenu.tpl.php b/themes/default/pages/html/index/projectmenu.tpl.php @@ -187,7 +187,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=$name; ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=$name; ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/index/register.tpl.php b/themes/default/pages/html/index/register.tpl.php @@ -212,11 +212,12 @@ ><?php unset($a6_width) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='mail';$a7_size='25';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/index/registeruserdata.tpl.php b/themes/default/pages/html/index/registeruserdata.tpl.php @@ -212,11 +212,12 @@ ><?php unset($a6_width) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='code';$a7_size='25';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -244,11 +245,12 @@ if ($a7_readonly) { ><?php unset($a6_width) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='username';$a7_value='';$a7_size='25';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_value,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_value,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/index/show.tpl.php b/themes/default/pages/html/index/show.tpl.php @@ -28,13 +28,13 @@ if ( $a2_tmp_exec ) { ?> -<?php unset($a2_true) ?><?php $a3_var='menuheight';$a3_value='24'; ?><?php +<?php unset($a2_true) ?><?php $a3_var='menuheight';$a3_value='30'; ?><?php if (isset($a3_key)) $$a3_var = $a3_value[$a3_key]; else $$a3_var = $a3_value; ?><?php unset($a3_var,$a3_value) ?><?php } ?><?php if (!$a2_tmp_last_exec) { ?> -<?php $a3_var='menuheight';$a3_value='54'; ?><?php +<?php $a3_var='menuheight';$a3_value='60'; ?><?php if (isset($a3_key)) $$a3_var = $a3_value[$a3_key]; else @@ -62,32 +62,10 @@ unset($a1_tmp_last_exec) ?><?php $a2_true=@$conf['interface']['application_mode' <?php unset($a5_file,$a5_name) ?></frameset> </frameset> <?php } ?><?php if (!$a2_tmp_last_exec) { ?> -<?php $a3_rows='23,3,*'; ?><frameset +<?php $a3_rows='23,*'; ?><frameset <?php echo ' rows="'.$a3_rows.'"' ?> border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($a3_rows) ?><?php $a4_file=$frame_src_title;$a4_name='cms_title'; ?><frame src="<?php echo $a4_file ?>" name="<?php echo empty($a4_name)?'':$a4_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($a4_scrolling)?'no':$a4_scrolling ?>"> -<?php unset($a4_file,$a4_name) ?><?php $a4_file=$frame_src_border; ?><frame src="<?php echo $a4_file ?>" name="<?php echo empty($a4_name)?'':$a4_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($a4_scrolling)?'no':$a4_scrolling ?>"> -<?php unset($a4_file) ?><?php $a4_true=@$conf['interface']['application_mode']; ?><?php - if (gettype($a4_true) === '' && gettype($a4_true) === '1') - $a4_tmp_exec = $$a4_true == true; - else - $a4_tmp_exec = $a4_true == true; - $a4_tmp_last_exec = $a4_tmp_exec; - if ( $a4_tmp_exec ) - { -?> -<?php unset($a4_true) ?><?php $a5_var='menuheight';$a5_value='24'; ?><?php - if (isset($a5_key)) - $$a5_var = $a5_value[$a5_key]; - else - $$a5_var = $a5_value; -?><?php unset($a5_var,$a5_value) ?><?php } ?><?php if (!$a4_tmp_last_exec) { ?> -<?php $a5_var='menuheight';$a5_value='54'; ?><?php - if (isset($a5_key)) - $$a5_var = $a5_value[$a5_key]; - else - $$a5_var = $a5_value; -?><?php unset($a5_var,$a5_value) ?><?php } -unset($a3_tmp_last_exec) ?><?php $a4_columns='25%,*'; ?><frameset +<?php unset($a4_file,$a4_name) ?><?php $a4_columns='25%,*'; ?><frameset <?php echo ' cols="'.$a4_columns.'"' ?> border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($a4_columns) ?><?php $a5_rows=''.$menuheight.',*'; ?><frameset <?php echo ' rows="'.$a5_rows.'"' ?> diff --git a/themes/default/pages/html/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php @@ -413,19 +413,21 @@ <?php unset($a7_not,$a7_present) ?><?php $a8_class='name';$a8_default='';$a8_type='text';$a8_name='login_name';$a8_value='';$a8_size='20';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_value,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php } ?><?php if (!$a7_tmp_last_exec) { ?> +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_value,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php } ?><?php if (!$a7_tmp_last_exec) { ?> <?php $a8_class='text';$a8_default='';$a8_type='hidden';$a8_name='login_name';$a8_value=$force_username;$a8_size='40';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_value,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php $a8_class='text';$a8_value=$force_username;$a8_escape=true;$a8_cut='both'; ?><?php +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_value,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php $a8_class='text';$a8_value=$force_username;$a8_escape=true;$a8_cut='both'; ?><?php $a8_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php @@ -487,7 +489,7 @@ unset($a6_tmp_last_exec) ?></td></tr><?php class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a7_colspan) ?><?php $a8_title=lang('USER_NEW_PASSWORD'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php +><?php unset($a7_colspan) ?><?php $a8_title=lang('USER_NEW_PASSWORD'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php if(isset($a8_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a8_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -568,7 +570,7 @@ unset($a6_tmp_last_exec) ?></td></tr><?php class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a7_colspan) ?><?php $a8_title=lang('OPENID'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php +><?php unset($a7_colspan) ?><?php $a8_title=lang('OPENID'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php if(isset($a8_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a8_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -617,11 +619,12 @@ unset($a6_tmp_last_exec) ?></td></tr><?php ><?php $a8_class='name';$a8_default='';$a8_type='text';$a8_name='openid_url';$a8_size='20';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?></td></tr><?php } ?><?php $a5_value=@count($dbids);$a5_greaterthan='1'; ?><?php +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?></td></tr><?php } ?><?php $a5_value=@count($dbids);$a5_greaterthan='1'; ?><?php $a5_tmp_exec = intval($a5_greaterthan) < intval($a5_value); $a5_tmp_last_exec = $a5_tmp_exec; if ( $a5_tmp_exec ) @@ -647,7 +650,7 @@ if ($a8_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a8_colspan) ?><?php $a9_title=lang('DATABASE'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset></td></tr><?php $column_idx++; ?><td +><?php unset($a8_colspan) ?><?php $a9_title=lang('DATABASE');$a9_icon='database'; ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php if(isset($a9_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a9_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title,$a9_icon) ?></fieldset></td></tr><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> diff --git a/themes/default/pages/html/language/advanced.tpl.php b/themes/default/pages/html/language/advanced.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -240,11 +241,12 @@ if ($a6_readonly) { ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='isocode';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/language/remove.tpl.php b/themes/default/pages/html/language/remove.tpl.php @@ -245,7 +245,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/link/edit.tpl.php b/themes/default/pages/html/link/edit.tpl.php @@ -221,11 +221,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='url';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/link/prop.tpl.php b/themes/default/pages/html/link/prop.tpl.php @@ -203,11 +203,12 @@ ><?php unset($a5_class) ?><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -253,7 +254,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -305,7 +306,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/main/show.tpl.php b/themes/default/pages/html/main/show.tpl.php @@ -28,13 +28,13 @@ if ( $a2_tmp_exec ) { ?> -<?php unset($a2_true) ?><?php $a3_var='menuheight';$a3_value='24'; ?><?php +<?php unset($a2_true) ?><?php $a3_var='menuheight';$a3_value='30'; ?><?php if (isset($a3_key)) $$a3_var = $a3_value[$a3_key]; else $$a3_var = $a3_value; ?><?php unset($a3_var,$a3_value) ?><?php } ?><?php if (!$a2_tmp_last_exec) { ?> -<?php $a3_var='menuheight';$a3_value='54'; ?><?php +<?php $a3_var='menuheight';$a3_value='60'; ?><?php if (isset($a3_key)) $$a3_var = $a3_value[$a3_key]; else diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php @@ -30,7 +30,7 @@ <?php } ?> </head> <body class="menu" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_width='100%';$a2_space='0';$a2_padding='5'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_class='mainmenu';$a2_width='100%';$a2_space='0';$a2_padding='5'; ?><?php $last_row_idx = @$row_idx; $last_column_idx = @$column_idx; $row_idx = 0; @@ -38,8 +38,8 @@ $coloumn_widths = array(); $row_classes = array(); $column_classes = array(); -?><table class="%class%" cellspacing="0" width="100%" cellpadding="5"> -<?php unset($a2_width,$a2_space,$a2_padding) ?><?php $a3_true=! @$conf['interface']['application_mode']; ?><?php +?><table class="mainmenu" cellspacing="0" width="100%" cellpadding="5"> +<?php unset($a2_class,$a2_width,$a2_space,$a2_padding) ?><?php $a3_true=! @$conf['interface']['application_mode']; ?><?php if (gettype($a3_true) === '' && gettype($a3_true) === '1') $a3_tmp_exec = $$a3_true == true; else diff --git a/themes/default/pages/html/model/add.tpl.php b/themes/default/pages/html/model/add.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/model/edit.tpl.php b/themes/default/pages/html/model/edit.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/model/remove.tpl.php b/themes/default/pages/html/model/remove.tpl.php @@ -225,7 +225,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/page/form.tpl.php b/themes/default/pages/html/page/form.tpl.php @@ -351,11 +351,12 @@ if ( $a8_readonly && $checked ) <?php unset($a8_value,$a8_contains) ?><?php $a9_class='text';$a9_default=$value;$a9_type='text';$a9_index=true;$a9_name=$id;$a9_size='40';$a9_maxlength='255';$a9_onchange='onchange';$a9_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a9_readonly=true; if ($a9_readonly && empty($$a9_name)) $$a9_name = '- '.lang('EMPTY').' -'; if(!isset($a9_default)) $a9_default=''; + $tmp_value = Text::encodeHtml(isset($$a9_name)?$$a9_name:$a9_default); ?><?php if (!$a9_readonly || $a9_type=='hidden') { -?><input<?php if ($a9_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a9_name ?><?php if ($a9_readonly) echo '_disabled' ?>" name="<?php echo $a9_name ?><?php if ($a9_readonly) echo '_disabled' ?>" type="<?php echo $a9_type ?>" size="<?php echo $a9_size ?>" maxlength="<?php echo $a9_maxlength ?>" class="<?php echo $a9_class ?>" value="<?php echo isset($$a9_name)?$$a9_name:$a9_default ?>" <?php if (in_array($a9_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a9_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a9_name ?><?php if ($a9_readonly) echo '_disabled' ?>" name="<?php echo $a9_name ?><?php if ($a9_readonly) echo '_disabled' ?>" type="<?php echo $a9_type ?>" size="<?php echo $a9_size ?>" maxlength="<?php echo $a9_maxlength ?>" class="<?php echo $a9_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a9_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a9_readonly) { -?><input type="hidden" id="id_<?php echo $a9_name ?>" name="<?php echo $a9_name ?>" value="<?php echo isset($$a9_name)?$$a9_name:$a9_default ?>" /><?php - } } else { ?><span class="<?php echo $a9_class ?>"><?php echo isset($$a9_name)?$$a9_name:$a9_default ?></span><?php } ?><?php unset($a9_class,$a9_default,$a9_type,$a9_index,$a9_name,$a9_size,$a9_maxlength,$a9_onchange,$a9_readonly) ?><?php } ?><?php $a8_equals='longtext';$a8_value=$type; ?><?php +?><input type="hidden" id="id_<?php echo $a9_name ?>" name="<?php echo $a9_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a9_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a9_class,$a9_default,$a9_type,$a9_index,$a9_name,$a9_size,$a9_maxlength,$a9_onchange,$a9_readonly) ?><?php } ?><?php $a8_equals='longtext';$a8_value=$type; ?><?php $a8_tmp_exec = $a8_equals == $a8_value; $a8_tmp_last_exec = $a8_tmp_exec; if ( $a8_tmp_exec ) @@ -450,7 +451,7 @@ if (count($$a9_list)==1) echo '<input type="hidden" name="'.$a9_name.'" value="' class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a8_colspan) ?><?php $a9_title=lang('options'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset></td></tr><?php } ?><?php } ?><?php $a5_present='release'; ?><?php +><?php unset($a8_colspan) ?><?php $a9_title=lang('options'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php if(isset($a9_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a9_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset></td></tr><?php } ?><?php } ?><?php $a5_present='release'; ?><?php $a5_tmp_exec = isset($$a5_present); $a5_tmp_last_exec = $a5_tmp_exec; if ( $a5_tmp_exec ) diff --git a/themes/default/pages/html/page/prop.tpl.php b/themes/default/pages/html/page/prop.tpl.php @@ -203,11 +203,12 @@ ><?php unset($a5_class) ?><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -237,11 +238,12 @@ if ($a6_readonly) { ><?php unset($a5_class) ?><?php $a6_class='filename';$a6_default='';$a6_type='text';$a6_name='filename';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -287,7 +289,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -487,7 +489,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/page/pub.tpl.php b/themes/default/pages/html/page/pub.tpl.php @@ -185,7 +185,7 @@ <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> -><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/pageelement/diff.tpl.php b/themes/default/pages/html/pageelement/diff.tpl.php @@ -378,7 +378,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="4" -><?php unset($a5_colspan) ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?></fieldset></td></tr><?php $a4_list='diff';$a4_extract=true;$a4_key='list_key';$a4_value='list_value'; ?><?php +><?php unset($a5_colspan) ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?></fieldset></td></tr><?php $a4_list='diff';$a4_extract=true;$a4_key='list_key';$a4_value='list_value'; ?><?php $a4_list_tmp_key = $a4_key; $a4_list_tmp_value = $a4_value; $a4_list_extract = $a4_extract; diff --git a/themes/default/pages/html/pageelement/edit.tpl.php b/themes/default/pages/html/pageelement/edit.tpl.php @@ -229,7 +229,7 @@ if ($a3_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a6_colspan) ?><?php $a7_title=lang('calendar'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php +><?php unset($a6_colspan) ?><?php $a7_title=lang('calendar'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php if(isset($a7_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -632,7 +632,7 @@ if ($a3_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a7_colspan) ?><?php $a8_title=lang('date'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php +><?php unset($a7_colspan) ?><?php $a8_title=lang('date'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php if(isset($a8_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a8_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -1108,7 +1108,7 @@ document.forms[0].<?php echo $a7_field ?>.select(); <?php } ?> class="preview" colspan="2" -><?php unset($a7_class,$a7_colspan) ?><?php $a8_title=lang('page_preview'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?><?php $a9_class='text';$a9_var='preview';$a9_escape=false;$a9_cut='both'; ?><?php +><?php unset($a7_class,$a7_colspan) ?><?php $a8_title=lang('page_preview'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php if(isset($a8_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a8_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?><?php $a9_class='text';$a9_var='preview';$a9_escape=false;$a9_cut='both'; ?><?php $a9_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a9_class ?>" title="<?php echo $a9_title ?>"><?php @@ -1352,7 +1352,7 @@ function table() if ( $a8_tmp_exec ) { ?> -<?php unset($a8_present) ?><?php $a9_title=$languagename; ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?><?php $a10_class='text';$a10_var='languagetext';$a10_escape=true;$a10_cut='both'; ?><?php +<?php unset($a8_present) ?><?php $a9_title=$languagename; ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php if(isset($a9_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a9_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?><?php $a10_class='text';$a10_var='languagetext';$a10_escape=true;$a10_cut='both'; ?><?php $a10_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a10_class ?>" title="<?php echo $a10_title ?>"><?php @@ -1573,7 +1573,7 @@ function table() if ( $a8_tmp_exec ) { ?> -<?php unset($a8_true) ?><?php $a9_title=lang('help'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset><?php $a9_width='100%';$a9_space='0px';$a9_padding='0px'; ?><?php +<?php unset($a8_true) ?><?php $a9_title=lang('help'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php if(isset($a9_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a9_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset><?php $a9_width='100%';$a9_space='0px';$a9_padding='0px'; ?><?php $last_row_idx = @$row_idx; $last_column_idx = @$column_idx; $row_idx = 0; @@ -2344,7 +2344,7 @@ document.forms[0].<?php echo $a7_field ?>.select(); class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a9_colspan) ?><?php $a10_title=lang('editor_show_language'); ?><fieldset><?php if(isset($a10_title)) { ?><legend><?php echo encodeHtml($a10_title) ?></legend><?php } ?><?php unset($a10_title) ?></fieldset></td></tr><?php +><?php unset($a9_colspan) ?><?php $a10_title=lang('editor_show_language'); ?><fieldset><?php if(isset($a10_title)) { ?><legend><?php if(isset($a10_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a10_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a10_title) ?></legend><?php } ?><?php unset($a10_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -2409,7 +2409,7 @@ document.forms[0].<?php echo $a7_field ?>.select(); class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a8_colspan) ?><?php $a9_title=lang('PAGE_PREVIEW'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset></td></tr><?php +><?php unset($a8_colspan) ?><?php $a9_title=lang('PAGE_PREVIEW'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php if(isset($a9_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a9_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -2478,7 +2478,7 @@ if ( $a9_readonly && $checked ) class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a8_colspan) ?><?php $a9_title=lang('options'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset></td></tr><?php } ?><?php } ?><?php $a5_present='release'; ?><?php +><?php unset($a8_colspan) ?><?php $a9_title=lang('options'); ?><fieldset><?php if(isset($a9_title)) { ?><legend><?php if(isset($a9_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a9_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a9_title) ?></legend><?php } ?><?php unset($a9_title) ?></fieldset></td></tr><?php } ?><?php } ?><?php $a5_present='release'; ?><?php $a5_tmp_exec = isset($$a5_present); $a5_tmp_last_exec = $a5_tmp_exec; if ( $a5_tmp_exec ) diff --git a/themes/default/pages/html/pageelement/link.tpl.php b/themes/default/pages/html/pageelement/link.tpl.php @@ -287,7 +287,7 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a7_colspan) ?><?php $a8_title=lang('options'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php } ?><?php } ?><?php $a4_present='release'; ?><?php +><?php unset($a7_colspan) ?><?php $a8_title=lang('options'); ?><fieldset><?php if(isset($a8_title)) { ?><legend><?php if(isset($a8_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a8_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a8_title) ?></legend><?php } ?><?php unset($a8_title) ?></fieldset></td></tr><?php } ?><?php } ?><?php $a4_present='release'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) diff --git a/themes/default/pages/html/pageelement/prop.tpl.php b/themes/default/pages/html/pageelement/prop.tpl.php @@ -301,7 +301,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('additional_info'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -475,7 +475,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a6_colspan) ?><?php $a7_title=lang('DOCUMENT_TREE'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php +><?php unset($a6_colspan) ?><?php $a7_title=lang('DOCUMENT_TREE'); ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php if(isset($a7_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a7_title) ?></legend><?php } ?><?php unset($a7_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -706,7 +706,7 @@ function table() class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/profile/confirmmail.tpl.php b/themes/default/pages/html/profile/confirmmail.tpl.php @@ -217,11 +217,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='code';$a6_size='30';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/profile/edit.tpl.php b/themes/default/pages/html/profile/edit.tpl.php @@ -260,7 +260,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -292,11 +292,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='fullname';$a6_size='40';$a6_maxlength='128';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -328,11 +329,12 @@ if ($a6_readonly) { ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='tel';$a6_size='40';$a6_maxlength='128';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -364,11 +366,12 @@ if ($a6_readonly) { ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='desc';$a6_size='40';$a6_maxlength='128';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/profile/mail.tpl.php b/themes/default/pages/html/profile/mail.tpl.php @@ -198,7 +198,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('user_mail'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('user_mail'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -230,11 +230,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='mail';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/profile/pwchange.tpl.php b/themes/default/pages/html/profile/pwchange.tpl.php @@ -198,7 +198,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('user_act_password'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('user_act_password'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -241,7 +241,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('user_new_password'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('user_new_password'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/profile/settings.tpl.php b/themes/default/pages/html/profile/settings.tpl.php @@ -185,7 +185,7 @@ <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> -><br/><?php $a6_title=lang('settings'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?><?php $a7_default=false;$a7_readonly=false;$a7_name='always_edit'; ?><?php +><br/><?php $a6_title=lang('settings'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?><?php $a7_default=false;$a7_readonly=false;$a7_name='always_edit'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ( isset($$a7_name) ) $checked = $$a7_name; @@ -251,7 +251,7 @@ if ( $a6_readonly && $checked ) <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> -><br/><?php $a6_title=lang('timezone'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?><?php $a7_list='timezone_list';$a7_name='timezone_offset';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=true;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php +><br/><?php $a6_title=lang('timezone'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?><?php $a7_list='timezone_list';$a7_name='timezone_offset';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=true;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php $a7_readonly=false; $a7_tmp_list = $$a7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -318,7 +318,7 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> -><br/><?php $a6_title=lang('language'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?><?php $a7_list='language_list';$a7_name='language';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=true;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php +><br/><?php $a6_title=lang('language'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?><?php $a7_list='language_list';$a7_name='language';$a7_onchange='';$a7_title='';$a7_class='';$a7_addempty=true;$a7_multiple=false;$a7_size='1';$a7_lang=false; ?><?php $a7_readonly=false; $a7_tmp_list = $$a7_list; if ($this->isEditable() && !$this->isEditMode()) diff --git a/themes/default/pages/html/project/add.tpl.php b/themes/default/pages/html/project/add.tpl.php @@ -206,11 +206,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -224,7 +225,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/project/edit.tpl.php b/themes/default/pages/html/project/edit.tpl.php @@ -186,7 +186,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('NAME'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('NAME'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -218,11 +218,12 @@ ><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='30';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -236,7 +237,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('PUBLISH'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('PUBLISH'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -268,11 +269,12 @@ if ($a6_readonly) { ><?php $a6_class='filename';$a6_default='';$a6_type='text';$a6_name='target_dir';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -304,11 +306,12 @@ if ($a6_readonly) { ><?php $a6_class='filename';$a6_default='';$a6_type='text';$a6_name='cmd_after_publish';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=! @$conf['publish']['project']['override_system_command']; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -322,7 +325,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('project_FTP'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('project_FTP'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -354,11 +357,12 @@ if ($a6_readonly) { ><?php $a6_class='filename';$a6_default='';$a6_type='text';$a6_name='ftp_url';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=! @$conf['publish']['ftp']['enable']; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -412,7 +416,7 @@ if ( $a6_readonly && $checked ) class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/project/maintenance.tpl.php b/themes/default/pages/html/project/maintenance.tpl.php @@ -186,7 +186,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/project/remove.tpl.php b/themes/default/pages/html/project/remove.tpl.php @@ -225,7 +225,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/search/content.tpl.php b/themes/default/pages/html/search/content.tpl.php @@ -186,7 +186,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('global_user'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('global_user'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -292,7 +292,7 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('SEARCH_CONTENT'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('SEARCH_CONTENT'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -333,11 +333,12 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='text';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/search/prop.tpl.php b/themes/default/pages/html/search/prop.tpl.php @@ -186,7 +186,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('global_user'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('global_user'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -310,7 +310,7 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('MENU_SEARCH_PROP'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('MENU_SEARCH_PROP'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -405,11 +405,12 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='text';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $a4_class=''; ?><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $a4_class=''; ?><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/status/show.tpl.php b/themes/default/pages/html/status/show.tpl.php @@ -89,11 +89,12 @@ ?><?php unset($a6_action,$a6_subaction,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_class='text';$a7_default='projectid';$a7_type='hidden';$a7_name='idvar';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='project';$a7_align='left'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='project';$a7_align='left'; ?><?php $a7_tmp_image_file = $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT; $a7_size = '16x16'; $a7_tmp_title = basename($a7_tmp_image_file); @@ -206,11 +207,12 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' ?><?php unset($a6_action,$a6_subaction,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_class='text';$a7_default='modelid';$a7_type='hidden';$a7_name='idvar';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='model';$a7_align='left'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='model';$a7_align='left'; ?><?php $a7_tmp_image_file = $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT; $a7_size = '16x16'; $a7_tmp_title = basename($a7_tmp_image_file); @@ -323,11 +325,12 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' ?><?php unset($a6_action,$a6_subaction,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_class='text';$a7_default='languageid';$a7_type='hidden';$a7_name='idvar';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='language';$a7_align='left'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='language';$a7_align='left'; ?><?php $a7_tmp_image_file = $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT; $a7_size = '16x16'; $a7_tmp_title = basename($a7_tmp_image_file); @@ -440,11 +443,12 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' ?><?php unset($a6_action,$a6_subaction,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_class='text';$a7_default='templateid';$a7_type='hidden';$a7_name='idvar';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='template';$a7_align='left'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='template';$a7_align='left'; ?><?php $a7_tmp_image_file = $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT; $a7_size = '16x16'; $a7_tmp_title = basename($a7_tmp_image_file); @@ -557,11 +561,12 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' ?><?php unset($a6_action,$a6_subaction,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_class='text';$a7_default='userid';$a7_type='hidden';$a7_name='idvar';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='user';$a7_align='left'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='user';$a7_align='left'; ?><?php $a7_tmp_image_file = $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT; $a7_size = '16x16'; $a7_tmp_title = basename($a7_tmp_image_file); @@ -674,11 +679,12 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' ?><?php unset($a6_action,$a6_subaction,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_class='text';$a7_default='groupid';$a7_type='hidden';$a7_name='idvar';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='group';$a7_align='left'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_icon='group';$a7_align='left'; ?><?php $a7_tmp_image_file = $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT; $a7_size = '16x16'; $a7_tmp_title = basename($a7_tmp_image_file); diff --git a/themes/default/pages/html/template/add.tpl.php b/themes/default/pages/html/template/add.tpl.php @@ -206,11 +206,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -224,7 +225,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/template/addel.tpl.php b/themes/default/pages/html/template/addel.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -310,7 +311,7 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/template/extension.tpl.php b/themes/default/pages/html/template/extension.tpl.php @@ -310,11 +310,12 @@ if (count($$a6_list)==1) echo '<input type="hidden" name="'.$a6_name.'" value="' ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='extensiontext';$a6_size='10';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/template/name.tpl.php b/themes/default/pages/html/template/name.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -222,7 +223,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/template/remove.tpl.php b/themes/default/pages/html/template/remove.tpl.php @@ -224,7 +224,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/template/srcelement.tpl.php b/themes/default/pages/html/template/srcelement.tpl.php @@ -298,7 +298,7 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="3" -><?php unset($a6_colspan) ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php echo encodeHtml($a7_title) ?></legend><?php } ?></fieldset></td></tr><?php +><?php unset($a6_colspan) ?><fieldset><?php if(isset($a7_title)) { ?><legend><?php if(isset($a7_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a7_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a7_title) ?></legend><?php } ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/title/show.tpl.php b/themes/default/pages/html/title/show.tpl.php @@ -45,8 +45,8 @@ ?> <tr > -<?php $a4_width='30%';$a4_class='title'; ?><?php $column_idx++; ?><td - width="30%" +<?php $a4_width='20%';$a4_class='title'; ?><?php $column_idx++; ?><td + width="20%" class="title" ><?php unset($a4_width,$a4_class) ?><?php $a5_icon='database';$a5_align='left'; ?><?php $a5_tmp_image_file = $image_dir.'icon_'.$a5_icon.IMG_ICON_EXT; @@ -78,17 +78,20 @@ $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a5_title,$a5_class,$a5_var,$a5_escape,$a5_cut) ?></td><?php $a4_width='40%';$a4_style='text-align:center;';$a4_class='title'; ?><?php $column_idx++; ?><td - width="40%" - style="text-align:center;" +?></<?php echo $tmp_tag ?>><?php unset($a5_title,$a5_class,$a5_var,$a5_escape,$a5_cut) ?></td><?php $a4_width='20%';$a4_class='title'; ?><?php $column_idx++; ?><td + width="20%" class="title" -><?php unset($a4_width,$a4_style,$a4_class) ?><?php $a5_present='projectname'; ?><?php +><?php unset($a4_width,$a4_class) ?><?php $a5_present='projectname'; ?><?php $a5_tmp_exec = isset($$a5_present); $a5_tmp_last_exec = $a5_tmp_exec; if ( $a5_tmp_exec ) { ?> -<?php unset($a5_present) ?><?php $a6_title=lang('project');$a6_class='text';$a6_var='projectname';$a6_maxlength='20';$a6_escape=true;$a6_cut='both'; ?><?php +<?php unset($a5_present) ?><?php $a6_icon='project';$a6_align='left'; ?><?php + $a6_tmp_image_file = $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT; + $a6_size = '16x16'; + $a6_tmp_title = basename($a6_tmp_image_file); +?><img alt="<?php echo $a6_tmp_title; if (isset($a6_size)) { echo ' ('; list($a6_tmp_width,$a6_tmp_height)=explode('x',$a6_size);echo $a6_tmp_width.'x'.$a6_tmp_height; echo')';} ?>" src="<?php echo $a6_tmp_image_file ?>" border="0"<?php if(isset($a6_align)) echo ' align="'.$a6_align.'"' ?><?php if (isset($a6_size)) { list($a6_tmp_width,$a6_tmp_height)=explode('x',$a6_size);echo ' width="'.$a6_tmp_width.'" height="'.$a6_tmp_height.'"';} ?>><?php unset($a6_icon,$a6_align) ?><?php $a6_title=lang('project');$a6_class='text';$a6_var='projectname';$a6_maxlength='20';$a6_escape=true;$a6_cut='both'; ?><?php $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php $langF = $a6_escape?'langHtml':'lang'; @@ -97,22 +100,20 @@ $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_title,$a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?><?php } ?><?php $a5_present='modelname'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($a6_title,$a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?><?php } ?></td><?php $a4_width='10%';$a4_class='title'; ?><?php $column_idx++; ?><td + width="10%" + class="title" +><?php unset($a4_width,$a4_class) ?><?php $a5_icon='model';$a5_align='left'; ?><?php + $a5_tmp_image_file = $image_dir.'icon_'.$a5_icon.IMG_ICON_EXT; + $a5_size = '16x16'; + $a5_tmp_title = basename($a5_tmp_image_file); +?><img alt="<?php echo $a5_tmp_title; if (isset($a5_size)) { echo ' ('; list($a5_tmp_width,$a5_tmp_height)=explode('x',$a5_size);echo $a5_tmp_width.'x'.$a5_tmp_height; echo')';} ?>" src="<?php echo $a5_tmp_image_file ?>" border="0"<?php if(isset($a5_align)) echo ' align="'.$a5_align.'"' ?><?php if (isset($a5_size)) { list($a5_tmp_width,$a5_tmp_height)=explode('x',$a5_size);echo ' width="'.$a5_tmp_width.'" height="'.$a5_tmp_height.'"';} ?>><?php unset($a5_icon,$a5_align) ?><?php $a5_present='modelname'; ?><?php $a5_tmp_exec = isset($$a5_present); $a5_tmp_last_exec = $a5_tmp_exec; if ( $a5_tmp_exec ) { ?> -<?php unset($a5_present) ?><?php $a6_class='text';$a6_raw='_(';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a6_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_raw,$a6_escape,$a6_cut) ?><?php $a6_title=lang('model');$a6_class='text';$a6_var='modelname';$a6_maxlength='20';$a6_escape=true;$a6_cut='both'; ?><?php +<?php unset($a5_present) ?><?php $a6_title=lang('model');$a6_class='text';$a6_var='modelname';$a6_maxlength='20';$a6_escape=true;$a6_cut='both'; ?><?php $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php $langF = $a6_escape?'langHtml':'lang'; @@ -121,16 +122,20 @@ $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_title,$a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?><?php $a6_class='text';$a6_raw=',';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a6_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_raw,$a6_escape,$a6_cut) ?><?php $a6_title=lang('language');$a6_class='text';$a6_var='languagename';$a6_maxlength='20';$a6_escape=true;$a6_cut='both'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($a6_title,$a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?><?php } ?></td><?php $a4_width='25%';$a4_class='title'; ?><?php $column_idx++; ?><td + width="25%" + class="title" +><?php unset($a4_width,$a4_class) ?><?php $a5_present='languagename'; ?><?php + $a5_tmp_exec = isset($$a5_present); + $a5_tmp_last_exec = $a5_tmp_exec; + if ( $a5_tmp_exec ) + { +?> +<?php unset($a5_present) ?><?php $a6_icon='language';$a6_align='left'; ?><?php + $a6_tmp_image_file = $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT; + $a6_size = '16x16'; + $a6_tmp_title = basename($a6_tmp_image_file); +?><img alt="<?php echo $a6_tmp_title; if (isset($a6_size)) { echo ' ('; list($a6_tmp_width,$a6_tmp_height)=explode('x',$a6_size);echo $a6_tmp_width.'x'.$a6_tmp_height; echo')';} ?>" src="<?php echo $a6_tmp_image_file ?>" border="0"<?php if(isset($a6_align)) echo ' align="'.$a6_align.'"' ?><?php if (isset($a6_size)) { list($a6_tmp_width,$a6_tmp_height)=explode('x',$a6_size);echo ' width="'.$a6_tmp_width.'" height="'.$a6_tmp_height.'"';} ?>><?php unset($a6_icon,$a6_align) ?><?php $a6_title=lang('language');$a6_class='text';$a6_var='languagename';$a6_maxlength='20';$a6_escape=true;$a6_cut='both'; ?><?php $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php $langF = $a6_escape?'langHtml':'lang'; @@ -139,24 +144,14 @@ $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_title,$a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?><?php $a6_class='text';$a6_raw=')';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a6_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_raw,$a6_escape,$a6_cut) ?><?php } ?></td><?php $a4_width='20%';$a4_style='text-align:right;';$a4_class='title'; ?><?php $column_idx++; ?><td - width="20%" - style="text-align:right;" +?></<?php echo $tmp_tag ?>><?php unset($a6_title,$a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?><?php } ?></td><?php $a4_width='15%';$a4_class='title'; ?><?php $column_idx++; ?><td + width="15%" class="title" -><?php unset($a4_width,$a4_style,$a4_class) ?><?php $a5_title=lang('USER_PROFILE_DESC');$a5_target='cms_main_main';$a5_url=$profile_url;$a5_class=''; ?><?php +><?php unset($a4_width,$a4_class) ?><?php $a5_title=lang('USER_PROFILE_DESC');$a5_target='cms_main_main';$a5_url=$profile_url;$a5_class=''; ?><?php $params = array(); $tmp_url = ''; $tmp_url = $a5_url; -?><a<?php if (isset($a5_name)) echo ' name="'.$a5_name.'"'; else echo ' href="'.$tmp_url.(isset($a5_anchor)?'#'.$a5_anchor:'').'"' ?> class="<?php echo $a5_class ?>" target="<?php echo $a5_target ?>"<?php if (isset($a5_accesskey)) echo ' accesskey="'.$a5_accesskey.'"' ?> title="<?php echo encodeHtml($a5_title) ?>"><?php unset($a5_title,$a5_target,$a5_url,$a5_class) ?><?php $a6_icon='user';$a6_align='right'; ?><?php +?><a<?php if (isset($a5_name)) echo ' name="'.$a5_name.'"'; else echo ' href="'.$tmp_url.(isset($a5_anchor)?'#'.$a5_anchor:'').'"' ?> class="<?php echo $a5_class ?>" target="<?php echo $a5_target ?>"<?php if (isset($a5_accesskey)) echo ' accesskey="'.$a5_accesskey.'"' ?> title="<?php echo encodeHtml($a5_title) ?>"><?php unset($a5_title,$a5_target,$a5_url,$a5_class) ?><?php $a6_icon='user';$a6_align='left'; ?><?php $a6_tmp_image_file = $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT; $a6_size = '16x16'; $a6_tmp_title = basename($a6_tmp_image_file); @@ -170,15 +165,14 @@ $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?></a></td><?php $a4_width='10%';$a4_style='text-align:right;';$a4_class='title'; ?><?php $column_idx++; ?><td +?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_var,$a6_maxlength,$a6_escape,$a6_cut) ?></a></td><?php $a4_width='10%';$a4_class='title'; ?><?php $column_idx++; ?><td width="10%" - style="text-align:right;" class="title" -><?php unset($a4_width,$a4_style,$a4_class) ?><?php $a5_title=lang('USER_LOGOUT_DESC');$a5_target='_top';$a5_url=$logout_url;$a5_class=''; ?><?php +><?php unset($a4_width,$a4_class) ?><?php $a5_title=lang('USER_LOGOUT_DESC');$a5_target='_top';$a5_url=$logout_url;$a5_class=''; ?><?php $params = array(); $tmp_url = ''; $tmp_url = $a5_url; -?><a<?php if (isset($a5_name)) echo ' name="'.$a5_name.'"'; else echo ' href="'.$tmp_url.(isset($a5_anchor)?'#'.$a5_anchor:'').'"' ?> class="<?php echo $a5_class ?>" target="<?php echo $a5_target ?>"<?php if (isset($a5_accesskey)) echo ' accesskey="'.$a5_accesskey.'"' ?> title="<?php echo encodeHtml($a5_title) ?>"><?php unset($a5_title,$a5_target,$a5_url,$a5_class) ?><?php $a6_icon='close';$a6_align='right'; ?><?php +?><a<?php if (isset($a5_name)) echo ' name="'.$a5_name.'"'; else echo ' href="'.$tmp_url.(isset($a5_anchor)?'#'.$a5_anchor:'').'"' ?> class="<?php echo $a5_class ?>" target="<?php echo $a5_target ?>"<?php if (isset($a5_accesskey)) echo ' accesskey="'.$a5_accesskey.'"' ?> title="<?php echo encodeHtml($a5_title) ?>"><?php unset($a5_title,$a5_target,$a5_url,$a5_class) ?><?php $a6_icon='close';$a6_align='left'; ?><?php $a6_tmp_image_file = $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT; $a6_size = '16x16'; $a6_tmp_title = basename($a6_tmp_image_file); diff --git a/themes/default/pages/html/tree/show.tpl.php b/themes/default/pages/html/tree/show.tpl.php @@ -172,7 +172,58 @@ unset($a6_tmp_last_exec) ?></td><?php } ?><?php $a5_class='treevalue';$a5_colspa echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($a7_title,$a7_class,$a7_var,$a7_maxlength,$a7_escape,$a7_cut) ?><?php } -unset($a5_tmp_last_exec) ?></td><?php $a5_var='url'; ?><?php +unset($a5_tmp_last_exec) ?><?php $a6_not='';$a6_present='image'; ?><?php + $a6_tmp_exec = isset($$a6_present); + $a6_tmp_exec = !$a6_tmp_exec; + $a6_tmp_last_exec = $a6_tmp_exec; + if ( $a6_tmp_exec ) + { +?> +<?php unset($a6_not,$a6_present) ?><?php $a7_class='text';$a7_raw='__';$a7_escape=true;$a7_cut='both'; ?><?php + $a7_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php + $langF = $a7_escape?'langHtml':'lang'; + $tmp_text = str_replace('_',' ',$a7_raw); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_raw,$a7_escape,$a7_cut) ?><?php $a7_title='';$a7_target='_self';$a7_class='';$a7_action='tree';$a7_subaction='refresh'; ?><?php + $params = array(); + $tmp_url = ''; + $tmp_url = Html::url($a7_action,$a7_subaction,!empty($a7_id)?$a7_id:$this->getRequestId(),$params); +?><a<?php if (isset($a7_name)) echo ' name="'.$a7_name.'"'; else echo ' href="'.$tmp_url.(isset($a7_anchor)?'#'.$a7_anchor:'').'"' ?> class="<?php echo $a7_class ?>" target="<?php echo $a7_target ?>"<?php if (isset($a7_accesskey)) echo ' accesskey="'.$a7_accesskey.'"' ?> title="<?php echo encodeHtml($a7_title) ?>"><?php unset($a7_title,$a7_target,$a7_class,$a7_action,$a7_subaction) ?><?php $a8_class='text';$a8_key='refresh';$a8_escape=true;$a8_cut='both'; ?><?php + $a8_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php + $langF = $a8_escape?'langHtml':'lang'; + $tmp_text = $langF($a8_key); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_key,$a8_escape,$a8_cut) ?></a><?php $a7_class='text';$a7_raw='__';$a7_escape=true;$a7_cut='both'; ?><?php + $a7_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php + $langF = $a7_escape?'langHtml':'lang'; + $tmp_text = str_replace('_',' ',$a7_raw); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_raw,$a7_escape,$a7_cut) ?><?php $a7_title='';$a7_target='_self';$a7_class='';$a7_action='tree';$a7_subaction='openall'; ?><?php + $params = array(); + $tmp_url = ''; + $tmp_url = Html::url($a7_action,$a7_subaction,!empty($a7_id)?$a7_id:$this->getRequestId(),$params); +?><a<?php if (isset($a7_name)) echo ' name="'.$a7_name.'"'; else echo ' href="'.$tmp_url.(isset($a7_anchor)?'#'.$a7_anchor:'').'"' ?> class="<?php echo $a7_class ?>" target="<?php echo $a7_target ?>"<?php if (isset($a7_accesskey)) echo ' accesskey="'.$a7_accesskey.'"' ?> title="<?php echo encodeHtml($a7_title) ?>"><?php unset($a7_title,$a7_target,$a7_class,$a7_action,$a7_subaction) ?><?php $a8_class='text';$a8_key='all';$a8_escape=true;$a8_cut='both'; ?><?php + $a8_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php + $langF = $a8_escape?'langHtml':'lang'; + $tmp_text = $langF($a8_key); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_key,$a8_escape,$a8_cut) ?></a><?php } ?></td><?php $a5_var='url'; ?><?php if (!isset($a5_value)) unset($$a5_var); ?><?php unset($a5_var) ?><?php $a5_var='image'; ?><?php diff --git a/themes/default/pages/html/treetitle/show.tpl.php b/themes/default/pages/html/treetitle/show.tpl.php @@ -30,7 +30,7 @@ <?php } ?> </head> <body class="menu" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_width='100%';$a2_space='0';$a2_padding='5'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_class='treemenu';$a2_width='100%';$a2_space='0';$a2_padding='5'; ?><?php $last_row_idx = @$row_idx; $last_column_idx = @$column_idx; $row_idx = 0; @@ -38,8 +38,8 @@ $coloumn_widths = array(); $row_classes = array(); $column_classes = array(); -?><table class="%class%" cellspacing="0" width="100%" cellpadding="5"> -<?php unset($a2_width,$a2_space,$a2_padding) ?><?php $a3_true=! @$conf['interface']['application_mode']; ?><?php +?><table class="treemenu" cellspacing="0" width="100%" cellpadding="5"> +<?php unset($a2_class,$a2_width,$a2_space,$a2_padding) ?><?php $a3_true=! @$conf['interface']['application_mode']; ?><?php if (gettype($a3_true) === '' && gettype($a3_true) === '1') $a3_tmp_exec = $$a3_true == true; else diff --git a/themes/default/pages/html/user/add.tpl.php b/themes/default/pages/html/user/add.tpl.php @@ -204,11 +204,12 @@ ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php @@ -224,7 +224,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('NAME'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('NAME'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -256,11 +256,12 @@ ><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='20';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -274,7 +275,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('ADDITIONAL_INFO'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('ADDITIONAL_INFO'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -306,11 +307,12 @@ if ($a6_readonly) { ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='fullname';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $a4_true=@$conf['security']['user']['show_admin_mail']; ?><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $a4_true=@$conf['security']['user']['show_admin_mail']; ?><?php if (gettype($a4_true) === '' && gettype($a4_true) === '1') $a4_tmp_exec = $$a4_true == true; else @@ -351,11 +353,12 @@ if ($a6_readonly) { ><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='mail';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?></td></tr><?php } ?><?php $row_idx++; $column_idx = 0; ?> @@ -387,11 +390,12 @@ if ($a7_readonly) { ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='desc';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -423,11 +427,12 @@ if ($a6_readonly) { ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='tel';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -441,7 +446,7 @@ if ($a6_readonly) { class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -513,11 +518,12 @@ if ( $a6_readonly && $checked ) ><?php $a6_class='text';$a6_default='';$a6_type='text';$a6_name='ldap_dn';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/user/pw.tpl.php b/themes/default/pages/html/user/pw.tpl.php @@ -224,7 +224,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('USER_new_password'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('USER_new_password'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -296,7 +296,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_present='mail'; ?><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_present='mail'; ?><?php $a4_tmp_exec = isset($$a4_present); $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) diff --git a/themes/default/pages/html/user/remove.tpl.php b/themes/default/pages/html/user/remove.tpl.php @@ -187,7 +187,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('NAME'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('NAME'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -239,7 +239,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php +><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/user/rights.tpl.php b/themes/default/pages/html/user/rights.tpl.php @@ -175,7 +175,7 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="14" -><?php unset($a5_colspan) ?><?php $a6_title=$projectname; ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_empty='acls'; ?><?php +><?php unset($a5_colspan) ?><?php $a6_title=$projectname; ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php if(isset($a6_icon)) { ?><image src="<?php echo $image_dir.'icon_'.$a6_icon.IMG_ICON_EXT ?>" align="left" border="0"><?php } ?><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php $a4_empty='acls'; ?><?php if ( !isset($$a4_empty) ) $a4_tmp_exec = empty($a4_empty); elseif ( is_array($$a4_empty) )