commit 4fb8766ce95c58610426128e0c50ef36c04d9d7e
parent 03812142e0cea833b229a0244e6d0f58da1d86a8
Author: dankert <devnull@localhost>
Date: Sun, 11 Nov 2007 00:55:11 +0100
Umwandlung aller Templates.
Diffstat:
100 files changed, 14039 insertions(+), 3062 deletions(-)
diff --git a/themes/default/pages/html/element/name.tpl.php b/themes/default/pages/html/element/name.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/element/properties.tpl.php b/themes/default/pages/html/element/properties.tpl.php
@@ -243,7 +243,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -263,15 +283,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -281,7 +301,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -358,6 +379,7 @@ if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -534,7 +556,27 @@ if ($attr8_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -554,15 +596,15 @@ if ($attr8_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -572,7 +614,8 @@ if ($attr8_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -685,7 +728,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -705,15 +768,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -723,7 +786,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -836,7 +900,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -856,15 +940,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -874,7 +958,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -987,7 +1072,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1007,15 +1112,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1025,7 +1130,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1132,7 +1238,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1152,15 +1278,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1170,7 +1296,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1277,7 +1404,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1297,15 +1444,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1315,7 +1462,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1331,6 +1479,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -1442,7 +1591,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1462,15 +1631,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1480,7 +1649,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1598,7 +1768,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1618,15 +1808,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1636,7 +1826,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1743,7 +1934,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1763,15 +1974,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1781,7 +1992,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1888,7 +2100,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1908,15 +2140,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1926,7 +2158,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -2033,7 +2266,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -2053,15 +2306,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -2071,7 +2324,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -2178,7 +2432,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -2198,15 +2472,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -2216,7 +2490,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -2319,7 +2594,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -2339,15 +2634,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -2357,7 +2652,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -2429,7 +2725,27 @@ if ($attr7_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -2449,15 +2765,15 @@ if ($attr7_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -2467,7 +2783,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"_(";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_(' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"_(";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_(' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -2477,7 +2794,27 @@ if ($attr7_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -2497,15 +2834,15 @@ if ($attr7_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -2515,7 +2852,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_DEFAULT";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_DEFAULT','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_DEFAULT' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_DEFAULT";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_DEFAULT','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_DEFAULT' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -2525,7 +2863,27 @@ if ($attr7_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -2545,15 +2903,15 @@ if ($attr7_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -2563,7 +2921,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:4:")_=_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>')_=_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw=')_=_' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:4:")_=_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>')_=_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw=')_=_' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -2573,7 +2932,27 @@ if ($attr7_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -2593,15 +2972,15 @@ if ($attr7_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -2611,7 +2990,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:12:"defaultValue";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','var'=>'defaultValue','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_var='defaultValue' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:12:"defaultValue";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','var'=>'defaultValue','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_var='defaultValue' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -2621,7 +3001,27 @@ if ($attr7_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -2641,15 +3041,15 @@ if ($attr7_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -2659,7 +3059,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:12:"select_items";}' ?><?php $attr4 = array('present'=>'select_items') ?><?php $attr4_present='select_items' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:12:"select_items";}' ?><?php $attr4 = array('present'=>'select_items') ?><?php $attr4_present='select_items' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -2751,7 +3152,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -2771,15 +3192,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -2789,7 +3210,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -2892,7 +3314,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -2912,15 +3354,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -2930,7 +3372,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -2946,6 +3389,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -3057,7 +3501,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3077,15 +3541,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3095,7 +3559,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -3111,6 +3576,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -3222,7 +3688,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3242,15 +3728,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3260,7 +3746,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -3276,6 +3763,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -3387,7 +3875,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3407,15 +3915,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3425,7 +3933,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -3441,6 +3950,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -3552,7 +4062,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3572,15 +4102,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3590,7 +4120,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/element/remove.tpl.php b/themes/default/pages/html/element/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -341,7 +383,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -361,15 +423,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -379,7 +441,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -420,7 +483,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -440,15 +523,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -458,7 +541,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/element/type.tpl.php b/themes/default/pages/html/element/type.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -236,6 +257,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/file/compress.tpl.php b/themes/default/pages/html/file/compress.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -243,6 +264,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -318,7 +340,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -338,15 +380,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -356,7 +398,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:5:"field";s:5:"value";s:5:"false";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'field','value'=>false,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='field' ?><?php $attr6_value=false ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:5:"field";s:5:"value";s:5:"false";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'field','value'=>false,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='field' ?><?php $attr6_value=false ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
if ( isset($$attr6_name) )
$attr6_tmp_default = $$attr6_name;
elseif ( isset($attr6_default) )
@@ -373,7 +416,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -393,15 +456,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -411,7 +474,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/file/editvalue.tpl.php b/themes/default/pages/html/file/editvalue.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/file/prop.tpl.php b/themes/default/pages/html/file/prop.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -350,7 +392,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -370,15 +432,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -388,7 +450,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -434,7 +497,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -454,15 +537,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -472,7 +555,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/file/remove.tpl.php b/themes/default/pages/html/file/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/file/showprop.tpl.php b/themes/default/pages/html/file/showprop.tpl.php
@@ -165,7 +165,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -185,15 +205,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -203,7 +223,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -224,7 +245,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -244,15 +285,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -262,7 +303,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -293,7 +335,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -313,15 +375,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -331,7 +393,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -352,7 +415,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -372,15 +455,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -390,7 +473,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -421,7 +505,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -441,15 +545,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -459,7 +563,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -480,7 +585,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -500,15 +625,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -518,7 +643,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -549,7 +675,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -569,15 +715,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -587,7 +733,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -608,7 +755,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -628,15 +795,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -646,7 +813,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -677,7 +845,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -697,15 +885,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -715,7 +903,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -732,7 +921,17 @@
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -782,7 +981,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -802,15 +1021,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -820,7 +1039,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:11:"create_user";}' ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:11:"create_user";}' ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
@@ -864,7 +1084,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -884,15 +1124,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -902,7 +1142,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -919,7 +1160,17 @@
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -969,7 +1220,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -989,15 +1260,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1007,7 +1278,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"lastchange_user";}' ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"lastchange_user";}' ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
@@ -1051,7 +1323,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1071,15 +1363,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1089,7 +1381,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1132,7 +1425,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1152,15 +1465,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1170,7 +1483,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1191,7 +1505,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1211,15 +1545,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1229,7 +1563,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1260,7 +1595,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1280,15 +1635,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1298,7 +1653,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1370,7 +1726,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1390,15 +1766,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1408,7 +1784,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"empty";s:5:"pages";}' ?><?php $attr5 = array('empty'=>'pages') ?><?php $attr5_empty='pages' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"empty";s:5:"pages";}' ?><?php $attr5 = array('empty'=>'pages') ?><?php $attr5_empty='pages' ?><?php
if ( isset($attr5_true) )
{
if (gettype($attr5_true) === '' && gettype($attr5_true) === '1')
@@ -1479,7 +1856,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -1499,15 +1896,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -1517,7 +1914,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/file/size.tpl.php b/themes/default/pages/html/file/size.tpl.php
@@ -203,7 +203,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -264,6 +285,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -314,7 +336,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -334,15 +376,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -352,7 +394,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -398,7 +441,27 @@ if ($attr6_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -418,15 +481,15 @@ if ($attr6_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -436,7 +499,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -503,7 +567,27 @@ if ($attr6_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -523,15 +607,15 @@ if ($attr6_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -541,7 +625,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -557,6 +642,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -607,7 +693,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -627,15 +733,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -645,7 +751,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -668,6 +775,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/file/uncompress.tpl.php b/themes/default/pages/html/file/uncompress.tpl.php
@@ -207,7 +207,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -227,15 +247,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -245,7 +265,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:5:"field";s:5:"value";s:5:"false";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'field','value'=>false,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='field' ?><?php $attr6_value=false ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:5:"field";s:5:"value";s:5:"false";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'field','value'=>false,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='field' ?><?php $attr6_value=false ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
if ( isset($$attr6_name) )
$attr6_tmp_default = $$attr6_name;
elseif ( isset($attr6_default) )
@@ -262,7 +283,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -282,15 +323,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -300,7 +341,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/folder/create.tpl.php b/themes/default/pages/html/folder/create.tpl.php
@@ -221,7 +221,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -241,15 +261,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -259,7 +279,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -344,7 +365,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -364,15 +405,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -382,7 +423,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -403,7 +445,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -423,15 +485,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -441,7 +503,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -451,7 +514,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -471,15 +554,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -489,7 +572,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"var:max_size";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>$max_size,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$max_size ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"var:max_size";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>$max_size,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$max_size ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -499,7 +583,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -519,15 +623,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -537,7 +641,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -607,7 +712,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -627,15 +752,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -645,7 +770,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -661,6 +787,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -722,7 +849,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -742,15 +889,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -760,7 +907,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -845,7 +993,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -865,15 +1033,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -883,7 +1051,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/folder/createfile.tpl.php b/themes/default/pages/html/folder/createfile.tpl.php
@@ -203,7 +203,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -283,7 +304,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -303,15 +344,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -321,7 +362,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -331,7 +373,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -351,15 +413,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -369,7 +431,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"var:max_size";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>$max_size,'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=$max_size ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"var:max_size";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>$max_size,'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=$max_size ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -379,7 +442,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -399,15 +482,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -417,7 +500,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -469,7 +553,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -489,15 +593,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -507,7 +611,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -553,7 +658,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -573,15 +698,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -591,7 +716,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/folder/createfolder.tpl.php b/themes/default/pages/html/folder/createfolder.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/folder/createlink.tpl.php b/themes/default/pages/html/folder/createlink.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/folder/createpage.tpl.php b/themes/default/pages/html/folder/createpage.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -236,6 +257,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -286,7 +308,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -306,15 +348,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -324,7 +366,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -370,7 +413,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -390,15 +453,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -408,7 +471,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/folder/edit.tpl.php b/themes/default/pages/html/folder/edit.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:10:"objectlist";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'objectlist','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='objectlist' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:10:"objectlist";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'objectlist','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='objectlist' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php
$attr4_list_tmp_key = $attr4_key;
$attr4_list_tmp_value = $attr4_value;
$attr4_list_extract = $attr4_extract;
@@ -352,7 +394,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -372,15 +434,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -390,7 +452,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -400,7 +463,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -420,15 +503,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -438,7 +521,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:6:"folder";}' ?><?php $attr4 = array('present'=>'folder') ?><?php $attr4_present='folder' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:6:"folder";}' ?><?php $attr4 = array('present'=>'folder') ?><?php $attr4_present='folder' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -530,7 +614,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -550,15 +654,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -568,7 +672,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:":_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:":_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -578,7 +683,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -598,15 +723,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -616,11 +741,13 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:8:{s:4:"list";s:6:"folder";s:4:"name";s:14:"targetobjectid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr7 = array('list'=>'folder','name'=>'targetobjectid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr7_list='folder' ?><?php $attr7_name='targetobjectid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_addempty=false ?><?php $attr7_multiple=false ?><?php $attr7_size='1' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:8:{s:4:"list";s:6:"folder";s:4:"name";s:14:"targetobjectid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr7 = array('list'=>'folder','name'=>'targetobjectid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr7_list='folder' ?><?php $attr7_name='targetobjectid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_addempty=false ?><?php $attr7_multiple=false ?><?php $attr7_size='1' ?><?php
if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_list;
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -828,7 +955,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -848,15 +995,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -866,7 +1013,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:35:"message:FOLDER_SELECT_DELETE_COMMIT";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>lang('FOLDER_SELECT_DELETE_COMMIT'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('FOLDER_SELECT_DELETE_COMMIT') ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:35:"message:FOLDER_SELECT_DELETE_COMMIT";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>lang('FOLDER_SELECT_DELETE_COMMIT'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('FOLDER_SELECT_DELETE_COMMIT') ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -876,7 +1024,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -896,15 +1064,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -914,7 +1082,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/folder/order.tpl.php b/themes/default/pages/html/folder/order.tpl.php
@@ -165,7 +165,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -185,15 +205,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -203,7 +223,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -254,7 +275,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -274,15 +315,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -292,7 +333,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -333,7 +375,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -353,15 +415,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -371,7 +433,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_/_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php $attr5_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_/_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php $attr5_escape=true ?><?php
if ( isset($attr5_prefix)&& isset($attr5_key))
$attr5_key = $attr5_prefix.$attr5_key;
if ( isset($attr5_suffix)&& isset($attr5_key))
@@ -381,7 +444,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -401,15 +484,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -419,7 +502,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:4:{s:5:"title";s:18:"FOLDER_ORDERBYNAME";s:6:"target";s:5:"_self";s:3:"url";s:19:"var:orderbyname_url";s:5:"class";s:0:"";}' ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYNAME','target'=>'_self','url'=>$orderbyname_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYNAME' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbyname_url ?><?php $attr5_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:4:{s:5:"title";s:18:"FOLDER_ORDERBYNAME";s:6:"target";s:5:"_self";s:3:"url";s:19:"var:orderbyname_url";s:5:"class";s:0:"";}' ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYNAME','target'=>'_self','url'=>$orderbyname_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYNAME' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbyname_url ?><?php $attr5_class='' ?><?php
$params = array();
if (!empty($attr5_var1) && isset($attr5_value1))
$params[$attr5_var1]=$attr5_value1;
@@ -449,7 +533,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -469,15 +573,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -487,7 +591,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -528,7 +633,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -548,15 +673,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -566,7 +691,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:6:"object";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:6:"object";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
$attr3_list_tmp_key = $attr3_key;
$attr3_list_tmp_value = $attr3_value;
$attr3_list_extract = $attr3_extract;
@@ -777,7 +903,27 @@ if (isset($attr8_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -797,15 +943,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -815,7 +961,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:2:"3%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:2:"3%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -997,7 +1144,27 @@ if (isset($attr8_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1017,15 +1184,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1035,7 +1202,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:2:"3%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:2:"3%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1217,7 +1385,27 @@ if (isset($attr8_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1237,15 +1425,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1255,7 +1443,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:2:"3%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:2:"3%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1437,7 +1626,27 @@ if (isset($attr8_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1457,15 +1666,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1475,7 +1684,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:3:"40%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'40%','class'=>'fx') ?><?php $attr5_width='40%' ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:3:"40%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'40%','class'=>'fx') ?><?php $attr5_width='40%' ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1508,7 +1718,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -1528,15 +1758,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -1546,7 +1776,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:3:"18%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'18%','class'=>'fx') ?><?php $attr5_width='18%' ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:3:"18%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'18%','class'=>'fx') ?><?php $attr5_width='18%' ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1563,7 +1794,17 @@ if (isset($attr6_elementtype)) {
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
diff --git a/themes/default/pages/html/folder/prop.tpl.php b/themes/default/pages/html/folder/prop.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -350,7 +392,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -370,15 +432,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -388,7 +450,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php
@@ -314,7 +314,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -334,15 +354,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -352,7 +372,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"global_pages";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'global_pages','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='global_pages' ?><?php $attr9_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"global_pages";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'global_pages','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='global_pages' ?><?php $attr9_escape=true ?><?php
if ( isset($attr9_prefix)&& isset($attr9_key))
$attr9_key = $attr9_prefix.$attr9_key;
if ( isset($attr9_suffix)&& isset($attr9_key))
@@ -362,7 +383,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -382,15 +423,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -400,7 +441,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:5:"files";}' ?><?php $attr6 = array('present'=>'files') ?><?php $attr6_present='files' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:5:"files";}' ?><?php $attr6 = array('present'=>'files') ?><?php $attr6_present='files' ?><?php
if ( isset($attr6_true) )
{
if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
@@ -542,7 +584,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -562,15 +624,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -580,7 +642,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"global_files";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'global_files','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='global_files' ?><?php $attr9_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"global_files";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'global_files','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='global_files' ?><?php $attr9_escape=true ?><?php
if ( isset($attr9_prefix)&& isset($attr9_key))
$attr9_key = $attr9_prefix.$attr9_key;
if ( isset($attr9_suffix)&& isset($attr9_key))
@@ -590,7 +653,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -610,15 +693,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -628,7 +711,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -751,7 +835,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -771,15 +875,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -789,7 +893,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:27:"GLOBAL_PUBLISH_WITH_SUBDIRS";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_PUBLISH_WITH_SUBDIRS','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_PUBLISH_WITH_SUBDIRS' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:27:"GLOBAL_PUBLISH_WITH_SUBDIRS";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_PUBLISH_WITH_SUBDIRS','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_PUBLISH_WITH_SUBDIRS' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -799,7 +904,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -819,15 +944,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -837,7 +962,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:5:"clean";}' ?><?php $attr6 = array('present'=>'clean') ?><?php $attr6_present='clean' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:5:"clean";}' ?><?php $attr6 = array('present'=>'clean') ?><?php $attr6_present='clean' ?><?php
if ( isset($attr6_true) )
{
if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
@@ -918,7 +1044,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -938,15 +1084,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -956,7 +1102,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:26:"global_CLEAN_AFTER_PUBLISH";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'global_CLEAN_AFTER_PUBLISH','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='global_CLEAN_AFTER_PUBLISH' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:26:"global_CLEAN_AFTER_PUBLISH";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'global_CLEAN_AFTER_PUBLISH','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='global_CLEAN_AFTER_PUBLISH' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -966,7 +1113,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -986,15 +1153,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1004,7 +1171,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1035,7 +1203,27 @@ if ( $attr7_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -1055,15 +1243,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -1073,7 +1261,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/folder/remove.tpl.php b/themes/default/pages/html/folder/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -400,7 +463,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -420,15 +503,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -438,7 +521,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/folder/select.tpl.php b/themes/default/pages/html/folder/select.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_/_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_/_' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_/_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_/_' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -289,7 +331,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -309,15 +371,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -327,7 +389,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_NAME";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_NAME";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -337,7 +400,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -357,15 +440,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -375,7 +458,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:6:"object";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='object' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:6:"object";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='object' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php
$attr4_list_tmp_key = $attr4_key;
$attr4_list_tmp_value = $attr4_value;
$attr4_list_extract = $attr4_extract;
@@ -557,7 +641,27 @@ if ( $attr8_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -577,15 +681,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -595,7 +699,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -628,7 +733,27 @@ if (isset($attr8_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -648,15 +773,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -666,7 +791,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -676,7 +802,27 @@ if (isset($attr8_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -696,15 +842,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -714,7 +860,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -757,7 +904,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -777,15 +944,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -795,7 +962,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:19:":javascript:mark();";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:mark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:mark();' ?><?php $attr6_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:19:":javascript:mark();";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:mark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:mark();' ?><?php $attr6_class='' ?><?php
$params = array();
if (!empty($attr6_var1) && isset($attr6_value1))
$params[$attr6_var1]=$attr6_value1;
@@ -825,7 +993,27 @@ if (isset($attr6_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -845,15 +1033,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -863,7 +1051,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_|_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_|_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_|_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_|_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -873,7 +1062,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -893,15 +1102,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -911,7 +1120,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:21:":javascript:unmark();";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:unmark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:unmark();' ?><?php $attr6_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:21:":javascript:unmark();";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:unmark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:unmark();' ?><?php $attr6_class='' ?><?php
$params = array();
if (!empty($attr6_var1) && isset($attr6_value1))
$params[$attr6_var1]=$attr6_value1;
@@ -941,7 +1151,27 @@ if (isset($attr6_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -961,15 +1191,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -979,7 +1209,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_|_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_|_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_|_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_|_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -989,7 +1220,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -1009,15 +1260,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -1027,7 +1278,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:19:":javascript:flip();";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:flip();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:flip();' ?><?php $attr6_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:19:":javascript:flip();";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:flip();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:flip();' ?><?php $attr6_class='' ?><?php
$params = array();
if (!empty($attr6_var1) && isset($attr6_value1))
$params[$attr6_var1]=$attr6_value1;
@@ -1057,7 +1309,27 @@ if (isset($attr6_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1077,15 +1349,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1095,7 +1367,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1152,7 +1425,27 @@ if (isset($attr6_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1172,15 +1465,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1190,7 +1483,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:3:"key";s:8:"var:type";s:6:"prefix";s:14:"FOLDER_SELECT_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','key'=>$type,'prefix'=>'FOLDER_SELECT_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$type ?><?php $attr8_prefix='FOLDER_SELECT_' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:3:"key";s:8:"var:type";s:6:"prefix";s:14:"FOLDER_SELECT_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','key'=>$type,'prefix'=>'FOLDER_SELECT_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$type ?><?php $attr8_prefix='FOLDER_SELECT_' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -1200,7 +1494,27 @@ if (isset($attr6_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1220,15 +1534,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1238,7 +1552,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1358,7 +1673,27 @@ if (isset($attr6_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1378,15 +1713,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1396,7 +1731,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/folder/show.tpl.php b/themes/default/pages/html/folder/show.tpl.php
@@ -165,7 +165,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -185,15 +205,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -203,7 +223,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:7:"present";s:6:"up_url";}' ?><?php $attr3 = array('present'=>'up_url') ?><?php $attr3_present='up_url' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:7:"present";s:6:"up_url";}' ?><?php $attr3 = array('present'=>'up_url') ?><?php $attr3_present='up_url' ?><?php
if ( isset($attr3_true) )
{
if (gettype($attr3_true) === '' && gettype($attr3_true) === '1')
@@ -327,7 +348,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -347,15 +388,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -365,7 +406,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -396,7 +438,27 @@ if (isset($attr7_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -416,15 +478,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -434,7 +496,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_/_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php $attr5_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_/_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php $attr5_escape=true ?><?php
if ( isset($attr5_prefix)&& isset($attr5_key))
$attr5_key = $attr5_prefix.$attr5_key;
if ( isset($attr5_suffix)&& isset($attr5_key))
@@ -444,7 +507,27 @@ if (isset($attr7_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -464,15 +547,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -482,7 +565,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_NAME";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_NAME' ?><?php $attr5_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_NAME";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_NAME' ?><?php $attr5_escape=true ?><?php
if ( isset($attr5_prefix)&& isset($attr5_key))
$attr5_key = $attr5_prefix.$attr5_key;
if ( isset($attr5_suffix)&& isset($attr5_key))
@@ -492,7 +576,27 @@ if (isset($attr7_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -512,15 +616,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -530,7 +634,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -551,7 +656,27 @@ if (isset($attr7_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -571,15 +696,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -589,7 +714,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:6:"object";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:6:"object";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
$attr3_list_tmp_key = $attr3_key;
$attr3_list_tmp_value = $attr3_value;
$attr3_list_extract = $attr3_extract;
@@ -671,7 +797,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -691,15 +837,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -709,7 +855,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -719,7 +866,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -739,15 +906,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -757,7 +924,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -774,7 +942,17 @@ if (isset($attr7_elementtype)) {
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -906,7 +1084,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -926,15 +1124,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -944,7 +1142,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/folder/showprop.tpl.php b/themes/default/pages/html/folder/showprop.tpl.php
@@ -165,7 +165,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -185,15 +205,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -203,7 +223,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -224,7 +245,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -244,15 +285,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -262,7 +303,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -293,7 +335,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -313,15 +375,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -331,7 +393,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -352,7 +415,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -372,15 +455,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -390,7 +473,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -421,7 +505,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -441,15 +545,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -459,7 +563,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -480,7 +585,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -500,15 +625,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -518,7 +643,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -549,7 +675,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -569,15 +715,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -587,7 +733,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -604,7 +751,17 @@
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -654,7 +811,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -674,15 +851,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -692,7 +869,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"var:create_user";}' ?><?php $attr5 = array('user'=>$create_user) ?><?php $attr5_user=$create_user ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"var:create_user";}' ?><?php $attr5 = array('user'=>$create_user) ?><?php $attr5_user=$create_user ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
@@ -736,7 +914,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -756,15 +954,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -774,7 +972,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -791,7 +990,17 @@
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -841,7 +1050,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -861,15 +1090,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -879,7 +1108,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:19:"var:lastchange_user";}' ?><?php $attr5 = array('user'=>$lastchange_user) ?><?php $attr5_user=$lastchange_user ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:19:"var:lastchange_user";}' ?><?php $attr5 = array('user'=>$lastchange_user) ?><?php $attr5_user=$lastchange_user ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
diff --git a/themes/default/pages/html/group/adduser.tpl.php b/themes/default/pages/html/group/adduser.tpl.php
@@ -177,6 +177,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/group/edit.tpl.php b/themes/default/pages/html/group/edit.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/group/listing.tpl.php b/themes/default/pages/html/group/listing.tpl.php
@@ -216,7 +216,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -236,15 +256,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -254,7 +274,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/group/remove.tpl.php b/themes/default/pages/html/group/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -400,7 +463,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -420,15 +503,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -438,7 +521,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/group/users.tpl.php b/themes/default/pages/html/group/users.tpl.php
@@ -196,7 +196,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -216,15 +236,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -234,7 +254,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -275,7 +296,27 @@ if (isset($attr6_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -295,15 +336,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -313,7 +354,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/index/applications.tpl.php b/themes/default/pages/html/index/applications.tpl.php
@@ -185,7 +185,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -205,15 +225,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -223,7 +243,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:12:"applications";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'applications','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='applications' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:12:"applications";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'applications','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='applications' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
$attr3_list_tmp_key = $attr3_key;
$attr3_list_tmp_value = $attr3_value;
$attr3_list_extract = $attr3_extract;
@@ -293,7 +314,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -313,15 +354,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -331,7 +372,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/index/changepassword.tpl.php b/themes/default/pages/html/index/changepassword.tpl.php
@@ -203,7 +203,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -283,7 +304,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -303,15 +344,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -321,7 +362,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -363,7 +405,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -383,15 +445,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -401,7 +463,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/index/password.tpl.php b/themes/default/pages/html/index/password.tpl.php
@@ -203,7 +203,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"width";s:3:"50%";}' ?><?php $attr6 = array('width'=>'50%') ?><?php $attr6_width='50%' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"width";s:3:"50%";}' ?><?php $attr6 = array('width'=>'50%') ?><?php $attr6_width='50%' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -287,7 +308,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -307,15 +348,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -325,7 +366,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -341,6 +383,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
diff --git a/themes/default/pages/html/index/passwordcode.tpl.php b/themes/default/pages/html/index/passwordcode.tpl.php
@@ -203,7 +203,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/index/projectmenu.tpl.php b/themes/default/pages/html/index/projectmenu.tpl.php
@@ -265,7 +265,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -285,15 +305,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -303,7 +323,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/index/register.tpl.php b/themes/default/pages/html/index/register.tpl.php
@@ -203,7 +203,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/index/registercode.tpl.php b/themes/default/pages/html/index/registercode.tpl.php
@@ -203,7 +203,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -287,7 +308,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -307,15 +348,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -325,7 +366,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -371,7 +413,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -391,15 +453,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -409,7 +471,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -451,7 +514,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -471,15 +554,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -489,7 +572,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -505,6 +589,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
diff --git a/themes/default/pages/html/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php
@@ -552,7 +552,27 @@ if (isset($attr9_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -572,15 +592,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -590,7 +610,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:4:"true";s:20:"config:login/nologin";}' ?><?php $attr4 = array('true'=>@$conf['login']['nologin']) ?><?php $attr4_true=@$conf['login']['nologin'] ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:4:"true";s:20:"config:login/nologin";}' ?><?php $attr4 = array('true'=>@$conf['login']['nologin']) ?><?php $attr4_true=@$conf['login']['nologin'] ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -682,7 +703,27 @@ if (isset($attr9_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -702,15 +743,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -720,7 +761,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:4:"true";s:24:"config:security/readonly";}' ?><?php $attr4 = array('true'=>@$conf['security']['readonly']) ?><?php $attr4_true=@$conf['security']['readonly'] ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:4:"true";s:24:"config:security/readonly";}' ?><?php $attr4 = array('true'=>@$conf['security']['readonly']) ?><?php $attr4_true=@$conf['security']['readonly'] ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -812,7 +854,27 @@ if (isset($attr9_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -832,15 +894,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -850,7 +912,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:4:"true";s:25:"config:security/nopublish";}' ?><?php $attr4 = array('true'=>@$conf['security']['nopublish']) ?><?php $attr4_true=@$conf['security']['nopublish'] ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:4:"true";s:25:"config:security/nopublish";}' ?><?php $attr4 = array('true'=>@$conf['security']['nopublish']) ?><?php $attr4_true=@$conf['security']['nopublish'] ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -942,7 +1005,27 @@ if (isset($attr9_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -962,15 +1045,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -980,7 +1063,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"false";s:20:"config:login/nologin";}' ?><?php $attr4 = array('false'=>@$conf['login']['nologin']) ?><?php $attr4_false=@$conf['login']['nologin'] ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"false";s:20:"config:login/nologin";}' ?><?php $attr4 = array('false'=>@$conf['login']['nologin']) ?><?php $attr4_false=@$conf['login']['nologin'] ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -1093,7 +1177,27 @@ if (isset($attr9_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1113,15 +1217,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1131,7 +1235,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1222,7 +1327,27 @@ if ($attr8_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1242,15 +1367,15 @@ if ($attr8_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1260,7 +1385,8 @@ if ($attr8_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_value) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_value) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1291,7 +1417,27 @@ if ($attr8_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1311,15 +1457,15 @@ if ($attr8_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1329,7 +1475,8 @@ if ($attr8_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1453,7 +1600,27 @@ if ($attr8_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1473,15 +1640,15 @@ if ($attr8_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1491,7 +1658,8 @@ if ($attr8_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1533,7 +1701,27 @@ if ($attr8_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1553,15 +1741,15 @@ if ($attr8_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1571,7 +1759,8 @@ if ($attr8_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1768,7 +1957,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1788,15 +1997,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1806,7 +2015,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1995,7 +2205,27 @@ if ($attr8_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -2015,15 +2245,15 @@ if ($attr8_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -2033,7 +2263,8 @@ if ($attr8_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -2049,6 +2280,7 @@ if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -2144,7 +2376,27 @@ document.forms[0].screenwidth.value=window.innerWidth;
$attr3_title = lang($attr3_key.'_HELP');
else
$attr3_title = '';
-?><span class="<?php echo $attr3_class ?>" title="<?php echo $attr3_title ?>"><?php
+ if (empty($attr3_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr3_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr3_class ?>" title="<?php echo $attr3_title ?>"><?php
$attr3_title = '';
if (!empty($attr3_array))
{
@@ -2164,15 +2416,15 @@ document.forms[0].screenwidth.value=window.innerWidth;
elseif (!empty($attr3_key))
$tmp_text = lang($attr3_key);
elseif (!empty($attr3_var))
- $tmp_text = isset($$attr3_var)?($attr3_escape?htmlentities($$attr3_var):$$attr3_var):'?'.$attr3_var.'?';
+ $tmp_text = isset($$attr3_var)?$$attr3_var:'?'.$attr3_var.'?';
elseif (!empty($attr3_raw))
$tmp_text = str_replace('_',' ',$attr3_raw);
elseif (!empty($attr3_value))
$tmp_text = $attr3_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr3_escape && empty($attr3_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr3_maxlength) && intval($attr3_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr3_maxlength) );
if (isset($attr3_accesskey))
@@ -2182,7 +2434,8 @@ document.forms[0].screenwidth.value=window.innerWidth;
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr3) ?><?php unset($attr3_class) ?><?php unset($attr3_value) ?><?php unset($attr3_escape) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></a><?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:7:"present";s:14:"force_username";}' ?><?php $attr2 = array('present'=>'force_username') ?><?php $attr2_present='force_username' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr3) ?><?php unset($attr3_class) ?><?php unset($attr3_value) ?><?php unset($attr3_escape) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></a><?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:7:"present";s:14:"force_username";}' ?><?php $attr2 = array('present'=>'force_username') ?><?php $attr2_present='force_username' ?><?php
if ( isset($attr2_true) )
{
if (gettype($attr2_true) === '' && gettype($attr2_true) === '1')
diff --git a/themes/default/pages/html/language/add.tpl.php b/themes/default/pages/html/language/add.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -236,6 +257,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/language/advanced.tpl.php b/themes/default/pages/html/language/advanced.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/language/edit.tpl.php b/themes/default/pages/html/language/edit.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -236,6 +257,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/language/listing.tpl.php b/themes/default/pages/html/language/listing.tpl.php
@@ -216,7 +216,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -236,15 +256,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -254,7 +274,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -275,7 +296,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -295,15 +336,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -313,7 +354,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -415,7 +457,27 @@ if (isset($attr7_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -435,15 +497,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -453,7 +515,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"GLOBAL_is_default";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_is_default','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_is_default' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
@@ -464,7 +527,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -484,15 +567,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -502,7 +585,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -604,7 +688,27 @@ if (isset($attr7_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -624,15 +728,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -642,7 +746,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:15:"GLOBAL_selected";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_selected','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_selected' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
@@ -653,7 +758,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -673,15 +798,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -691,7 +816,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:3:"var";s:10:"select_url";}' ?><?php $attr4 = array('var'=>'select_url') ?><?php $attr4_var='select_url' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:3:"var";s:10:"select_url";}' ?><?php $attr4 = array('var'=>'select_url') ?><?php $attr4_var='select_url' ?><?php
if (!isset($attr4_value))
unset($$attr4_var);
elseif (isset($attr4_key))
diff --git a/themes/default/pages/html/language/remove.tpl.php b/themes/default/pages/html/language/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -400,7 +463,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -420,15 +503,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -438,7 +521,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/link/edit.tpl.php b/themes/default/pages/html/link/edit.tpl.php
@@ -200,7 +200,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -220,15 +240,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -238,7 +258,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -302,7 +323,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -322,15 +363,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -340,7 +381,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -356,6 +398,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/link/prop.tpl.php b/themes/default/pages/html/link/prop.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/link/remove.tpl.php b/themes/default/pages/html/link/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -400,7 +463,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -420,15 +503,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -438,7 +521,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/link/showprop.tpl.php b/themes/default/pages/html/link/showprop.tpl.php
@@ -165,7 +165,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -185,15 +205,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -203,7 +223,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -224,7 +245,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -244,15 +285,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -262,7 +303,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -293,7 +335,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -313,15 +375,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -331,7 +393,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -352,7 +415,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -372,15 +455,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -390,7 +473,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -421,7 +505,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -441,15 +545,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -459,7 +563,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -490,7 +595,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -510,15 +635,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -528,7 +653,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -545,7 +671,17 @@
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -595,7 +731,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -615,15 +771,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -633,7 +789,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:11:"create_user";}' ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:11:"create_user";}' ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
@@ -677,7 +834,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -697,15 +874,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -715,7 +892,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -732,7 +910,17 @@
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -782,7 +970,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -802,15 +1010,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -820,7 +1028,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"lastchange_user";}' ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"lastchange_user";}' ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php
@@ -197,7 +197,27 @@ if (isset($attr6_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -217,15 +237,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -235,7 +255,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_value) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:4:"type";s:7:"filesep";}' ?><?php $attr7 = array('type'=>'filesep') ?><?php $attr7_type='filesep' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_value) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:4:"type";s:7:"filesep";}' ?><?php $attr7 = array('type'=>'filesep') ?><?php $attr7_type='filesep' ?><?php
if ($attr7_type=='filesep')
echo ' <strong>»</strong> ';
else
@@ -250,7 +271,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -270,15 +311,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -288,7 +329,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"style";s:18:":text-align:right;";s:5:"class";s:4:"menu";}' ?><?php $attr5 = array('style'=>'text-align:right;','class'=>'menu') ?><?php $attr5_style='text-align:right;' ?><?php $attr5_class='menu' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"style";s:18:":text-align:right;";s:5:"class";s:4:"menu";}' ?><?php $attr5 = array('style'=>'text-align:right;','class'=>'menu') ?><?php $attr5_style='text-align:right;' ?><?php $attr5_class='menu' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -520,7 +562,27 @@ if ($attr7_readonly) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -540,15 +602,15 @@ if ($attr7_readonly) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -558,7 +620,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_accesskey) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"empty";s:3:"url";}' ?><?php $attr6 = array('empty'=>'url') ?><?php $attr6_empty='url' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_accesskey) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"empty";s:3:"url";}' ?><?php $attr6 = array('empty'=>'url') ?><?php $attr6_empty='url' ?><?php
if ( isset($attr6_true) )
{
if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
@@ -629,7 +692,27 @@ if ($attr7_readonly) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -649,15 +732,15 @@ if ($attr7_readonly) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -667,7 +750,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -677,7 +761,27 @@ if ($attr7_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -697,15 +801,15 @@ if ($attr7_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -715,7 +819,8 @@ if ($attr7_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><!--
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><!--
//<?php
// if ( hasLang('MENU_'.$act.'_KEY' ) )
// {
diff --git a/themes/default/pages/html/model/add.tpl.php b/themes/default/pages/html/model/add.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/model/edit.tpl.php b/themes/default/pages/html/model/edit.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/model/listing.tpl.php b/themes/default/pages/html/model/listing.tpl.php
@@ -216,7 +216,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -236,15 +256,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -254,7 +274,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -356,7 +377,27 @@ if (isset($attr7_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -376,15 +417,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -394,7 +435,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"GLOBAL_is_default";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_is_default','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_is_default' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
@@ -405,7 +447,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -425,15 +487,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -443,7 +505,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -545,7 +608,27 @@ if (isset($attr7_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -565,15 +648,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -583,7 +666,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:15:"GLOBAL_selected";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_selected','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_selected' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
@@ -594,7 +678,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -614,15 +718,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -632,7 +736,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:3:"var";s:10:"select_url";}' ?><?php $attr4 = array('var'=>'select_url') ?><?php $attr4_var='select_url' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:3:"var";s:10:"select_url";}' ?><?php $attr4 = array('var'=>'select_url') ?><?php $attr4_var='select_url' ?><?php
if (!isset($attr4_value))
unset($$attr4_var);
elseif (isset($attr4_key))
diff --git a/themes/default/pages/html/model/remove.tpl.php b/themes/default/pages/html/model/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -400,7 +463,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -420,15 +503,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -438,7 +521,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/object/aclform.tpl.php b/themes/default/pages/html/object/aclform.tpl.php
@@ -1,8 +1,8 @@
-<?php $attr1_debug_info = 'a:2:{s:5:"class";s:4:"main";s:5:"title";s:13:"var:cms_title";}' ?><?php $attr1 = array('class'=>'main','title'=>$cms_title) ?><?php $attr1_class='main' ?><?php $attr1_title=$cms_title ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.lang('CHARSET'))
+<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.lang('CHARSET'))
?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<head>
- <title><?php echo $attr1_title ?></title>
+ <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title>
<meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" />
<meta name="MSSmartTagsPreventParsing" content="true" />
<meta name="robots" content="noindex,nofollow" />
@@ -12,7 +12,12 @@
<link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" />
<?php
}
-?>
+?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta )
+ {
+ ?>
+ <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php
+ }
+?>
<?php if(!empty($root_stylesheet)) { ?>
<link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" />
<?php } ?>
@@ -20,8 +25,8 @@
<link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" />
<?php } ?>
</head>
-<body class="<?php echo $attr1_class ?>">
-<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?php $attr2 = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php
+<body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> >
+<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?php $attr2 = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php
if (empty($attr2_action))
$attr2_action = $actionName;
if (empty($attr2_subaction))
@@ -32,7 +37,7 @@
target="<?php echo $attr2_target ?>"
action="<?php echo Html::url( $attr2_action,$attr2_subaction,$attr2_id ) ?>"
method="<?php echo $attr2_method ?>"
- enctype="<?php echo $attr2_enctype ?>">
+ enctype="<?php echo $attr2_enctype ?>" style="margin:0px;padding:0px;">
<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" />
<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" />
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php
@@ -57,8 +62,17 @@
unset($attr3['columnclasses']);
}
global $image_dir;
- echo '<br/><br/><br/><center>';
- echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">';
+ if (@$conf['interface']['application_mode'] )
+ {
+ echo '<table class="main" cellspacing="0" cellpadding="4" width="100%" style="margin:0px;border:0px; padding:0px;" height_oo="100%">';
+ }
+ else
+ {
+ echo '<br/><br/><br/><center>';
+ echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">';
+ }
+ if (!@$conf['interface']['application_mode'] )
+ {
echo '<tr><td class="menu">';
if ( !empty($attr3_icon) )
echo '<img src="'.$image_dir.'icon_'.$attr3_icon.IMG_ICON_EXT.'" align="left" border="0">';
@@ -72,7 +86,11 @@
}
echo '<span class="title">'.lang($windowTitle).'</span>';
?>
- </td><!--<td class="menu" style="align:right;">
+ </td>
+ <?php
+ }
+ ?>
+<?php ?> <!--<td class="menu" style="align:right;">
<?php if (isset($windowIcons)) foreach( $windowIcons as $icon )
{
?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php
@@ -108,21 +126,24 @@
<?php if (isset($notices) && count($notices)>0 )
{ ?>
<tr>
- <td> </td>
- </tr>
+ <td align="center" style="margin-top:10px; margin-bottom:10px;padding:5px; text-align:center;">
+ <?php foreach( $notices as $notice_idx=>$notice ) { ?>
+ <br><table class="notice" width="100%">
+ <?php if ($notice['name']!='') { ?>
<tr>
- <td align="center" style="margin-top:10px; margin-bottom:10px;padding:5px; text-align:center;"><table style="" border="0" width="100%">
- <?php foreach( $notices as $notice ) { ?>
- <tr style="border-bottom:1px solid grey;">
- <td style="padding:0px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td>
- <td style="padding-top:10px;"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?>
+ <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>
</td>
- <td style="padding:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?>
- <?php if (!empty($notice['log'])) { ?><pre><?php echo implode("\n",$notice['log']) ?></pre><?php } ?>
+ </tr>
+<?php } ?>
+ <tr class="notice_<?php echo $notice['status'] ?>">
+ <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td>
+ <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?>
+ <?php if (!empty($notice['log'])) { ?><pre><?php echo nl2br(htmlentities(implode("\nasdf",$notice['log']))) ?></pre><?php } ?>
</td>
</tr>
+ </table>
<?php } ?>
- </table></td>
+ </td>
</tr>
<tr>
<td colspan="2"><fieldset></fieldset></td>
@@ -161,7 +182,25 @@
global $cell_column_nr;
$cell_column_nr=0;
$column_class_idx = 999;
-?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:4:"10px";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'10px','class'=>'fx') ?><?php $attr5_width='10px' ?><?php $attr5_class='fx' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:3:"all";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'all','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='all' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ if ( isset($$attr6_name) )
+ $attr6_tmp_default = $$attr6_name;
+ elseif ( isset($attr6_default) )
+ $attr6_tmp_default = $attr6_default;
+ else
+ $attr6_tmp_default = '';
+ ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -182,7 +221,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -202,15 +261,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -220,25 +279,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
- $column_class_idx++;
- if ($column_class_idx > count($column_classes))
- $column_class_idx=1;
- $column_class=$column_classes[$column_class_idx-1];
- if (empty($attr5_class))
- $attr5['class']=$column_class;
- global $cell_column_nr;
- $cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
- $attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:3:"all";s:7:"default";s:4:"true";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'all','default'=>true,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='all' ?><?php $attr6_default=true ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
- if ( isset($$attr6_name) )
- $attr6_tmp_default = $$attr6_name;
- elseif ( isset($attr6_default) )
- $attr6_tmp_default = $attr6_default;
- else
- $attr6_tmp_default = '';
- ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -259,7 +301,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -279,15 +341,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -297,7 +359,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -307,7 +370,25 @@
global $cell_column_nr;
$cell_column_nr=0;
$column_class_idx = 999;
-?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:4:"10px";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'10px','class'=>'fx') ?><?php $attr5_width='10px' ?><?php $attr5_class='fx' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:4:"user";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ if ( isset($$attr6_name) )
+ $attr6_tmp_default = $$attr6_name;
+ elseif ( isset($attr6_default) )
+ $attr6_tmp_default = $attr6_default;
+ else
+ $attr6_tmp_default = '';
+ ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -328,7 +409,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -348,15 +449,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -366,7 +467,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -377,29 +479,12 @@
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
$attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:4:"user";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
- if ( isset($$attr6_name) )
- $attr6_tmp_default = $$attr6_name;
- elseif ( isset($attr6_default) )
- $attr6_tmp_default = $attr6_default;
- else
- $attr6_tmp_default = '';
- ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
- $column_class_idx++;
- if ($column_class_idx > count($column_classes))
- $column_class_idx=1;
- $column_class=$column_classes[$column_class_idx-1];
- if (empty($attr5_class))
- $attr5['class']=$column_class;
- global $cell_column_nr;
- $cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
- $attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:8:{s:4:"list";s:5:"users";s:4:"name";s:6:"userid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr6 = array('list'=>'users','name'=>'userid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr6_list='users' ?><?php $attr6_name='userid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:8:{s:4:"list";s:5:"users";s:4:"name";s:6:"userid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:4:"true";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr6 = array('list'=>'users','name'=>'userid','onchange'=>'','title'=>'','class'=>'','addempty'=>true,'multiple'=>false,'size'=>'1') ?><?php $attr6_list='users' ?><?php $attr6_name='userid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=true ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php
if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_list;
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -438,6 +523,10 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$exec = in_array($attr4_value,explode(',',$attr4_contains));
elseif( isset($attr4_equals)&& isset($attr4_value) )
$exec = $attr4_equals == $attr4_value;
+ elseif( isset($attr4_lessthan)&& isset($attr4_value) )
+ $exec = intval($attr4_lessthan) > intval($attr4_value);
+ elseif( isset($attr4_greaterthan)&& isset($attr4_value) )
+ $exec = intval($attr4_greaterthan) < intval($attr4_value);
elseif ( isset($attr4_empty) )
{
if ( !isset($$attr4_empty) )
@@ -486,7 +575,25 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
global $cell_column_nr;
$cell_column_nr=0;
$column_class_idx = 999;
-?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:4:"10px";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'10px','class'=>'fx') ?><?php $attr6_width='10px' ?><?php $attr6_class='fx' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr6_class))
+ $attr6['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) )
+ $attr6['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:5:"group";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr7 = array('readonly'=>false,'name'=>'type','value'=>'group','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr7_readonly=false ?><?php $attr7_name='type' ?><?php $attr7_value='group' ?><?php $attr7_default=false ?><?php $attr7_prefix='' ?><?php $attr7_suffix='' ?><?php $attr7_class='' ?><?php $attr7_onchange='' ?><?php
+ if ( isset($$attr7_name) )
+ $attr7_tmp_default = $$attr7_name;
+ elseif ( isset($attr7_default) )
+ $attr7_tmp_default = $attr7_default;
+ else
+ $attr7_tmp_default = '';
+ ?><input type="radio" id="id_<?php echo $attr7_name.'_'.$attr7_value ?>" name="<?php echo $attr7_prefix.$attr7_name ?>"<?php if ( $attr7_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr7_value ?>" <?php if($attr7_value==$attr7_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr7_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr7) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php unset($attr7_value) ?><?php unset($attr7_default) ?><?php unset($attr7_prefix) ?><?php unset($attr7_suffix) ?><?php unset($attr7_class) ?><?php unset($attr7_onchange) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -507,7 +614,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -527,15 +654,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -545,7 +672,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -556,29 +684,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) )
$attr6['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:5:"group";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr7 = array('readonly'=>false,'name'=>'type','value'=>'group','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr7_readonly=false ?><?php $attr7_name='type' ?><?php $attr7_value='group' ?><?php $attr7_default=false ?><?php $attr7_prefix='' ?><?php $attr7_suffix='' ?><?php $attr7_class='' ?><?php $attr7_onchange='' ?><?php
- if ( isset($$attr7_name) )
- $attr7_tmp_default = $$attr7_name;
- elseif ( isset($attr7_default) )
- $attr7_tmp_default = $attr7_default;
- else
- $attr7_tmp_default = '';
- ?><input type="radio" id="id_<?php echo $attr7_name.'_'.$attr7_value ?>" name="<?php echo $attr7_prefix.$attr7_name ?>"<?php if ( $attr7_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr7_value ?>" <?php if($attr7_value==$attr7_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr7_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr7) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php unset($attr7_value) ?><?php unset($attr7_default) ?><?php unset($attr7_prefix) ?><?php unset($attr7_suffix) ?><?php unset($attr7_class) ?><?php unset($attr7_onchange) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
- $column_class_idx++;
- if ($column_class_idx > count($column_classes))
- $column_class_idx=1;
- $column_class=$column_classes[$column_class_idx-1];
- if (empty($attr6_class))
- $attr6['class']=$column_class;
- global $cell_column_nr;
- $cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) )
- $attr6['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:8:{s:4:"list";s:6:"groups";s:4:"name";s:7:"groupid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr7 = array('list'=>'groups','name'=>'groupid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr7_list='groups' ?><?php $attr7_name='groupid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_addempty=false ?><?php $attr7_multiple=false ?><?php $attr7_size='1' ?><?php
+?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:8:{s:4:"list";s:6:"groups";s:4:"name";s:7:"groupid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:4:"true";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr7 = array('list'=>'groups','name'=>'groupid','onchange'=>'','title'=>'','class'=>'','addempty'=>true,'multiple'=>false,'size'=>'1') ?><?php $attr7_list='groups' ?><?php $attr7_name='groupid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_addempty=true ?><?php $attr7_multiple=false ?><?php $attr7_size='1' ?><?php
if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_list;
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -629,7 +740,87 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
global $cell_column_nr;
$cell_column_nr=0;
$column_class_idx = 999;
-?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"width";s:4:"10px";}' ?><?php $attr5 = array('width'=>'10px') ?><?php $attr5_width='10px' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
+ if ( isset($attr6_prefix)&& isset($attr6_key))
+ $attr6_key = $attr6_prefix.$attr6_key;
+ if ( isset($attr6_suffix)&& isset($attr6_key))
+ $attr6_key = $attr6_key.$attr6_suffix;
+ if(empty($attr6_title))
+ if (!empty($attr6_key))
+ $attr6_title = lang($attr6_key.'_HELP');
+ else
+ $attr6_title = '';
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ $attr6_title = '';
+ if (!empty($attr6_array))
+ {
+ $tmpArray = $$attr6_array;
+ if (!empty($attr6_var))
+ $tmp_text = $tmpArray[$attr6_var];
+ else
+ $tmp_text = lang($tmpArray[$attr6_text]);
+ }
+ elseif (!empty($attr6_text))
+ if ( isset($$attr6_text))
+ $tmp_text = lang($$attr6_text);
+ else
+ $tmp_text = lang($attr6_text);
+ elseif (!empty($attr6_textvar))
+ $tmp_text = lang($$attr6_textvar);
+ elseif (!empty($attr6_key))
+ $tmp_text = lang($attr6_key);
+ elseif (!empty($attr6_var))
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ elseif (!empty($attr6_raw))
+ $tmp_text = str_replace('_',' ',$attr6_raw);
+ elseif (!empty($attr6_value))
+ $tmp_text = $attr6_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
+ if (isset($attr6_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
+ }
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -650,7 +841,27 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -670,15 +881,15 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -688,66 +899,8 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
- $column_class_idx++;
- if ($column_class_idx > count($column_classes))
- $column_class_idx=1;
- $column_class=$column_classes[$column_class_idx-1];
- if (empty($attr5_class))
- $attr5['class']=$column_class;
- global $cell_column_nr;
- $cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
- $attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
- if ( isset($attr6_prefix)&& isset($attr6_key))
- $attr6_key = $attr6_prefix.$attr6_key;
- if ( isset($attr6_suffix)&& isset($attr6_key))
- $attr6_key = $attr6_key.$attr6_suffix;
- if(empty($attr6_title))
- if (!empty($attr6_key))
- $attr6_title = lang($attr6_key.'_HELP');
- else
- $attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
- $attr6_title = '';
- if (!empty($attr6_array))
- {
- $tmpArray = $$attr6_array;
- if (!empty($attr6_var))
- $tmp_text = $tmpArray[$attr6_var];
- else
- $tmp_text = lang($tmpArray[$attr6_text]);
- }
- elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
- else
- $tmp_text = lang($attr6_text);
- elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
- elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
- elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
- elseif (!empty($attr6_raw))
- $tmp_text = str_replace('_',' ',$attr6_raw);
- elseif (!empty($attr6_value))
- $tmp_text = $attr6_value;
- else
- {
- $tmp_text = ' ';
- }
- if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
- if (isset($attr6_accesskey))
- {
- $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
- if ( $pos !== false )
- $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
- }
- echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -763,6 +916,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -807,6 +961,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr4_list_tmp_key = $attr4_key;
$attr4_list_tmp_value = $attr4_value;
$attr4_list_extract = $attr4_extract;
+ unset($attr4_key);
+ unset($attr4_value);
if ( !isset($$attr4_list) || !is_array($$attr4_list) )
$$attr4_list = array();
foreach( $$attr4_list as $$attr4_list_tmp_key => $$attr4_list_tmp_value )
@@ -830,7 +986,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
global $cell_column_nr;
$cell_column_nr=0;
$column_class_idx = 999;
-?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
+?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"width";s:4:"10px";}' ?><?php $attr6 = array('width'=>'10px') ?><?php $attr6_width='10px' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -841,125 +997,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) )
$attr6['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:3:"for";s:5:"var:t";}' ?><?php $attr7 = array('for'=>$t) ?><?php $attr7_for=$t ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:3:"key";s:5:"var:t";s:6:"prefix";s:4:"acl_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','key'=>$t,'prefix'=>'acl_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$t ?><?php $attr8_prefix='acl_' ?><?php $attr8_escape=true ?><?php
- if ( isset($attr8_prefix)&& isset($attr8_key))
- $attr8_key = $attr8_prefix.$attr8_key;
- if ( isset($attr8_suffix)&& isset($attr8_key))
- $attr8_key = $attr8_key.$attr8_suffix;
- if(empty($attr8_title))
- if (!empty($attr8_key))
- $attr8_title = lang($attr8_key.'_HELP');
- else
- $attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
- $attr8_title = '';
- if (!empty($attr8_array))
- {
- $tmpArray = $$attr8_array;
- if (!empty($attr8_var))
- $tmp_text = $tmpArray[$attr8_var];
- else
- $tmp_text = lang($tmpArray[$attr8_text]);
- }
- elseif (!empty($attr8_text))
- if ( isset($$attr8_text))
- $tmp_text = lang($$attr8_text);
- else
- $tmp_text = lang($attr8_text);
- elseif (!empty($attr8_textvar))
- $tmp_text = lang($$attr8_textvar);
- elseif (!empty($attr8_key))
- $tmp_text = lang($attr8_key);
- elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
- elseif (!empty($attr8_raw))
- $tmp_text = str_replace('_',' ',$attr8_raw);
- elseif (!empty($attr8_value))
- $tmp_text = $attr8_value;
- else
- {
- $tmp_text = ' ';
- }
- if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
- if (isset($attr8_accesskey))
- {
- $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
- if ( $pos !== false )
- $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
- }
- echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"width";s:4:"20px";}' ?><?php $attr6 = array('width'=>'20px') ?><?php $attr6_width='20px' ?><?php
- $column_class_idx++;
- if ($column_class_idx > count($column_classes))
- $column_class_idx=1;
- $column_class=$column_classes[$column_class_idx-1];
- if (empty($attr6_class))
- $attr6['class']=$column_class;
- global $cell_column_nr;
- $cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) )
- $attr6['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php $attr7_debug_info = 'a:1:{s:3:"for";s:5:"var:t";}' ?><?php $attr7 = array('for'=>$t) ?><?php $attr7_for=$t ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8_debug_info = 'a:5:{s:5:"class";s:4:"text";s:3:"key";s:5:"var:t";s:6:"suffix";s:7:"_abbrev";s:6:"prefix";s:4:"acl_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','key'=>$t,'suffix'=>'_abbrev','prefix'=>'acl_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$t ?><?php $attr8_suffix='_abbrev' ?><?php $attr8_prefix='acl_' ?><?php $attr8_escape=true ?><?php
- if ( isset($attr8_prefix)&& isset($attr8_key))
- $attr8_key = $attr8_prefix.$attr8_key;
- if ( isset($attr8_suffix)&& isset($attr8_key))
- $attr8_key = $attr8_key.$attr8_suffix;
- if(empty($attr8_title))
- if (!empty($attr8_key))
- $attr8_title = lang($attr8_key.'_HELP');
- else
- $attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
- $attr8_title = '';
- if (!empty($attr8_array))
- {
- $tmpArray = $$attr8_array;
- if (!empty($attr8_var))
- $tmp_text = $tmpArray[$attr8_var];
- else
- $tmp_text = lang($tmpArray[$attr8_text]);
- }
- elseif (!empty($attr8_text))
- if ( isset($$attr8_text))
- $tmp_text = lang($$attr8_text);
- else
- $tmp_text = lang($attr8_text);
- elseif (!empty($attr8_textvar))
- $tmp_text = lang($$attr8_textvar);
- elseif (!empty($attr8_key))
- $tmp_text = lang($attr8_key);
- elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
- elseif (!empty($attr8_raw))
- $tmp_text = str_replace('_',' ',$attr8_raw);
- elseif (!empty($attr8_value))
- $tmp_text = $attr8_value;
- else
- {
- $tmp_text = ' ';
- }
- if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
- if (isset($attr8_accesskey))
- {
- $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
- if ( $pos !== false )
- $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
- }
- echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_suffix) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
- $column_class_idx++;
- if ($column_class_idx > count($column_classes))
- $column_class_idx=1;
- $column_class=$column_classes[$column_class_idx-1];
- if (empty($attr6_class))
- $attr6['class']=$column_class;
- global $cell_column_nr;
- $cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) )
- $attr6['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:6:"equals";s:4:"read";s:5:"value";s:5:"var:t";}' ?><?php $attr7 = array('equals'=>'read','value'=>$t) ?><?php $attr7_equals='read' ?><?php $attr7_value=$t ?><?php
+?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php $attr7_debug_info = 'a:2:{s:6:"equals";s:4:"read";s:5:"value";s:5:"var:t";}' ?><?php $attr7 = array('equals'=>'read','value'=>$t) ?><?php $attr7_equals='read' ?><?php $attr7_value=$t ?><?php
if ( isset($attr7_true) )
{
if (gettype($attr7_true) === '' && gettype($attr7_true) === '1')
@@ -978,6 +1016,10 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$exec = in_array($attr7_value,explode(',',$attr7_contains));
elseif( isset($attr7_equals)&& isset($attr7_value) )
$exec = $attr7_equals == $attr7_value;
+ elseif( isset($attr7_lessthan)&& isset($attr7_value) )
+ $exec = intval($attr7_lessthan) > intval($attr7_value);
+ elseif( isset($attr7_greaterthan)&& isset($attr7_value) )
+ $exec = intval($attr7_greaterthan) < intval($attr7_value);
elseif ( isset($attr7_empty) )
{
if ( !isset($$attr7_empty) )
@@ -1051,7 +1093,87 @@ if ( $attr8_readonly && $checked )
{
?><input type="hidden" name="<?php echo $attr8_name ?>" value="1" /><?php
}
-?><?php unset($attr8_name); unset($attr8_readonly); unset($attr8_default); ?><?php unset($attr8) ?><?php unset($attr8_default) ?><?php unset($attr8_readonly) ?><?php unset($attr8_name) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+?><?php unset($attr8_name); unset($attr8_readonly); unset($attr8_default); ?><?php unset($attr8) ?><?php unset($attr8_default) ?><?php unset($attr8_readonly) ?><?php unset($attr8_name) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"colspan";s:1:"2";}' ?><?php $attr6 = array('colspan'=>'2') ?><?php $attr6_colspan='2' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr6_class))
+ $attr6['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) )
+ $attr6['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_colspan) ?><?php $attr7_debug_info = 'a:1:{s:3:"for";s:5:"var:t";}' ?><?php $attr7 = array('for'=>$t) ?><?php $attr7_for=$t ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:3:"key";s:5:"var:t";s:6:"prefix";s:4:"acl_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','key'=>$t,'prefix'=>'acl_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$t ?><?php $attr8_prefix='acl_' ?><?php $attr8_escape=true ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
+ {
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
+ }
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
+ }
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/object/rights.tpl.php b/themes/default/pages/html/object/rights.tpl.php
@@ -153,6 +153,10 @@
$exec = in_array($attr3_value,explode(',',$attr3_contains));
elseif( isset($attr3_equals)&& isset($attr3_value) )
$exec = $attr3_equals == $attr3_value;
+ elseif( isset($attr3_lessthan)&& isset($attr3_value) )
+ $exec = intval($attr3_lessthan) > intval($attr3_value);
+ elseif( isset($attr3_greaterthan)&& isset($attr3_value) )
+ $exec = intval($attr3_greaterthan) < intval($attr3_value);
elseif ( isset($attr3_empty) )
{
if ( !isset($$attr3_empty) )
@@ -222,7 +226,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -242,15 +266,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -260,7 +284,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:2:{s:3:"not";s:4:"true";s:5:"empty";s:4:"acls";}' ?><?php $attr3 = array('not'=>true,'empty'=>'acls') ?><?php $attr3_not=true ?><?php $attr3_empty='acls' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:2:{s:3:"not";s:4:"true";s:5:"empty";s:4:"acls";}' ?><?php $attr3 = array('not'=>true,'empty'=>'acls') ?><?php $attr3_not=true ?><?php $attr3_empty='acls' ?><?php
if ( isset($attr3_true) )
{
if (gettype($attr3_true) === '' && gettype($attr3_true) === '1')
@@ -279,6 +304,10 @@
$exec = in_array($attr3_value,explode(',',$attr3_contains));
elseif( isset($attr3_equals)&& isset($attr3_value) )
$exec = $attr3_equals == $attr3_value;
+ elseif( isset($attr3_lessthan)&& isset($attr3_value) )
+ $exec = intval($attr3_lessthan) > intval($attr3_value);
+ elseif( isset($attr3_greaterthan)&& isset($attr3_value) )
+ $exec = intval($attr3_greaterthan) < intval($attr3_value);
elseif ( isset($attr3_empty) )
{
if ( !isset($$attr3_empty) )
@@ -348,7 +377,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -368,15 +417,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -386,7 +435,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -407,7 +457,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -427,15 +497,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -445,7 +515,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:1:"t";}' ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:1:"t";}' ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php
$attr5_list_tmp_key = $attr5_key;
$attr5_list_tmp_value = $attr5_value;
$attr5_list_extract = $attr5_extract;
@@ -485,7 +556,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -505,15 +596,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -523,7 +614,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_suffix) ?><?php unset($attr7_prefix) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_suffix) ?><?php unset($attr7_prefix) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -544,7 +636,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -564,15 +676,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -582,7 +694,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:4:"acls";s:7:"extract";s:4:"true";s:3:"key";s:5:"aclid";s:5:"value";s:3:"acl";}' ?><?php $attr3 = array('list'=>'acls','extract'=>true,'key'=>'aclid','value'=>'acl') ?><?php $attr3_list='acls' ?><?php $attr3_extract=true ?><?php $attr3_key='aclid' ?><?php $attr3_value='acl' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:4:"acls";s:7:"extract";s:4:"true";s:3:"key";s:5:"aclid";s:5:"value";s:3:"acl";}' ?><?php $attr3 = array('list'=>'acls','extract'=>true,'key'=>'aclid','value'=>'acl') ?><?php $attr3_list='acls' ?><?php $attr3_extract=true ?><?php $attr3_key='aclid' ?><?php $attr3_value='acl' ?><?php
$attr3_list_tmp_key = $attr3_key;
$attr3_list_tmp_value = $attr3_value;
$attr3_list_extract = $attr3_extract;
@@ -641,6 +754,10 @@
$exec = in_array($attr6_value,explode(',',$attr6_contains));
elseif( isset($attr6_equals)&& isset($attr6_value) )
$exec = $attr6_equals == $attr6_value;
+ elseif( isset($attr6_lessthan)&& isset($attr6_value) )
+ $exec = intval($attr6_lessthan) > intval($attr6_value);
+ elseif( isset($attr6_greaterthan)&& isset($attr6_value) )
+ $exec = intval($attr6_greaterthan) < intval($attr6_value);
elseif ( isset($attr6_empty) )
{
if ( !isset($$attr6_empty) )
@@ -701,7 +818,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -721,15 +858,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -739,7 +876,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:9:"groupname";}' ?><?php $attr6 = array('present'=>'groupname') ?><?php $attr6_present='groupname' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:9:"groupname";}' ?><?php $attr6 = array('present'=>'groupname') ?><?php $attr6_present='groupname' ?><?php
if ( isset($attr6_true) )
{
if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
@@ -758,6 +896,10 @@ if (isset($attr7_elementtype)) {
$exec = in_array($attr6_value,explode(',',$attr6_contains));
elseif( isset($attr6_equals)&& isset($attr6_value) )
$exec = $attr6_equals == $attr6_value;
+ elseif( isset($attr6_lessthan)&& isset($attr6_value) )
+ $exec = intval($attr6_lessthan) > intval($attr6_value);
+ elseif( isset($attr6_greaterthan)&& isset($attr6_value) )
+ $exec = intval($attr6_greaterthan) < intval($attr6_value);
elseif ( isset($attr6_empty) )
{
if ( !isset($$attr6_empty) )
@@ -818,7 +960,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -838,15 +1000,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -856,7 +1018,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:3:"not";s:4:"true";s:7:"present";s:8:"username";}' ?><?php $attr6 = array('not'=>true,'present'=>'username') ?><?php $attr6_not=true ?><?php $attr6_present='username' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:3:"not";s:4:"true";s:7:"present";s:8:"username";}' ?><?php $attr6 = array('not'=>true,'present'=>'username') ?><?php $attr6_not=true ?><?php $attr6_present='username' ?><?php
if ( isset($attr6_true) )
{
if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
@@ -875,6 +1038,10 @@ if (isset($attr7_elementtype)) {
$exec = in_array($attr6_value,explode(',',$attr6_contains));
elseif( isset($attr6_equals)&& isset($attr6_value) )
$exec = $attr6_equals == $attr6_value;
+ elseif( isset($attr6_lessthan)&& isset($attr6_value) )
+ $exec = intval($attr6_lessthan) > intval($attr6_value);
+ elseif( isset($attr6_greaterthan)&& isset($attr6_value) )
+ $exec = intval($attr6_greaterthan) < intval($attr6_value);
elseif ( isset($attr6_empty) )
{
if ( !isset($$attr6_empty) )
@@ -932,6 +1099,10 @@ if (isset($attr7_elementtype)) {
$exec = in_array($attr7_value,explode(',',$attr7_contains));
elseif( isset($attr7_equals)&& isset($attr7_value) )
$exec = $attr7_equals == $attr7_value;
+ elseif( isset($attr7_lessthan)&& isset($attr7_value) )
+ $exec = intval($attr7_lessthan) > intval($attr7_value);
+ elseif( isset($attr7_greaterthan)&& isset($attr7_value) )
+ $exec = intval($attr7_greaterthan) < intval($attr7_value);
elseif ( isset($attr7_empty) )
{
if ( !isset($$attr7_empty) )
@@ -992,7 +1163,27 @@ if (isset($attr8_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1012,15 +1203,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1030,7 +1221,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1051,7 +1243,27 @@ if (isset($attr8_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -1071,15 +1283,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -1089,7 +1301,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:1:"t";}' ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:1:"t";}' ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php
$attr5_list_tmp_key = $attr5_key;
$attr5_list_tmp_value = $attr5_value;
$attr5_list_extract = $attr5_extract;
@@ -1159,6 +1372,10 @@ if ( $attr7_readonly && $checked )
$exec = in_array($attr6_value,explode(',',$attr6_contains));
elseif( isset($attr6_equals)&& isset($attr6_value) )
$exec = $attr6_equals == $attr6_value;
+ elseif( isset($attr6_lessthan)&& isset($attr6_value) )
+ $exec = intval($attr6_lessthan) > intval($attr6_value);
+ elseif( isset($attr6_greaterthan)&& isset($attr6_value) )
+ $exec = intval($attr6_greaterthan) < intval($attr6_value);
elseif ( isset($attr6_empty) )
{
if ( !isset($$attr6_empty) )
@@ -1227,7 +1444,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1247,15 +1484,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1265,7 +1502,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:13:"ACL_INHERITED";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','key'=>'ACL_INHERITED','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='ACL_INHERITED' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
@@ -1276,7 +1514,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1296,15 +1554,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1314,7 +1572,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/page/changetemplate.tpl.php b/themes/default/pages/html/page/changetemplate.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -273,7 +294,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -293,15 +334,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -311,7 +352,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -342,7 +384,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -362,15 +424,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -380,7 +442,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -396,6 +459,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/page/changetemplateselectelements.tpl.php b/themes/default/pages/html/page/changetemplateselectelements.tpl.php
@@ -201,7 +201,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -221,15 +241,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -239,7 +259,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -255,6 +276,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
diff --git a/themes/default/pages/html/page/el.tpl.php b/themes/default/pages/html/page/el.tpl.php
@@ -226,7 +226,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -246,15 +266,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -264,7 +284,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -285,7 +306,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -305,15 +346,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -323,7 +364,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -344,7 +386,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -364,15 +426,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -382,7 +444,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:5:"empty";s:2:"el";}' ?><?php $attr3 = array('empty'=>'el') ?><?php $attr3_empty='el' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:5:"empty";s:2:"el";}' ?><?php $attr3 = array('empty'=>'el') ?><?php $attr3_empty='el' ?><?php
if ( isset($attr3_true) )
{
if (gettype($attr3_true) === '' && gettype($attr3_true) === '1')
@@ -474,7 +537,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -494,15 +577,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -512,7 +595,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:2:"el";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='el' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:2:"el";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='el' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php
$attr3_list_tmp_key = $attr3_key;
$attr3_list_tmp_value = $attr3_value;
$attr3_list_extract = $attr3_extract;
@@ -541,7 +625,7 @@
global $cell_column_nr;
$cell_column_nr=0;
$column_class_idx = 999;
-?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -552,7 +636,7 @@
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
$attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:4:"desc";s:6:"target";s:5:"_self";s:3:"url";s:7:"var:url";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'desc','target'=>'_self','url'=>$url,'class'=>'') ?><?php $attr6_title='desc' ?><?php $attr6_target='_self' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:8:"var:desc";s:6:"target";s:5:"_self";s:3:"url";s:7:"var:url";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>$desc,'target'=>'_self','url'=>$url,'class'=>'') ?><?php $attr6_title=$desc ?><?php $attr6_target='_self' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php
$params = array();
if (!empty($attr6_var1) && isset($attr6_value1))
$params[$attr6_var1]=$attr6_value1;
@@ -594,7 +678,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -614,15 +718,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -632,7 +736,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -643,7 +748,7 @@ if (isset($attr7_elementtype)) {
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
$attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:5:"value";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','var'=>'value','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='value' ?><?php $attr6_escape=true ?><?php
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:5:"value";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','var'=>'value','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='value' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -653,7 +758,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -673,15 +798,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -691,7 +816,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -701,7 +827,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -721,15 +867,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -739,7 +885,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -750,27 +897,157 @@ if (isset($attr7_elementtype)) {
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
$attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:15:"var:archive_url";s:5:"class";s:0:"";}' ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>$archive_url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url=$archive_url ?><?php $attr6_class='' ?><?php
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:11:"archive_url";}' ?><?php $attr6 = array('present'=>'archive_url') ?><?php $attr6_present='archive_url' ?><?php
+ if ( isset($attr6_true) )
+ {
+ if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
+ $exec = $$attr6_true == true;
+ else
+ $exec = $attr6_true == true;
+ }
+ elseif ( isset($attr6_false) )
+ {
+ if (gettype($attr6_false) === '' && gettype($attr6_false) === '1')
+ $exec = $$attr6_false == false;
+ else
+ $exec = $attr6_false == false;
+ }
+ elseif( isset($attr6_contains) )
+ $exec = in_array($attr6_value,explode(',',$attr6_contains));
+ elseif( isset($attr6_equals)&& isset($attr6_value) )
+ $exec = $attr6_equals == $attr6_value;
+ elseif( isset($attr6_lessthan)&& isset($attr6_value) )
+ $exec = intval($attr6_lessthan) > intval($attr6_value);
+ elseif( isset($attr6_greaterthan)&& isset($attr6_value) )
+ $exec = intval($attr6_greaterthan) < intval($attr6_value);
+ elseif ( isset($attr6_empty) )
+ {
+ if ( !isset($$attr6_empty) )
+ $exec = empty($attr6_empty);
+ elseif ( is_array($$attr6_empty) )
+ $exec = (count($$attr6_empty)==0);
+ elseif ( is_bool($$attr6_empty) )
+ $exec = true;
+ else
+ $exec = empty( $$attr6_empty );
+ }
+ elseif ( isset($attr6_present) )
+ {
+ $exec = isset($$attr6_present);
+ }
+ else
+ {
+ trigger_error("error in IF, assume: FALSE");
+ $exec = false;
+ }
+ if ( !empty($attr6_invert) )
+ $exec = !$exec;
+ if ( !empty($attr6_not) )
+ $exec = !$exec;
+ unset($attr6_true);
+ unset($attr6_false);
+ unset($attr6_notempty);
+ unset($attr6_empty);
+ unset($attr6_contains);
+ unset($attr6_present);
+ unset($attr6_invert);
+ unset($attr6_not);
+ unset($attr6_value);
+ unset($attr6_equals);
+ $last_exec = $exec;
+ if ( $exec )
+ {
+?>
+<?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7_debug_info = 'a:4:{s:5:"title";s:27:"message:GLOBAL_ARCHIVE_DESC";s:6:"target";s:5:"_self";s:3:"url";s:15:"var:archive_url";s:5:"class";s:0:"";}' ?><?php $attr7 = array('title'=>lang('GLOBAL_ARCHIVE_DESC'),'target'=>'_self','url'=>$archive_url,'class'=>'') ?><?php $attr7_title=lang('GLOBAL_ARCHIVE_DESC') ?><?php $attr7_target='_self' ?><?php $attr7_url=$archive_url ?><?php $attr7_class='' ?><?php
$params = array();
- if (!empty($attr6_var1) && isset($attr6_value1))
- $params[$attr6_var1]=$attr6_value1;
- if (!empty($attr6_var2) && isset($attr6_value2))
- $params[$attr6_var2]=$attr6_value2;
- if (!empty($attr6_var3) && isset($attr6_value3))
- $params[$attr6_var3]=$attr6_value3;
- if (!empty($attr6_var4) && isset($attr6_value4))
- $params[$attr6_var4]=$attr6_value4;
- if (!empty($attr6_var5) && isset($attr6_value5))
- $params[$attr6_var5]=$attr6_value5;
- if(empty($attr6_class))
- $attr6_class='';
- if(empty($attr6_title))
- $attr6_title = '';
- if(!empty($attr6_url))
- $tmp_url = $attr6_url;
+ if (!empty($attr7_var1) && isset($attr7_value1))
+ $params[$attr7_var1]=$attr7_value1;
+ if (!empty($attr7_var2) && isset($attr7_value2))
+ $params[$attr7_var2]=$attr7_value2;
+ if (!empty($attr7_var3) && isset($attr7_value3))
+ $params[$attr7_var3]=$attr7_value3;
+ if (!empty($attr7_var4) && isset($attr7_value4))
+ $params[$attr7_var4]=$attr7_value4;
+ if (!empty($attr7_var5) && isset($attr7_value5))
+ $params[$attr7_var5]=$attr7_value5;
+ if(empty($attr7_class))
+ $attr7_class='';
+ if(empty($attr7_title))
+ $attr7_title = '';
+ if(!empty($attr7_url))
+ $tmp_url = $attr7_url;
else
- $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params);
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_ARCHIVE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_ARCHIVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_ARCHIVE' ?><?php $attr7_escape=true ?><?php
+ $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params);
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_ARCHIVE";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_ARCHIVE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_ARCHIVE' ?><?php $attr8_escape=true ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
+ {
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
+ }
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
+ }
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_(_";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_(_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_(_' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -780,7 +1057,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -800,15 +1097,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -818,151 +1115,223 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"_(";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_(' ?><?php $attr6_escape=true ?><?php
- if ( isset($attr6_prefix)&& isset($attr6_key))
- $attr6_key = $attr6_prefix.$attr6_key;
- if ( isset($attr6_suffix)&& isset($attr6_key))
- $attr6_key = $attr6_key.$attr6_suffix;
- if(empty($attr6_title))
- if (!empty($attr6_key))
- $attr6_title = lang($attr6_key.'_HELP');
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"var:archive_count";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>$archive_count,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$archive_count ?><?php $attr7_escape=true ?><?php
+ if ( isset($attr7_prefix)&& isset($attr7_key))
+ $attr7_key = $attr7_prefix.$attr7_key;
+ if ( isset($attr7_suffix)&& isset($attr7_key))
+ $attr7_key = $attr7_key.$attr7_suffix;
+ if(empty($attr7_title))
+ if (!empty($attr7_key))
+ $attr7_title = lang($attr7_key.'_HELP');
else
- $attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
- $attr6_title = '';
- if (!empty($attr6_array))
+ $attr7_title = '';
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ $attr7_title = '';
+ if (!empty($attr7_array))
{
- $tmpArray = $$attr6_array;
- if (!empty($attr6_var))
- $tmp_text = $tmpArray[$attr6_var];
+ $tmpArray = $$attr7_array;
+ if (!empty($attr7_var))
+ $tmp_text = $tmpArray[$attr7_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = lang($tmpArray[$attr7_text]);
}
- elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
+ elseif (!empty($attr7_text))
+ if ( isset($$attr7_text))
+ $tmp_text = lang($$attr7_text);
else
- $tmp_text = lang($attr6_text);
- elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
- elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
- elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
- elseif (!empty($attr6_raw))
- $tmp_text = str_replace('_',' ',$attr6_raw);
- elseif (!empty($attr6_value))
- $tmp_text = $attr6_value;
+ $tmp_text = lang($attr7_text);
+ elseif (!empty($attr7_textvar))
+ $tmp_text = lang($$attr7_textvar);
+ elseif (!empty($attr7_key))
+ $tmp_text = lang($attr7_key);
+ elseif (!empty($attr7_var))
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
+ elseif (!empty($attr7_raw))
+ $tmp_text = str_replace('_',' ',$attr7_raw);
+ elseif (!empty($attr7_value))
+ $tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
- if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
- if (isset($attr6_accesskey))
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
+ if (isset($attr7_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"var:archive_count";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>$archive_count,'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=$archive_count ?><?php $attr6_escape=true ?><?php
- if ( isset($attr6_prefix)&& isset($attr6_key))
- $attr6_key = $attr6_prefix.$attr6_key;
- if ( isset($attr6_suffix)&& isset($attr6_key))
- $attr6_key = $attr6_key.$attr6_suffix;
- if(empty($attr6_title))
- if (!empty($attr6_key))
- $attr6_title = lang($attr6_key.'_HELP');
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"_)";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>'_)','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_)' ?><?php $attr7_escape=true ?><?php
+ if ( isset($attr7_prefix)&& isset($attr7_key))
+ $attr7_key = $attr7_prefix.$attr7_key;
+ if ( isset($attr7_suffix)&& isset($attr7_key))
+ $attr7_key = $attr7_key.$attr7_suffix;
+ if(empty($attr7_title))
+ if (!empty($attr7_key))
+ $attr7_title = lang($attr7_key.'_HELP');
else
- $attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
- $attr6_title = '';
- if (!empty($attr6_array))
+ $attr7_title = '';
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ $attr7_title = '';
+ if (!empty($attr7_array))
{
- $tmpArray = $$attr6_array;
- if (!empty($attr6_var))
- $tmp_text = $tmpArray[$attr6_var];
+ $tmpArray = $$attr7_array;
+ if (!empty($attr7_var))
+ $tmp_text = $tmpArray[$attr7_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = lang($tmpArray[$attr7_text]);
}
- elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
+ elseif (!empty($attr7_text))
+ if ( isset($$attr7_text))
+ $tmp_text = lang($$attr7_text);
else
- $tmp_text = lang($attr6_text);
- elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
- elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
- elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
- elseif (!empty($attr6_raw))
- $tmp_text = str_replace('_',' ',$attr6_raw);
- elseif (!empty($attr6_value))
- $tmp_text = $attr6_value;
+ $tmp_text = lang($attr7_text);
+ elseif (!empty($attr7_textvar))
+ $tmp_text = lang($$attr7_textvar);
+ elseif (!empty($attr7_key))
+ $tmp_text = lang($attr7_key);
+ elseif (!empty($attr7_var))
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
+ elseif (!empty($attr7_raw))
+ $tmp_text = str_replace('_',' ',$attr7_raw);
+ elseif (!empty($attr7_value))
+ $tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
- if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
- if (isset($attr6_accesskey))
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
+ if (isset($attr7_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:")";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php $attr6_escape=true ?><?php
- if ( isset($attr6_prefix)&& isset($attr6_key))
- $attr6_key = $attr6_prefix.$attr6_key;
- if ( isset($attr6_suffix)&& isset($attr6_key))
- $attr6_key = $attr6_key.$attr6_suffix;
- if(empty($attr6_title))
- if (!empty($attr6_key))
- $attr6_title = lang($attr6_key.'_HELP');
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+<?php unset($attr6) ?><?php $attr7_debug_info = 'a:5:{s:5:"title";s:30:"message:GLOBAL_NO_ARCHIVE_DESC";s:5:"class";s:4:"text";s:4:"text";s:17:"GLOBAL_NO_ARCHIVE";s:6:"escape";s:4:"true";s:4:"type";s:8:"emphatic";}' ?><?php $attr7 = array('title'=>lang('GLOBAL_NO_ARCHIVE_DESC'),'class'=>'text','text'=>'GLOBAL_NO_ARCHIVE','escape'=>true,'type'=>'emphatic') ?><?php $attr7_title=lang('GLOBAL_NO_ARCHIVE_DESC') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_NO_ARCHIVE' ?><?php $attr7_escape=true ?><?php $attr7_type='emphatic' ?><?php
+ if ( isset($attr7_prefix)&& isset($attr7_key))
+ $attr7_key = $attr7_prefix.$attr7_key;
+ if ( isset($attr7_suffix)&& isset($attr7_key))
+ $attr7_key = $attr7_key.$attr7_suffix;
+ if(empty($attr7_title))
+ if (!empty($attr7_key))
+ $attr7_title = lang($attr7_key.'_HELP');
else
- $attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
- $attr6_title = '';
- if (!empty($attr6_array))
+ $attr7_title = '';
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ $attr7_title = '';
+ if (!empty($attr7_array))
{
- $tmpArray = $$attr6_array;
- if (!empty($attr6_var))
- $tmp_text = $tmpArray[$attr6_var];
+ $tmpArray = $$attr7_array;
+ if (!empty($attr7_var))
+ $tmp_text = $tmpArray[$attr7_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = lang($tmpArray[$attr7_text]);
}
- elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
+ elseif (!empty($attr7_text))
+ if ( isset($$attr7_text))
+ $tmp_text = lang($$attr7_text);
else
- $tmp_text = lang($attr6_text);
- elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
- elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
- elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
- elseif (!empty($attr6_raw))
- $tmp_text = str_replace('_',' ',$attr6_raw);
- elseif (!empty($attr6_value))
- $tmp_text = $attr6_value;
+ $tmp_text = lang($attr7_text);
+ elseif (!empty($attr7_textvar))
+ $tmp_text = lang($$attr7_textvar);
+ elseif (!empty($attr7_key))
+ $tmp_text = lang($attr7_key);
+ elseif (!empty($attr7_var))
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
+ elseif (!empty($attr7_raw))
+ $tmp_text = str_replace('_',' ',$attr7_raw);
+ elseif (!empty($attr7_value))
+ $tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
- if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
- if (isset($attr6_accesskey))
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
+ if (isset($attr7_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php unset($attr7_type) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:3:"var";s:11:"archive_url";}' ?><?php $attr6 = array('var'=>'archive_url') ?><?php $attr6_var='archive_url' ?><?php
+ if (!isset($attr6_value))
+ unset($$attr6_var);
+ elseif (isset($attr6_key))
+ $$attr6_var = $attr6_value[$attr6_key];
+ else
+ $$attr6_var = $attr6_value;
+?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -993,7 +1362,27 @@ if (isset($attr7_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1013,15 +1402,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1031,7 +1420,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1062,7 +1452,27 @@ if (isset($attr7_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1082,15 +1492,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1100,7 +1510,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/page/form.tpl.php b/themes/default/pages/html/page/form.tpl.php
@@ -243,7 +243,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -263,15 +283,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -281,7 +301,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:6:"invert";s:4:"true";s:5:"empty";s:2:"el";}' ?><?php $attr4 = array('invert'=>true,'empty'=>'el') ?><?php $attr4_invert=true ?><?php $attr4_empty='el' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:6:"invert";s:4:"true";s:5:"empty";s:2:"el";}' ?><?php $attr4 = array('invert'=>true,'empty'=>'el') ?><?php $attr4_invert=true ?><?php $attr4_empty='el' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -373,7 +394,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -393,15 +434,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -411,7 +452,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -432,7 +474,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -452,15 +514,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -470,7 +532,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -491,7 +554,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -511,15 +594,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -529,7 +612,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5_debug_info = 'a:4:{s:4:"list";s:2:"el";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr5 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr5_list='el' ?><?php $attr5_extract=true ?><?php $attr5_key='list_key' ?><?php $attr5_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5_debug_info = 'a:4:{s:4:"list";s:2:"el";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr5 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr5_list='el' ?><?php $attr5_extract=true ?><?php $attr5_key='list_key' ?><?php $attr5_value='list_value' ?><?php
$attr5_list_tmp_key = $attr5_key;
$attr5_list_tmp_value = $attr5_value;
$attr5_list_extract = $attr5_extract;
@@ -569,67 +653,88 @@
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) )
$attr7['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php $attr8_debug_info = 'a:2:{s:5:"align";s:4:"left";s:11:"elementtype";s:8:"var:type";}' ?><?php $attr8 = array('align'=>'left','elementtype'=>$type) ?><?php $attr8_align='left' ?><?php $attr8_elementtype=$type ?><?php
-if (isset($attr8_elementtype)) {
-?><img src="<?php echo $image_dir.'icon_el_'.$attr8_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php
-} elseif (isset($attr8_type)) {
-?><img src="<?php echo $image_dir.'icon_'.$attr8_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php
-} elseif (isset($attr8_icon)) {
-?><img src="<?php echo $image_dir.'icon_'.$attr8_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php
-} elseif (isset($attr8_url)) {
-?><img src="<?php echo $attr8_url ?>" border="0" align="<?php echo $attr8_align ?>"><?php
-} elseif (isset($attr8_fileext)) {
-?><img src="<?php echo $image_dir.$attr8_fileext ?>" border="0" align="<?php echo $attr8_align ?>"><?php
-} elseif (isset($attr8_file)) {
-?><img src="<?php echo $image_dir.$attr8_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } ?><?php unset($attr8) ?><?php unset($attr8_align) ?><?php unset($attr8_elementtype) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:4:"name";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_var='name' ?><?php $attr8_escape=true ?><?php
- if ( isset($attr8_prefix)&& isset($attr8_key))
- $attr8_key = $attr8_prefix.$attr8_key;
- if ( isset($attr8_suffix)&& isset($attr8_key))
- $attr8_key = $attr8_key.$attr8_suffix;
- if(empty($attr8_title))
- if (!empty($attr8_key))
- $attr8_title = lang($attr8_key.'_HELP');
+?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php $attr8_debug_info = 'a:1:{s:3:"for";s:10:"var:saveid";}' ?><?php $attr8 = array('for'=>$saveid) ?><?php $attr8_for=$saveid ?><label for="id_<?php echo $attr8_for ?><?php if (!empty($attr8_value)) echo '_'.$attr8_value ?>"><?php unset($attr8) ?><?php unset($attr8_for) ?><?php $attr9_debug_info = 'a:2:{s:5:"align";s:4:"left";s:11:"elementtype";s:8:"var:type";}' ?><?php $attr9 = array('align'=>'left','elementtype'=>$type) ?><?php $attr9_align='left' ?><?php $attr9_elementtype=$type ?><?php
+if (isset($attr9_elementtype)) {
+?><img src="<?php echo $image_dir.'icon_el_'.$attr9_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php
+} elseif (isset($attr9_type)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr9_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php
+} elseif (isset($attr9_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr9_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php
+} elseif (isset($attr9_url)) {
+?><img src="<?php echo $attr9_url ?>" border="0" align="<?php echo $attr9_align ?>"><?php
+} elseif (isset($attr9_fileext)) {
+?><img src="<?php echo $image_dir.$attr9_fileext ?>" border="0" align="<?php echo $attr9_align ?>"><?php
+} elseif (isset($attr9_file)) {
+?><img src="<?php echo $image_dir.$attr9_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php } ?><?php unset($attr9) ?><?php unset($attr9_align) ?><?php unset($attr9_elementtype) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:4:"name";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_var='name' ?><?php $attr9_escape=true ?><?php
+ if ( isset($attr9_prefix)&& isset($attr9_key))
+ $attr9_key = $attr9_prefix.$attr9_key;
+ if ( isset($attr9_suffix)&& isset($attr9_key))
+ $attr9_key = $attr9_key.$attr9_suffix;
+ if(empty($attr9_title))
+ if (!empty($attr9_key))
+ $attr9_title = lang($attr9_key.'_HELP');
else
- $attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
- $attr8_title = '';
- if (!empty($attr8_array))
- {
- $tmpArray = $$attr8_array;
- if (!empty($attr8_var))
- $tmp_text = $tmpArray[$attr8_var];
+ $attr9_title = '';
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ $attr9_title = '';
+ if (!empty($attr9_array))
+ {
+ $tmpArray = $$attr9_array;
+ if (!empty($attr9_var))
+ $tmp_text = $tmpArray[$attr9_var];
else
- $tmp_text = lang($tmpArray[$attr8_text]);
+ $tmp_text = lang($tmpArray[$attr9_text]);
}
- elseif (!empty($attr8_text))
- if ( isset($$attr8_text))
- $tmp_text = lang($$attr8_text);
+ elseif (!empty($attr9_text))
+ if ( isset($$attr9_text))
+ $tmp_text = lang($$attr9_text);
else
- $tmp_text = lang($attr8_text);
- elseif (!empty($attr8_textvar))
- $tmp_text = lang($$attr8_textvar);
- elseif (!empty($attr8_key))
- $tmp_text = lang($attr8_key);
- elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
- elseif (!empty($attr8_raw))
- $tmp_text = str_replace('_',' ',$attr8_raw);
- elseif (!empty($attr8_value))
- $tmp_text = $attr8_value;
+ $tmp_text = lang($attr9_text);
+ elseif (!empty($attr9_textvar))
+ $tmp_text = lang($$attr9_textvar);
+ elseif (!empty($attr9_key))
+ $tmp_text = lang($attr9_key);
+ elseif (!empty($attr9_var))
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
+ elseif (!empty($attr9_raw))
+ $tmp_text = str_replace('_',' ',$attr9_raw);
+ elseif (!empty($attr9_value))
+ $tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
- if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
- if (isset($attr8_accesskey))
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
+ if (isset($attr9_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr9_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr7 = array('class'=>'fx') ?><?php $attr7_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_var) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr7 = array('class'=>'fx') ?><?php $attr7_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -853,6 +958,7 @@ if ($attr9_addempty) $$attr9_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr9_
?><select id="id_<?php echo $attr9_name ?>" name="<?php echo $attr9_name; if ($attr9_multiple) echo '[]'; ?>" onchange="<?php echo $attr9_onchange ?>" title="<?php echo $attr9_title ?>" class="<?php echo $attr9_class ?>"<?php
if (count($$attr9_list)<=1) echo ' disabled="disabled"';
if ($attr9_multiple) echo ' multiple="multiple"';
+if (in_array($attr9_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr9_size).'"';
?>><?php
$attr9_tmp_list = $$attr9_list;
@@ -1117,7 +1223,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -1137,15 +1263,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -1155,7 +1281,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='GLOBAL_RELEASE' ?><?php $attr9_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='GLOBAL_RELEASE' ?><?php $attr9_escape=true ?><?php
if ( isset($attr9_prefix)&& isset($attr9_key))
$attr9_key = $attr9_prefix.$attr9_key;
if ( isset($attr9_suffix)&& isset($attr9_key))
@@ -1165,7 +1292,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -1185,15 +1332,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -1203,7 +1350,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr5 = array('present'=>'publish') ?><?php $attr5_present='publish' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr5 = array('present'=>'publish') ?><?php $attr5_present='publish' ?><?php
if ( isset($attr5_true) )
{
if (gettype($attr5_true) === '' && gettype($attr5_true) === '1')
@@ -1305,7 +1453,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -1325,15 +1493,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -1343,7 +1511,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr9_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr9 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr9_escape=true ?><?php
if ( isset($attr9_prefix)&& isset($attr9_key))
$attr9_key = $attr9_prefix.$attr9_key;
if ( isset($attr9_suffix)&& isset($attr9_key))
@@ -1353,7 +1522,27 @@ if ( $attr8_readonly && $checked )
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -1373,15 +1562,15 @@ if ( $attr8_readonly && $checked )
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -1391,7 +1580,8 @@ if ( $attr8_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/page/prop.tpl.php b/themes/default/pages/html/page/prop.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -350,7 +392,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -370,15 +432,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -388,7 +450,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/page/pub.tpl.php b/themes/default/pages/html/page/pub.tpl.php
@@ -192,7 +192,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -212,15 +232,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -230,7 +250,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"global_files";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'global_files','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_files' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"global_files";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'global_files','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_files' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -240,7 +261,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -260,15 +301,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -278,7 +319,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/page/showprop.tpl.php b/themes/default/pages/html/page/showprop.tpl.php
@@ -165,7 +165,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -185,15 +205,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -203,7 +223,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -224,7 +245,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -244,15 +285,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -262,7 +303,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -293,7 +335,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -313,15 +375,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -331,7 +393,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -352,7 +415,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -372,15 +455,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -390,7 +473,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -421,7 +505,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -441,15 +545,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -459,7 +563,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -480,7 +585,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -500,15 +625,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -518,7 +643,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -549,7 +675,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -569,15 +715,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -587,7 +733,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -701,7 +848,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -721,15 +888,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -739,7 +906,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"empty";s:12:"template_url";}' ?><?php $attr5 = array('empty'=>'template_url') ?><?php $attr5_empty='template_url' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"empty";s:12:"template_url";}' ?><?php $attr5 = array('empty'=>'template_url') ?><?php $attr5_empty='template_url' ?><?php
if ( isset($attr5_true) )
{
if (gettype($attr5_true) === '' && gettype($attr5_true) === '1')
@@ -822,7 +990,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -842,15 +1030,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -860,7 +1048,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -891,7 +1080,27 @@ if (isset($attr6_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -911,15 +1120,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -929,7 +1138,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -950,7 +1160,27 @@ if (isset($attr6_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -970,15 +1200,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -988,7 +1218,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1019,7 +1250,27 @@ if (isset($attr6_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1039,15 +1290,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1057,7 +1308,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1074,7 +1326,17 @@ if (isset($attr6_elementtype)) {
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -1124,7 +1386,27 @@ if (isset($attr6_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1144,15 +1426,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1162,7 +1444,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:11:"create_user";}' ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:11:"create_user";}' ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
@@ -1206,7 +1489,27 @@ if (isset($attr6_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1226,15 +1529,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1244,7 +1547,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1261,7 +1565,17 @@ if (isset($attr6_elementtype)) {
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -1311,7 +1625,27 @@ if (isset($attr6_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -1331,15 +1665,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -1349,7 +1683,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"lastchange_user";}' ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:1:{s:4:"user";s:15:"lastchange_user";}' ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php
if ( is_object($attr5_user) )
$user = $attr5_user;
else
diff --git a/themes/default/pages/html/page/src.tpl.php b/themes/default/pages/html/page/src.tpl.php
@@ -166,7 +166,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -186,15 +206,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -204,7 +224,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?></pre>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?></pre>
<?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
diff --git a/themes/default/pages/html/pageelement/advanced.tpl.php b/themes/default/pages/html/pageelement/advanced.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:6:"equals";s:4:"date";s:5:"value";s:8:"var:type";}' ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:6:"equals";s:4:"date";s:5:"value";s:8:"var:type";}' ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -372,7 +393,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -392,15 +433,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -410,7 +451,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:13:"var:monthname";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>$monthname,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=$monthname ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:13:"var:monthname";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>$monthname,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=$monthname ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -420,7 +462,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -440,15 +502,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -458,7 +520,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -468,7 +531,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -488,15 +571,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -506,7 +589,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:16:"var:nextmonthurl";s:5:"class";s:0:"";}' ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextmonthurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextmonthurl ?><?php $attr8_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:16:"var:nextmonthurl";s:5:"class";s:0:"";}' ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextmonthurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextmonthurl ?><?php $attr8_class='' ?><?php
$params = array();
if (!empty($attr8_var1) && isset($attr8_value1))
$params[$attr8_var1]=$attr8_value1;
@@ -548,7 +632,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -568,15 +672,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -586,7 +690,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:15:"var:lastyearurl";s:5:"class";s:0:"";}' ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$lastyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$lastyearurl ?><?php $attr8_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:15:"var:lastyearurl";s:5:"class";s:0:"";}' ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$lastyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$lastyearurl ?><?php $attr8_class='' ?><?php
$params = array();
if (!empty($attr8_var1) && isset($attr8_value1))
$params[$attr8_var1]=$attr8_value1;
@@ -628,7 +733,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -648,15 +773,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -666,7 +791,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"var:yearname";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>$yearname,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=$yearname ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"var:yearname";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>$yearname,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=$yearname ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -676,7 +802,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -696,15 +842,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -714,7 +860,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -724,7 +871,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -744,15 +911,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -762,7 +929,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:15:"var:nextyearurl";s:5:"class";s:0:"";}' ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextyearurl ?><?php $attr8_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:15:"var:nextyearurl";s:5:"class";s:0:"";}' ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextyearurl ?><?php $attr8_class='' ?><?php
$params = array();
if (!empty($attr8_var1) && isset($attr8_value1))
$params[$attr8_var1]=$attr8_value1;
@@ -825,7 +993,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -845,15 +1033,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -863,7 +1051,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:4:{s:4:"list";s:8:"weekdays";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:7:"weekday";}' ?><?php $attr7 = array('list'=>'weekdays','extract'=>false,'key'=>'list_key','value'=>'weekday') ?><?php $attr7_list='weekdays' ?><?php $attr7_extract=false ?><?php $attr7_key='list_key' ?><?php $attr7_value='weekday' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:4:{s:4:"list";s:8:"weekdays";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:7:"weekday";}' ?><?php $attr7 = array('list'=>'weekdays','extract'=>false,'key'=>'list_key','value'=>'weekday') ?><?php $attr7_list='weekdays' ?><?php $attr7_extract=false ?><?php $attr7_key='list_key' ?><?php $attr7_value='weekday' ?><?php
$attr7_list_tmp_key = $attr7_key;
$attr7_list_tmp_value = $attr7_value;
$attr7_list_extract = $attr7_extract;
@@ -903,7 +1092,27 @@ if (isset($attr9_elementtype)) {
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -923,15 +1132,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -941,7 +1150,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:4:"list";s:8:"weeklist";s:7:"extract";s:5:"false";s:3:"key";s:6:"weeknr";s:5:"value";s:4:"week";}' ?><?php $attr6 = array('list'=>'weeklist','extract'=>false,'key'=>'weeknr','value'=>'week') ?><?php $attr6_list='weeklist' ?><?php $attr6_extract=false ?><?php $attr6_key='weeknr' ?><?php $attr6_value='week' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:4:"list";s:8:"weeklist";s:7:"extract";s:5:"false";s:3:"key";s:6:"weeknr";s:5:"value";s:4:"week";}' ?><?php $attr6 = array('list'=>'weeklist','extract'=>false,'key'=>'weeknr','value'=>'week') ?><?php $attr6_list='weeklist' ?><?php $attr6_extract=false ?><?php $attr6_key='weeknr' ?><?php $attr6_value='week' ?><?php
$attr6_list_tmp_key = $attr6_key;
$attr6_list_tmp_value = $attr6_value;
$attr6_list_extract = $attr6_extract;
@@ -991,7 +1201,27 @@ if (isset($attr9_elementtype)) {
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -1011,15 +1241,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -1029,7 +1259,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr8_debug_info = 'a:4:{s:4:"list";s:4:"week";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr8 = array('list'=>'week','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr8_list='week' ?><?php $attr8_extract=true ?><?php $attr8_key='list_key' ?><?php $attr8_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr8_debug_info = 'a:4:{s:4:"list";s:4:"week";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr8 = array('list'=>'week','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr8_list='week' ?><?php $attr8_extract=true ?><?php $attr8_key='list_key' ?><?php $attr8_value='list_value' ?><?php
$attr8_list_tmp_key = $attr8_key;
$attr8_list_tmp_value = $attr8_value;
$attr8_list_extract = $attr8_extract;
@@ -1130,7 +1361,27 @@ if (isset($attr9_elementtype)) {
$attr11_title = lang($attr11_key.'_HELP');
else
$attr11_title = '';
-?><span class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
+ if (empty($attr11_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr11_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
$attr11_title = '';
if (!empty($attr11_array))
{
@@ -1150,15 +1401,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr11_key))
$tmp_text = lang($attr11_key);
elseif (!empty($attr11_var))
- $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?';
+ $tmp_text = isset($$attr11_var)?$$attr11_var:'?'.$attr11_var.'?';
elseif (!empty($attr11_raw))
$tmp_text = str_replace('_',' ',$attr11_raw);
elseif (!empty($attr11_value))
$tmp_text = $attr11_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr11_escape && empty($attr11_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr11_maxlength) && intval($attr11_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr11_maxlength) );
if (isset($attr11_accesskey))
@@ -1168,7 +1419,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr11_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:6:"var:nr";s:6:"escape";s:4:"true";}' ?><?php $attr11 = array('class'=>'text','text'=>$nr,'escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_text=$nr ?><?php $attr11_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr11_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:6:"var:nr";s:6:"escape";s:4:"true";}' ?><?php $attr11 = array('class'=>'text','text'=>$nr,'escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_text=$nr ?><?php $attr11_escape=true ?><?php
if ( isset($attr11_prefix)&& isset($attr11_key))
$attr11_key = $attr11_prefix.$attr11_key;
if ( isset($attr11_suffix)&& isset($attr11_key))
@@ -1178,7 +1430,27 @@ if (isset($attr9_elementtype)) {
$attr11_title = lang($attr11_key.'_HELP');
else
$attr11_title = '';
-?><span class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
+ if (empty($attr11_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr11_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
$attr11_title = '';
if (!empty($attr11_array))
{
@@ -1198,15 +1470,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr11_key))
$tmp_text = lang($attr11_key);
elseif (!empty($attr11_var))
- $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?';
+ $tmp_text = isset($$attr11_var)?$$attr11_var:'?'.$attr11_var.'?';
elseif (!empty($attr11_raw))
$tmp_text = str_replace('_',' ',$attr11_raw);
elseif (!empty($attr11_value))
$tmp_text = $attr11_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr11_escape && empty($attr11_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr11_maxlength) && intval($attr11_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr11_maxlength) );
if (isset($attr11_accesskey))
@@ -1216,7 +1488,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_text) ?><?php unset($attr11_escape) ?><?php $attr11_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr11 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_raw='__' ?><?php $attr11_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_text) ?><?php unset($attr11_escape) ?><?php $attr11_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr11 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_raw='__' ?><?php $attr11_escape=true ?><?php
if ( isset($attr11_prefix)&& isset($attr11_key))
$attr11_key = $attr11_prefix.$attr11_key;
if ( isset($attr11_suffix)&& isset($attr11_key))
@@ -1226,7 +1499,27 @@ if (isset($attr9_elementtype)) {
$attr11_title = lang($attr11_key.'_HELP');
else
$attr11_title = '';
-?><span class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
+ if (empty($attr11_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr11_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
$attr11_title = '';
if (!empty($attr11_array))
{
@@ -1246,15 +1539,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr11_key))
$tmp_text = lang($attr11_key);
elseif (!empty($attr11_var))
- $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?';
+ $tmp_text = isset($$attr11_var)?$$attr11_var:'?'.$attr11_var.'?';
elseif (!empty($attr11_raw))
$tmp_text = str_replace('_',' ',$attr11_raw);
elseif (!empty($attr11_value))
$tmp_text = $attr11_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr11_escape && empty($attr11_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr11_maxlength) && intval($attr11_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr11_maxlength) );
if (isset($attr11_accesskey))
@@ -1264,7 +1557,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr10_debug_info = 'a:2:{s:3:"not";s:4:"true";s:5:"empty";s:3:"url";}' ?><?php $attr10 = array('not'=>true,'empty'=>'url') ?><?php $attr10_not=true ?><?php $attr10_empty='url' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr10_debug_info = 'a:2:{s:3:"not";s:4:"true";s:5:"empty";s:3:"url";}' ?><?php $attr10 = array('not'=>true,'empty'=>'url') ?><?php $attr10_not=true ?><?php $attr10_empty='url' ?><?php
if ( isset($attr10_true) )
{
if (gettype($attr10_true) === '' && gettype($attr10_true) === '1')
@@ -1355,7 +1649,27 @@ if (isset($attr9_elementtype)) {
$attr12_title = lang($attr12_key.'_HELP');
else
$attr12_title = '';
-?><span class="<?php echo $attr12_class ?>" title="<?php echo $attr12_title ?>"><?php
+ if (empty($attr12_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr12_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr12_class ?>" title="<?php echo $attr12_title ?>"><?php
$attr12_title = '';
if (!empty($attr12_array))
{
@@ -1375,15 +1689,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr12_key))
$tmp_text = lang($attr12_key);
elseif (!empty($attr12_var))
- $tmp_text = isset($$attr12_var)?($attr12_escape?htmlentities($$attr12_var):$$attr12_var):'?'.$attr12_var.'?';
+ $tmp_text = isset($$attr12_var)?$$attr12_var:'?'.$attr12_var.'?';
elseif (!empty($attr12_raw))
$tmp_text = str_replace('_',' ',$attr12_raw);
elseif (!empty($attr12_value))
$tmp_text = $attr12_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr12_escape && empty($attr12_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr12_maxlength) && intval($attr12_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr12_maxlength) );
if (isset($attr12_accesskey))
@@ -1393,7 +1707,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php unset($attr12_escape) ?><?php $attr12_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:6:"var:nr";s:6:"escape";s:4:"true";}' ?><?php $attr12 = array('class'=>'text','text'=>$nr,'escape'=>true) ?><?php $attr12_class='text' ?><?php $attr12_text=$nr ?><?php $attr12_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php unset($attr12_escape) ?><?php $attr12_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:6:"var:nr";s:6:"escape";s:4:"true";}' ?><?php $attr12 = array('class'=>'text','text'=>$nr,'escape'=>true) ?><?php $attr12_class='text' ?><?php $attr12_text=$nr ?><?php $attr12_escape=true ?><?php
if ( isset($attr12_prefix)&& isset($attr12_key))
$attr12_key = $attr12_prefix.$attr12_key;
if ( isset($attr12_suffix)&& isset($attr12_key))
@@ -1403,7 +1718,27 @@ if (isset($attr9_elementtype)) {
$attr12_title = lang($attr12_key.'_HELP');
else
$attr12_title = '';
-?><span class="<?php echo $attr12_class ?>" title="<?php echo $attr12_title ?>"><?php
+ if (empty($attr12_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr12_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr12_class ?>" title="<?php echo $attr12_title ?>"><?php
$attr12_title = '';
if (!empty($attr12_array))
{
@@ -1423,15 +1758,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr12_key))
$tmp_text = lang($attr12_key);
elseif (!empty($attr12_var))
- $tmp_text = isset($$attr12_var)?($attr12_escape?htmlentities($$attr12_var):$$attr12_var):'?'.$attr12_var.'?';
+ $tmp_text = isset($$attr12_var)?$$attr12_var:'?'.$attr12_var.'?';
elseif (!empty($attr12_raw))
$tmp_text = str_replace('_',' ',$attr12_raw);
elseif (!empty($attr12_value))
$tmp_text = $attr12_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr12_escape && empty($attr12_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr12_maxlength) && intval($attr12_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr12_maxlength) );
if (isset($attr12_accesskey))
@@ -1441,7 +1776,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_text) ?><?php unset($attr12_escape) ?><?php $attr12_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr12 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr12_class='text' ?><?php $attr12_raw='__' ?><?php $attr12_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_text) ?><?php unset($attr12_escape) ?><?php $attr12_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr12 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr12_class='text' ?><?php $attr12_raw='__' ?><?php $attr12_escape=true ?><?php
if ( isset($attr12_prefix)&& isset($attr12_key))
$attr12_key = $attr12_prefix.$attr12_key;
if ( isset($attr12_suffix)&& isset($attr12_key))
@@ -1451,7 +1787,27 @@ if (isset($attr9_elementtype)) {
$attr12_title = lang($attr12_key.'_HELP');
else
$attr12_title = '';
-?><span class="<?php echo $attr12_class ?>" title="<?php echo $attr12_title ?>"><?php
+ if (empty($attr12_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr12_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr12_class ?>" title="<?php echo $attr12_title ?>"><?php
$attr12_title = '';
if (!empty($attr12_array))
{
@@ -1471,15 +1827,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr12_key))
$tmp_text = lang($attr12_key);
elseif (!empty($attr12_var))
- $tmp_text = isset($$attr12_var)?($attr12_escape?htmlentities($$attr12_var):$$attr12_var):'?'.$attr12_var.'?';
+ $tmp_text = isset($$attr12_var)?$$attr12_var:'?'.$attr12_var.'?';
elseif (!empty($attr12_raw))
$tmp_text = str_replace('_',' ',$attr12_raw);
elseif (!empty($attr12_value))
$tmp_text = $attr12_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr12_escape && empty($attr12_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr12_maxlength) && intval($attr12_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr12_maxlength) );
if (isset($attr12_accesskey))
@@ -1489,7 +1845,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php unset($attr12_escape) ?><?php $attr10_debug_info = 'a:0:{}' ?><?php $attr10 = array() ?></a><?php unset($attr10) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr10_debug_info = 'a:1:{s:4:"true";s:9:"var:today";}' ?><?php $attr10 = array('true'=>$today) ?><?php $attr10_true=$today ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php unset($attr12_escape) ?><?php $attr10_debug_info = 'a:0:{}' ?><?php $attr10 = array() ?></a><?php unset($attr10) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr10_debug_info = 'a:1:{s:4:"true";s:9:"var:today";}' ?><?php $attr10 = array('true'=>$today) ?><?php $attr10_true=$today ?><?php
if ( isset($attr10_true) )
{
if (gettype($attr10_true) === '' && gettype($attr10_true) === '1')
@@ -1560,7 +1917,27 @@ if (isset($attr9_elementtype)) {
$attr11_title = lang($attr11_key.'_HELP');
else
$attr11_title = '';
-?><span class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
+ if (empty($attr11_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr11_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php
$attr11_title = '';
if (!empty($attr11_array))
{
@@ -1580,15 +1957,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr11_key))
$tmp_text = lang($attr11_key);
elseif (!empty($attr11_var))
- $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?';
+ $tmp_text = isset($$attr11_var)?$$attr11_var:'?'.$attr11_var.'?';
elseif (!empty($attr11_raw))
$tmp_text = str_replace('_',' ',$attr11_raw);
elseif (!empty($attr11_value))
$tmp_text = $attr11_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr11_escape && empty($attr11_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr11_maxlength) && intval($attr11_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr11_maxlength) );
if (isset($attr11_accesskey))
@@ -1598,7 +1975,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?></td><?php unset($attr8) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></tr><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?></td><?php unset($attr8) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></tr><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -1629,7 +2007,27 @@ if (isset($attr9_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1649,15 +2047,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1667,7 +2065,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:5:"class";s:2:"fx";s:7:"colspan";s:1:"5";}' ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:5:"class";s:2:"fx";s:7:"colspan";s:1:"5";}' ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1683,6 +2082,7 @@ if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -1712,7 +2112,27 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1732,15 +2152,15 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1750,11 +2170,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:10:"all_months";s:4:"name";s:5:"month";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_months','name'=>'month','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_months' ?><?php $attr8_name='month' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:10:"all_months";s:4:"name";s:5:"month";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_months','name'=>'month','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_months' ?><?php $attr8_name='month' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_list;
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -1784,7 +2206,27 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1804,15 +2246,15 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1822,11 +2264,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:8:"all_days";s:4:"name";s:3:"day";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_days','name'=>'day','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_days' ?><?php $attr8_name='day' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:8:"all_days";s:4:"name";s:3:"day";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_days','name'=>'day','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_days' ?><?php $attr8_name='day' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_list;
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -1877,7 +2321,27 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1897,15 +2361,15 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1915,7 +2379,8 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:5:"class";s:2:"fx";s:7:"colspan";s:1:"5";}' ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:5:"class";s:2:"fx";s:7:"colspan";s:1:"5";}' ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1931,6 +2396,7 @@ if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -1960,7 +2426,27 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1980,15 +2466,15 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1998,11 +2484,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:11:"all_minutes";s:4:"name";s:6:"minute";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_minutes','name'=>'minute','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_minutes' ?><?php $attr8_name='minute' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:11:"all_minutes";s:4:"name";s:6:"minute";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_minutes','name'=>'minute','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_minutes' ?><?php $attr8_name='minute' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_list;
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -2032,7 +2520,27 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -2052,15 +2560,15 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -2070,11 +2578,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:11:"all_seconds";s:4:"name";s:6:"second";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_seconds','name'=>'second','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_seconds' ?><?php $attr8_name='second' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:8:{s:4:"list";s:11:"all_seconds";s:4:"name";s:6:"second";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";}' ?><?php $attr8 = array('list'=>'all_seconds','name'=>'second','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr8_list='all_seconds' ?><?php $attr8_name='second' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><?php $attr8_addempty=false ?><?php $attr8_multiple=false ?><?php $attr8_size='1' ?><?php
if ($attr8_addempty) $$attr8_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr8_list;
?><select id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name; if ($attr8_multiple) echo '[]'; ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php
if (count($$attr8_list)<=1) echo ' disabled="disabled"';
if ($attr8_multiple) echo ' multiple="multiple"';
+if (in_array($attr8_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr8_size).'"';
?>><?php
$attr8_tmp_list = $$attr8_list;
@@ -2542,7 +3052,27 @@ else
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -2562,15 +3092,15 @@ else
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -2580,7 +3110,8 @@ else
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_var) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><br/><?php unset($attr9) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr8_debug_info = 'a:2:{s:4:"name";s:4:"text";s:4:"type";s:4:"wiki";}' ?><?php $attr8 = array('name'=>'text','type'=>'wiki') ?><?php $attr8_name='text' ?><?php $attr8_type='wiki' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_var) ?><?php unset($attr9_escape) ?><?php $attr9_debug_info = 'a:0:{}' ?><?php $attr9 = array() ?><br/><?php unset($attr9) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr8_debug_info = 'a:2:{s:4:"name";s:4:"text";s:4:"type";s:4:"wiki";}' ?><?php $attr8 = array('name'=>'text','type'=>'wiki') ?><?php $attr8_name='text' ?><?php $attr8_type='wiki' ?><?php
if ($attr8_type=='fckeditor' || $attr8_type=='html')
{
include('./editor/fckeditor.php');
@@ -2815,6 +3346,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -2927,6 +3459,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -3131,6 +3664,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -3401,7 +3935,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3421,15 +3975,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3439,7 +3993,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -3449,7 +4004,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3469,15 +4044,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3487,7 +4062,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -3589,7 +4165,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3609,15 +4205,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3627,7 +4223,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -3637,7 +4234,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -3657,15 +4274,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -3675,7 +4292,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/pageelement/archive.tpl.php b/themes/default/pages/html/pageelement/archive.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"class";s:4:"help";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'help','colspan'=>'2') ?><?php $attr5_class='help' ?><?php $attr5_colspan='2' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"class";s:4:"help";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'help','colspan'=>'2') ?><?php $attr5_class='help' ?><?php $attr5_colspan='2' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -300,7 +342,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -320,15 +382,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -338,7 +400,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -359,7 +422,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -379,15 +462,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -397,7 +480,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -418,7 +502,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -438,15 +542,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -456,7 +560,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -467,7 +572,7 @@
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
$attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"GLOBAL_STATE";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_STATE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_STATE' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -477,7 +582,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -497,15 +622,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -515,7 +640,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -526,7 +652,7 @@
$cell_column_nr++;
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
$attr5['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:13:"GLOBAL_ACTION";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_ACTION','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_ACTION' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -536,7 +662,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -556,15 +702,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -574,7 +720,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"empty";s:2:"el";}' ?><?php $attr4 = array('empty'=>'el') ?><?php $attr4_empty='el' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:5:"empty";s:2:"el";}' ?><?php $attr4 = array('empty'=>'el') ?><?php $attr4_empty='el' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -666,7 +813,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -686,15 +853,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -704,7 +871,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:2:"el";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='el' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:2:"el";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='el' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php
$attr4_list_tmp_key = $attr4_key;
$attr4_list_tmp_value = $attr4_value;
$attr4_list_extract = $attr4_extract;
@@ -754,7 +922,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -774,15 +962,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -792,7 +980,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -845,7 +1034,17 @@
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
@@ -906,7 +1105,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -926,15 +1145,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -944,7 +1163,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -965,7 +1185,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -985,15 +1225,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1003,7 +1243,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1075,7 +1316,7 @@
if ( $exec )
{
?>
-<?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:21:"message:GLOBAL_PUBLIC";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_PUBLIC'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_PUBLIC') ?><?php $attr8_escape=true ?><?php
+<?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:21:"message:GLOBAL_PUBLIC";s:6:"escape";s:4:"true";s:4:"type";s:6:"strong";}' ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_PUBLIC'),'escape'=>true,'type'=>'strong') ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_PUBLIC') ?><?php $attr8_escape=true ?><?php $attr8_type='strong' ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -1085,7 +1326,27 @@
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1105,15 +1366,15 @@
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1123,7 +1384,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php unset($attr8_type) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr7) ?><?php $attr8_debug_info = 'a:1:{s:7:"present";s:10:"releaseUrl";}' ?><?php $attr8 = array('present'=>'releaseUrl') ?><?php $attr8_present='releaseUrl' ?><?php
if ( isset($attr8_true) )
{
@@ -1185,7 +1447,7 @@
if ( $exec )
{
?>
-<?php unset($attr8) ?><?php unset($attr8_present) ?><?php $attr9_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:14:"var:releaseUrl";s:5:"class";s:0:"";}' ?><?php $attr9 = array('title'=>'','target'=>'_self','url'=>$releaseUrl,'class'=>'') ?><?php $attr9_title='' ?><?php $attr9_target='_self' ?><?php $attr9_url=$releaseUrl ?><?php $attr9_class='' ?><?php
+<?php unset($attr8) ?><?php unset($attr8_present) ?><?php $attr9_debug_info = 'a:4:{s:5:"title";s:27:"message:GLOBAL_RELEASE_DESC";s:6:"target";s:5:"_self";s:3:"url";s:14:"var:releaseUrl";s:5:"class";s:0:"";}' ?><?php $attr9 = array('title'=>lang('GLOBAL_RELEASE_DESC'),'target'=>'_self','url'=>$releaseUrl,'class'=>'') ?><?php $attr9_title=lang('GLOBAL_RELEASE_DESC') ?><?php $attr9_target='_self' ?><?php $attr9_url=$releaseUrl ?><?php $attr9_class='' ?><?php
$params = array();
if (!empty($attr9_var1) && isset($attr9_value1))
$params[$attr9_var1]=$attr9_value1;
@@ -1205,7 +1467,7 @@
$tmp_url = $attr9_url;
else
$tmp_url = Html::url($attr9_action,$attr9_subaction,!empty($attr9_id)?$attr9_id:$this->getRequestId(),$params);
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr9_class ?>" target="<?php echo $attr9_target ?>"<?php if (isset($attr9_accesskey)) echo ' accesskey="'.$attr9_accesskey.'"' ?> title="<?php echo $attr9_title ?>"><?php unset($attr9) ?><?php unset($attr9_title) ?><?php unset($attr9_target) ?><?php unset($attr9_url) ?><?php unset($attr9_class) ?><?php $attr10_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:22:"message:GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr10 = array('class'=>'text','text'=>lang('GLOBAL_RELEASE'),'escape'=>true) ?><?php $attr10_class='text' ?><?php $attr10_text=lang('GLOBAL_RELEASE') ?><?php $attr10_escape=true ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr9_class ?>" target="<?php echo $attr9_target ?>"<?php if (isset($attr9_accesskey)) echo ' accesskey="'.$attr9_accesskey.'"' ?> title="<?php echo $attr9_title ?>"><?php unset($attr9) ?><?php unset($attr9_title) ?><?php unset($attr9_target) ?><?php unset($attr9_url) ?><?php unset($attr9_class) ?><?php $attr10_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:22:"message:GLOBAL_RELEASE";s:6:"escape";s:4:"true";s:4:"type";s:6:"strong";}' ?><?php $attr10 = array('class'=>'text','text'=>lang('GLOBAL_RELEASE'),'escape'=>true,'type'=>'strong') ?><?php $attr10_class='text' ?><?php $attr10_text=lang('GLOBAL_RELEASE') ?><?php $attr10_escape=true ?><?php $attr10_type='strong' ?><?php
if ( isset($attr10_prefix)&& isset($attr10_key))
$attr10_key = $attr10_prefix.$attr10_key;
if ( isset($attr10_suffix)&& isset($attr10_key))
@@ -1215,7 +1477,27 @@
$attr10_title = lang($attr10_key.'_HELP');
else
$attr10_title = '';
-?><span class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php
+ if (empty($attr10_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr10_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php
$attr10_title = '';
if (!empty($attr10_array))
{
@@ -1235,15 +1517,15 @@
elseif (!empty($attr10_key))
$tmp_text = lang($attr10_key);
elseif (!empty($attr10_var))
- $tmp_text = isset($$attr10_var)?($attr10_escape?htmlentities($$attr10_var):$$attr10_var):'?'.$attr10_var.'?';
+ $tmp_text = isset($$attr10_var)?$$attr10_var:'?'.$attr10_var.'?';
elseif (!empty($attr10_raw))
$tmp_text = str_replace('_',' ',$attr10_raw);
elseif (!empty($attr10_value))
$tmp_text = $attr10_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr10_escape && empty($attr10_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr10_maxlength) && intval($attr10_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr10_maxlength) );
if (isset($attr10_accesskey))
@@ -1253,7 +1535,78 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr10) ?><?php unset($attr10_class) ?><?php unset($attr10_text) ?><?php unset($attr10_escape) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?></a><?php unset($attr8) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr10) ?><?php unset($attr10_class) ?><?php unset($attr10_text) ?><?php unset($attr10_escape) ?><?php unset($attr10_type) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?></a><?php unset($attr8) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?><?php if (!$last_exec) { ?>
+<?php unset($attr8) ?><?php $attr9_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:23:"message:GLOBAL_INACTIVE";s:6:"escape";s:4:"true";s:4:"type";s:8:"emphatic";}' ?><?php $attr9 = array('class'=>'text','text'=>lang('GLOBAL_INACTIVE'),'escape'=>true,'type'=>'emphatic') ?><?php $attr9_class='text' ?><?php $attr9_text=lang('GLOBAL_INACTIVE') ?><?php $attr9_escape=true ?><?php $attr9_type='emphatic' ?><?php
+ if ( isset($attr9_prefix)&& isset($attr9_key))
+ $attr9_key = $attr9_prefix.$attr9_key;
+ if ( isset($attr9_suffix)&& isset($attr9_key))
+ $attr9_key = $attr9_key.$attr9_suffix;
+ if(empty($attr9_title))
+ if (!empty($attr9_key))
+ $attr9_title = lang($attr9_key.'_HELP');
+ else
+ $attr9_title = '';
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ $attr9_title = '';
+ if (!empty($attr9_array))
+ {
+ $tmpArray = $$attr9_array;
+ if (!empty($attr9_var))
+ $tmp_text = $tmpArray[$attr9_var];
+ else
+ $tmp_text = lang($tmpArray[$attr9_text]);
+ }
+ elseif (!empty($attr9_text))
+ if ( isset($$attr9_text))
+ $tmp_text = lang($$attr9_text);
+ else
+ $tmp_text = lang($attr9_text);
+ elseif (!empty($attr9_textvar))
+ $tmp_text = lang($$attr9_textvar);
+ elseif (!empty($attr9_key))
+ $tmp_text = lang($attr9_key);
+ elseif (!empty($attr9_var))
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
+ elseif (!empty($attr9_raw))
+ $tmp_text = str_replace('_',' ',$attr9_raw);
+ elseif (!empty($attr9_value))
+ $tmp_text = $attr9_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
+ if (isset($attr9_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr9_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
+ }
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php unset($attr9_type) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1325,7 +1678,7 @@
if ( $exec )
{
?>
-<?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:21:"message:GLOBAL_ACTIVE";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_ACTIVE'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_ACTIVE') ?><?php $attr8_escape=true ?><?php
+<?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:21:"message:GLOBAL_ACTIVE";s:6:"escape";s:4:"true";s:4:"type";s:8:"emphatic";}' ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_ACTIVE'),'escape'=>true,'type'=>'emphatic') ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_ACTIVE') ?><?php $attr8_escape=true ?><?php $attr8_type='emphatic' ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -1335,7 +1688,27 @@
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1355,15 +1728,15 @@
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1373,7 +1746,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php unset($attr8_type) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr7) ?><?php $attr8_debug_info = 'a:1:{s:7:"present";s:6:"useUrl";}' ?><?php $attr8 = array('present'=>'useUrl') ?><?php $attr8_present='useUrl' ?><?php
if ( isset($attr8_true) )
{
@@ -1435,7 +1809,7 @@
if ( $exec )
{
?>
-<?php unset($attr8) ?><?php unset($attr8_present) ?><?php $attr9_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:10:"var:useUrl";s:5:"class";s:0:"";}' ?><?php $attr9 = array('title'=>'','target'=>'_self','url'=>$useUrl,'class'=>'') ?><?php $attr9_title='' ?><?php $attr9_target='_self' ?><?php $attr9_url=$useUrl ?><?php $attr9_class='' ?><?php
+<?php unset($attr8) ?><?php unset($attr8_present) ?><?php $attr9_debug_info = 'a:4:{s:5:"title";s:23:"message:GLOBAL_USE_DESC";s:6:"target";s:5:"_self";s:3:"url";s:10:"var:useUrl";s:5:"class";s:0:"";}' ?><?php $attr9 = array('title'=>lang('GLOBAL_USE_DESC'),'target'=>'_self','url'=>$useUrl,'class'=>'') ?><?php $attr9_title=lang('GLOBAL_USE_DESC') ?><?php $attr9_target='_self' ?><?php $attr9_url=$useUrl ?><?php $attr9_class='' ?><?php
$params = array();
if (!empty($attr9_var1) && isset($attr9_value1))
$params[$attr9_var1]=$attr9_value1;
@@ -1465,7 +1839,27 @@
$attr10_title = lang($attr10_key.'_HELP');
else
$attr10_title = '';
-?><span class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php
+ if (empty($attr10_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr10_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php
$attr10_title = '';
if (!empty($attr10_array))
{
@@ -1485,15 +1879,15 @@
elseif (!empty($attr10_key))
$tmp_text = lang($attr10_key);
elseif (!empty($attr10_var))
- $tmp_text = isset($$attr10_var)?($attr10_escape?htmlentities($$attr10_var):$$attr10_var):'?'.$attr10_var.'?';
+ $tmp_text = isset($$attr10_var)?$$attr10_var:'?'.$attr10_var.'?';
elseif (!empty($attr10_raw))
$tmp_text = str_replace('_',' ',$attr10_raw);
elseif (!empty($attr10_value))
$tmp_text = $attr10_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr10_escape && empty($attr10_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr10_maxlength) && intval($attr10_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr10_maxlength) );
if (isset($attr10_accesskey))
@@ -1503,7 +1897,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr10) ?><?php unset($attr10_class) ?><?php unset($attr10_text) ?><?php unset($attr10_escape) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?></a><?php unset($attr8) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr10) ?><?php unset($attr10_class) ?><?php unset($attr10_text) ?><?php unset($attr10_escape) ?><?php $attr8_debug_info = 'a:0:{}' ?><?php $attr8 = array() ?></a><?php unset($attr8) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/pageelement/diff.tpl.php b/themes/default/pages/html/pageelement/diff.tpl.php
@@ -26,23 +26,40 @@
<?php } ?>
</head>
<body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> >
-<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:3:{s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr2 = array('width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr2_width='93%' ?><?php $attr2_rowclasses='odd,even' ?><?php $attr2_columnclasses='1,2,3' ?><?php
+<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?php $attr2 = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php
+ if (empty($attr2_action))
+ $attr2_action = $actionName;
+ if (empty($attr2_subaction))
+ $attr2_subaction = $targetSubActionName;
+ if (empty($attr2_id))
+ $attr2_id = $this->getRequestId();
+?><form name="<?php echo $attr2_name ?>"
+ target="<?php echo $attr2_target ?>"
+ action="<?php echo Html::url( $attr2_action,$attr2_subaction,$attr2_id ) ?>"
+ method="<?php echo $attr2_method ?>"
+ enctype="<?php echo $attr2_enctype ?>" style="margin:0px;padding:0px;">
+<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" />
+<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" />
+<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php
+ if ( $conf['interface']['url_sessionid'] )
+ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
+?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3_debug_info = 'a:3:{s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php
$coloumn_widths=array();
- if (!empty($attr2_widths))
+ if (!empty($attr3_widths))
{
- $column_widths = explode(',',$attr2_widths);
- unset($attr2['widths']);
+ $column_widths = explode(',',$attr3_widths);
+ unset($attr3['widths']);
}
- if (!empty($attr2_rowclasses))
+ if (!empty($attr3_rowclasses))
{
- $row_classes = explode(',',$attr2_rowclasses);
+ $row_classes = explode(',',$attr3_rowclasses);
$row_class_idx = 999;
- unset($attr2['rowclasses']);
+ unset($attr3['rowclasses']);
}
- if (!empty($attr2_columnclasses))
+ if (!empty($attr3_columnclasses))
{
- $column_classes = explode(',',$attr2_columnclasses);
- unset($attr2['columnclasses']);
+ $column_classes = explode(',',$attr3_columnclasses);
+ unset($attr3['columnclasses']);
}
global $image_dir;
if (@$conf['interface']['application_mode'] )
@@ -52,13 +69,13 @@
else
{
echo '<br/><br/><br/><center>';
- echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr2_width.'">';
+ echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">';
}
if (!@$conf['interface']['application_mode'] )
{
echo '<tr><td class="menu">';
- if ( !empty($attr2_icon) )
- echo '<img src="'.$image_dir.'icon_'.$attr2_icon.IMG_ICON_EXT.'" align="left" border="0">';
+ if ( !empty($attr3_icon) )
+ echo '<img src="'.$image_dir.'icon_'.$attr3_icon.IMG_ICON_EXT.'" align="left" border="0">';
if ( !isset($path) || is_array($path) )
$path = array();
foreach( $path as $pathElement)
@@ -134,375 +151,1145 @@
<?php } ?>
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr2) ?><?php unset($attr2_width) ?><?php unset($attr2_rowclasses) ?><?php unset($attr2_columnclasses) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr3) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
$row_class=$row_classes[$row_class_idx-1];
- if (empty($attr3_class))
- $attr3_class=$row_class;
+ if (empty($attr4_class))
+ $attr4_class=$row_class;
global $cell_column_nr;
$cell_column_nr=0;
$column_class_idx = 999;
-?><tr class="<?php echo $attr3_class ?>"><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"colspan";s:1:"2";}' ?><?php $attr4 = array('colspan'=>'2') ?><?php $attr4_colspan='2' ?><?php
+?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
$column_class=$column_classes[$column_class_idx-1];
- if (empty($attr4_class))
- $attr4['class']=$column_class;
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) )
- $attr4['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_colspan) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_COMPARE";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_COMPARE','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_COMPARE' ?><?php $attr5_escape=true ?><?php
- if ( isset($attr5_prefix)&& isset($attr5_key))
- $attr5_key = $attr5_prefix.$attr5_key;
- if ( isset($attr5_suffix)&& isset($attr5_key))
- $attr5_key = $attr5_key.$attr5_suffix;
- if(empty($attr5_title))
- if (!empty($attr5_key))
- $attr5_title = lang($attr5_key.'_HELP');
- else
- $attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
- $attr5_title = '';
- if (!empty($attr5_array))
- {
- $tmpArray = $$attr5_array;
- if (!empty($attr5_var))
- $tmp_text = $tmpArray[$attr5_var];
- else
- $tmp_text = lang($tmpArray[$attr5_text]);
- }
- elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
- elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
- elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
- elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
- elseif (!empty($attr5_raw))
- $tmp_text = str_replace('_',' ',$attr5_raw);
- elseif (!empty($attr5_value))
- $tmp_text = $attr5_value;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_COMPARE";s:6:"escape";s:4:"true";s:4:"type";s:8:"emphatic";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_COMPARE','escape'=>true,'type'=>'emphatic') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_COMPARE' ?><?php $attr6_escape=true ?><?php $attr6_type='emphatic' ?><?php
+ if ( isset($attr6_prefix)&& isset($attr6_key))
+ $attr6_key = $attr6_prefix.$attr6_key;
+ if ( isset($attr6_suffix)&& isset($attr6_key))
+ $attr6_key = $attr6_key.$attr6_suffix;
+ if(empty($attr6_title))
+ if (!empty($attr6_key))
+ $attr6_title = lang($attr6_key.'_HELP');
+ else
+ $attr6_title = '';
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ $attr6_title = '';
+ if (!empty($attr6_array))
{
- $tmp_text = ' ';
+ $tmpArray = $$attr6_array;
+ if (!empty($attr6_var))
+ $tmp_text = $tmpArray[$attr6_var];
+ else
+ $tmp_text = lang($tmpArray[$attr6_text]);
}
- if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
- if (isset($attr5_accesskey))
+ elseif (!empty($attr6_text))
+ if ( isset($$attr6_text))
+ $tmp_text = lang($$attr6_text);
+ else
+ $tmp_text = lang($attr6_text);
+ elseif (!empty($attr6_textvar))
+ $tmp_text = lang($$attr6_textvar);
+ elseif (!empty($attr6_key))
+ $tmp_text = lang($attr6_key);
+ elseif (!empty($attr6_var))
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ elseif (!empty($attr6_raw))
+ $tmp_text = str_replace('_',' ',$attr6_raw);
+ elseif (!empty($attr6_value))
+ $tmp_text = $attr6_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
+ if (isset($attr6_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_' ?><?php $attr5_escape=true ?><?php
- if ( isset($attr5_prefix)&& isset($attr5_key))
- $attr5_key = $attr5_prefix.$attr5_key;
- if ( isset($attr5_suffix)&& isset($attr5_key))
- $attr5_key = $attr5_key.$attr5_suffix;
- if(empty($attr5_title))
- if (!empty($attr5_key))
- $attr5_title = lang($attr5_key.'_HELP');
- else
- $attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
- $attr5_title = '';
- if (!empty($attr5_array))
- {
- $tmpArray = $$attr5_array;
- if (!empty($attr5_var))
- $tmp_text = $tmpArray[$attr5_var];
- else
- $tmp_text = lang($tmpArray[$attr5_text]);
- }
- elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
- elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
- elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
- elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
- elseif (!empty($attr5_raw))
- $tmp_text = str_replace('_',' ',$attr5_raw);
- elseif (!empty($attr5_value))
- $tmp_text = $attr5_value;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php unset($attr6_type) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
+ if ( isset($attr6_prefix)&& isset($attr6_key))
+ $attr6_key = $attr6_prefix.$attr6_key;
+ if ( isset($attr6_suffix)&& isset($attr6_key))
+ $attr6_key = $attr6_key.$attr6_suffix;
+ if(empty($attr6_title))
+ if (!empty($attr6_key))
+ $attr6_title = lang($attr6_key.'_HELP');
+ else
+ $attr6_title = '';
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ $attr6_title = '';
+ if (!empty($attr6_array))
{
- $tmp_text = ' ';
+ $tmpArray = $$attr6_array;
+ if (!empty($attr6_var))
+ $tmp_text = $tmpArray[$attr6_var];
+ else
+ $tmp_text = lang($tmpArray[$attr6_text]);
}
- if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
- if (isset($attr5_accesskey))
+ elseif (!empty($attr6_text))
+ if ( isset($$attr6_text))
+ $tmp_text = lang($$attr6_text);
+ else
+ $tmp_text = lang($attr6_text);
+ elseif (!empty($attr6_textvar))
+ $tmp_text = lang($$attr6_textvar);
+ elseif (!empty($attr6_key))
+ $tmp_text = lang($attr6_key);
+ elseif (!empty($attr6_var))
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ elseif (!empty($attr6_raw))
+ $tmp_text = str_replace('_',' ',$attr6_raw);
+ elseif (!empty($attr6_value))
+ $tmp_text = $attr6_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
+ if (isset($attr6_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:6:"title1";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','var'=>'title1','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='title1' ?><?php $attr5_escape=true ?><?php
- if ( isset($attr5_prefix)&& isset($attr5_key))
- $attr5_key = $attr5_prefix.$attr5_key;
- if ( isset($attr5_suffix)&& isset($attr5_key))
- $attr5_key = $attr5_key.$attr5_suffix;
- if(empty($attr5_title))
- if (!empty($attr5_key))
- $attr5_title = lang($attr5_key.'_HELP');
- else
- $attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
- $attr5_title = '';
- if (!empty($attr5_array))
- {
- $tmpArray = $$attr5_array;
- if (!empty($attr5_var))
- $tmp_text = $tmpArray[$attr5_var];
- else
- $tmp_text = lang($tmpArray[$attr5_text]);
- }
- elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
- elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
- elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
- elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
- elseif (!empty($attr5_raw))
- $tmp_text = str_replace('_',' ',$attr5_raw);
- elseif (!empty($attr5_value))
- $tmp_text = $attr5_value;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:1:{s:4:"date";s:13:"var:date_left";}' ?><?php $attr6 = array('date'=>$date_left) ?><?php $attr6_date=$date_left ?><?php
+ global $conf;
+ $time = $attr6_date;
+ if ( $time==0)
+ echo lang('GLOBAL_UNKNOWN');
+ elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
+ echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
+ $sekunden = time()-$time;
+ $minuten = intval($sekunden/60);
+ $stunden = intval($minuten /60);
+ $tage = intval($stunden /24);
+ $monate = intval($tage /30);
+ $jahre = intval($monate /12);
+ echo '<span title="'.date(lang('DATE_FORMAT'),$time).'"">';
+ if ( $time==0)
+ echo lang('GLOBAL_UNKNOWN');
+ elseif ( !$conf['interface']['human_date_format'] )
+ echo date(lang('DATE_FORMAT'),$time);
+ elseif ( $sekunden == 1 )
+ echo $sekunden.' '.lang('GLOBAL_SECOND');
+ elseif ( $sekunden < 60 )
+ echo $sekunden.' '.lang('GLOBAL_SECONDS');
+ elseif ( $minuten == 1 )
+ echo $minuten.' '.lang('GLOBAL_MINUTE');
+ elseif ( $minuten < 60 )
+ echo $minuten.' '.lang('GLOBAL_MINUTES');
+ elseif ( $stunden == 1 )
+ echo $stunden.' '.lang('GLOBAL_HOUR');
+ elseif ( $stunden < 60 )
+ echo $stunden.' '.lang('GLOBAL_HOURS');
+ elseif ( $tage == 1 )
+ echo $tage.' '.lang('GLOBAL_DAY');
+ elseif ( $tage < 60 )
+ echo $tage.' '.lang('GLOBAL_DAYS');
+ elseif ( $monate == 1 )
+ echo $monate.' '.lang('GLOBAL_MONTH');
+ elseif ( $monate < 12 )
+ echo $monate.' '.lang('GLOBAL_MONTHS');
+ elseif ( $jahre == 1 )
+ echo $jahre.' '.lang('GLOBAL_YEAR');
+ else
+ echo $jahre.' '.lang('GLOBAL_YEARS');
+ echo '</span>';
+ }
+?><?php unset($attr6) ?><?php unset($attr6_date) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_WITH";s:6:"escape";s:4:"true";s:4:"type";s:8:"emphatic";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_WITH','escape'=>true,'type'=>'emphatic') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_WITH' ?><?php $attr6_escape=true ?><?php $attr6_type='emphatic' ?><?php
+ if ( isset($attr6_prefix)&& isset($attr6_key))
+ $attr6_key = $attr6_prefix.$attr6_key;
+ if ( isset($attr6_suffix)&& isset($attr6_key))
+ $attr6_key = $attr6_key.$attr6_suffix;
+ if(empty($attr6_title))
+ if (!empty($attr6_key))
+ $attr6_title = lang($attr6_key.'_HELP');
+ else
+ $attr6_title = '';
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ $attr6_title = '';
+ if (!empty($attr6_array))
+ {
+ $tmpArray = $$attr6_array;
+ if (!empty($attr6_var))
+ $tmp_text = $tmpArray[$attr6_var];
+ else
+ $tmp_text = lang($tmpArray[$attr6_text]);
+ }
+ elseif (!empty($attr6_text))
+ if ( isset($$attr6_text))
+ $tmp_text = lang($$attr6_text);
+ else
+ $tmp_text = lang($attr6_text);
+ elseif (!empty($attr6_textvar))
+ $tmp_text = lang($$attr6_textvar);
+ elseif (!empty($attr6_key))
+ $tmp_text = lang($attr6_key);
+ elseif (!empty($attr6_var))
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ elseif (!empty($attr6_raw))
+ $tmp_text = str_replace('_',' ',$attr6_raw);
+ elseif (!empty($attr6_value))
+ $tmp_text = $attr6_value;
+ else
$tmp_text = ' ';
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
+ if (isset($attr6_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
- if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
- if (isset($attr5_accesskey))
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php unset($attr6_type) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php
+ if ( isset($attr6_prefix)&& isset($attr6_key))
+ $attr6_key = $attr6_prefix.$attr6_key;
+ if ( isset($attr6_suffix)&& isset($attr6_key))
+ $attr6_key = $attr6_key.$attr6_suffix;
+ if(empty($attr6_title))
+ if (!empty($attr6_key))
+ $attr6_title = lang($attr6_key.'_HELP');
+ else
+ $attr6_title = '';
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ $attr6_title = '';
+ if (!empty($attr6_array))
+ {
+ $tmpArray = $$attr6_array;
+ if (!empty($attr6_var))
+ $tmp_text = $tmpArray[$attr6_var];
+ else
+ $tmp_text = lang($tmpArray[$attr6_text]);
+ }
+ elseif (!empty($attr6_text))
+ if ( isset($$attr6_text))
+ $tmp_text = lang($$attr6_text);
+ else
+ $tmp_text = lang($attr6_text);
+ elseif (!empty($attr6_textvar))
+ $tmp_text = lang($$attr6_textvar);
+ elseif (!empty($attr6_key))
+ $tmp_text = lang($attr6_key);
+ elseif (!empty($attr6_var))
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ elseif (!empty($attr6_raw))
+ $tmp_text = str_replace('_',' ',$attr6_raw);
+ elseif (!empty($attr6_value))
+ $tmp_text = $attr6_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
+ if (isset($attr6_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"colspan";s:1:"2";}' ?><?php $attr4 = array('colspan'=>'2') ?><?php $attr4_colspan='2' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:1:{s:4:"date";s:14:"var:date_right";}' ?><?php $attr6 = array('date'=>$date_right) ?><?php $attr6_date=$date_right ?><?php
+ global $conf;
+ $time = $attr6_date;
+ if ( $time==0)
+ echo lang('GLOBAL_UNKNOWN');
+ elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
+ echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
+ else
+ {
+ $sekunden = time()-$time;
+ $minuten = intval($sekunden/60);
+ $stunden = intval($minuten /60);
+ $tage = intval($stunden /24);
+ $monate = intval($tage /30);
+ $jahre = intval($monate /12);
+ echo '<span title="'.date(lang('DATE_FORMAT'),$time).'"">';
+ if ( $time==0)
+ echo lang('GLOBAL_UNKNOWN');
+ elseif ( !$conf['interface']['human_date_format'] )
+ echo date(lang('DATE_FORMAT'),$time);
+ elseif ( $sekunden == 1 )
+ echo $sekunden.' '.lang('GLOBAL_SECOND');
+ elseif ( $sekunden < 60 )
+ echo $sekunden.' '.lang('GLOBAL_SECONDS');
+ elseif ( $minuten == 1 )
+ echo $minuten.' '.lang('GLOBAL_MINUTE');
+ elseif ( $minuten < 60 )
+ echo $minuten.' '.lang('GLOBAL_MINUTES');
+ elseif ( $stunden == 1 )
+ echo $stunden.' '.lang('GLOBAL_HOUR');
+ elseif ( $stunden < 60 )
+ echo $stunden.' '.lang('GLOBAL_HOURS');
+ elseif ( $tage == 1 )
+ echo $tage.' '.lang('GLOBAL_DAY');
+ elseif ( $tage < 60 )
+ echo $tage.' '.lang('GLOBAL_DAYS');
+ elseif ( $monate == 1 )
+ echo $monate.' '.lang('GLOBAL_MONTH');
+ elseif ( $monate < 12 )
+ echo $monate.' '.lang('GLOBAL_MONTHS');
+ elseif ( $jahre == 1 )
+ echo $jahre.' '.lang('GLOBAL_YEAR');
+ else
+ echo $jahre.' '.lang('GLOBAL_YEARS');
+ echo '</span>';
+ }
+?><?php unset($attr6) ?><?php unset($attr6_date) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+ if (empty($attr4_class))
+ $attr4_class=$row_class;
+ global $cell_column_nr;
+ $cell_column_nr=0;
+ $column_class_idx = 999;
+?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:7:"colspan";s:1:"4";}' ?><?php $attr5 = array('colspan'=>'4') ?><?php $attr5_colspan='4' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
$column_class=$column_classes[$column_class_idx-1];
- if (empty($attr4_class))
- $attr4['class']=$column_class;
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
global $cell_column_nr;
$cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) )
- $attr4['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_colspan) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_WITH";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_WITH','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_WITH' ?><?php $attr5_escape=true ?><?php
- if ( isset($attr5_prefix)&& isset($attr5_key))
- $attr5_key = $attr5_prefix.$attr5_key;
- if ( isset($attr5_suffix)&& isset($attr5_key))
- $attr5_key = $attr5_key.$attr5_suffix;
- if(empty($attr5_title))
- if (!empty($attr5_key))
- $attr5_title = lang($attr5_key.'_HELP');
- else
- $attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
- $attr5_title = '';
- if (!empty($attr5_array))
- {
- $tmpArray = $$attr5_array;
- if (!empty($attr5_var))
- $tmp_text = $tmpArray[$attr5_var];
- else
- $tmp_text = lang($tmpArray[$attr5_text]);
- }
- elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
- elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
- elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
- elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
- elseif (!empty($attr5_raw))
- $tmp_text = str_replace('_',' ',$attr5_raw);
- elseif (!empty($attr5_value))
- $tmp_text = $attr5_value;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:4:"diff";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'diff','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='diff' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php
+ $attr4_list_tmp_key = $attr4_key;
+ $attr4_list_tmp_value = $attr4_value;
+ $attr4_list_extract = $attr4_extract;
+ unset($attr4_key);
+ unset($attr4_value);
+ if ( !isset($$attr4_list) || !is_array($$attr4_list) )
+ $$attr4_list = array();
+ foreach( $$attr4_list as $$attr4_list_tmp_key => $$attr4_list_tmp_value )
+ {
+ if ( $attr4_list_extract )
+ {
+ if ( !is_array($$attr4_list_tmp_value) )
+ {
+ print_r($$attr4_list_tmp_value);
+ die( 'not an array at key: '.$$attr4_list_tmp_key );
+ }
+ extract($$attr4_list_tmp_value);
+ }
+?><?php unset($attr4) ?><?php unset($attr4_list) ?><?php unset($attr4_extract) ?><?php unset($attr4_key) ?><?php unset($attr4_value) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:4:"diff";}' ?><?php $attr5 = array('class'=>'diff') ?><?php $attr5_class='diff' ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+ if (empty($attr5_class))
+ $attr5_class=$row_class;
+ global $cell_column_nr;
+ $cell_column_nr=0;
+ $column_class_idx = 999;
+?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:4:"left";}' ?><?php $attr6 = array('present'=>'left') ?><?php $attr6_present='left' ?><?php
+ if ( isset($attr6_true) )
+ {
+ if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
+ $exec = $$attr6_true == true;
+ else
+ $exec = $attr6_true == true;
+ }
+ elseif ( isset($attr6_false) )
+ {
+ if (gettype($attr6_false) === '' && gettype($attr6_false) === '1')
+ $exec = $$attr6_false == false;
+ else
+ $exec = $attr6_false == false;
+ }
+ elseif( isset($attr6_contains) )
+ $exec = in_array($attr6_value,explode(',',$attr6_contains));
+ elseif( isset($attr6_equals)&& isset($attr6_value) )
+ $exec = $attr6_equals == $attr6_value;
+ elseif( isset($attr6_lessthan)&& isset($attr6_value) )
+ $exec = intval($attr6_lessthan) > intval($attr6_value);
+ elseif( isset($attr6_greaterthan)&& isset($attr6_value) )
+ $exec = intval($attr6_greaterthan) < intval($attr6_value);
+ elseif ( isset($attr6_empty) )
+ {
+ if ( !isset($$attr6_empty) )
+ $exec = empty($attr6_empty);
+ elseif ( is_array($$attr6_empty) )
+ $exec = (count($$attr6_empty)==0);
+ elseif ( is_bool($$attr6_empty) )
+ $exec = true;
+ else
+ $exec = empty( $$attr6_empty );
+ }
+ elseif ( isset($attr6_present) )
+ {
+ $exec = isset($$attr6_present);
+ }
+ else
+ {
+ trigger_error("error in IF, assume: FALSE");
+ $exec = false;
+ }
+ if ( !empty($attr6_invert) )
+ $exec = !$exec;
+ if ( !empty($attr6_not) )
+ $exec = !$exec;
+ unset($attr6_true);
+ unset($attr6_false);
+ unset($attr6_notempty);
+ unset($attr6_empty);
+ unset($attr6_contains);
+ unset($attr6_present);
+ unset($attr6_invert);
+ unset($attr6_not);
+ unset($attr6_value);
+ unset($attr6_equals);
+ $last_exec = $exec;
+ if ( $exec )
+ {
+?>
+<?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7_debug_info = 'a:2:{s:5:"width";s:2:"5%";s:5:"class";s:4:"line";}' ?><?php $attr7 = array('width'=>'5%','class'=>'line') ?><?php $attr7_width='5%' ?><?php $attr7_class='line' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr7_class))
+ $attr7['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) )
+ $attr7['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:18:"arrayvar:left:line";s:6:"escape";s:4:"true";s:4:"type";s:2:"tt";}' ?><?php $attr8 = array('class'=>'text','text'=>@$left[line],'escape'=>true,'type'=>'tt') ?><?php $attr8_class='text' ?><?php $attr8_text=@$left[line] ?><?php $attr8_escape=true ?><?php $attr8_type='tt' ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
{
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
+ }
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
$tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
- if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
- if (isset($attr5_accesskey))
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php unset($attr8_type) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:5:"width";s:3:"45%";s:5:"class";s:18:"arrayvar:left:type";}' ?><?php $attr7 = array('width'=>'45%','class'=>@$left[type]) ?><?php $attr7_width='45%' ?><?php $attr7_class=@$left[type] ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr7_class))
+ $attr7['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) )
+ $attr7['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:18:"arrayvar:left:text";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>@$left[text],'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=@$left[text] ?><?php $attr8_escape=true ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
+ {
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
+ }
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_' ?><?php $attr5_escape=true ?><?php
- if ( isset($attr5_prefix)&& isset($attr5_key))
- $attr5_key = $attr5_prefix.$attr5_key;
- if ( isset($attr5_suffix)&& isset($attr5_key))
- $attr5_key = $attr5_key.$attr5_suffix;
- if(empty($attr5_title))
- if (!empty($attr5_key))
- $attr5_title = lang($attr5_key.'_HELP');
- else
- $attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
- $attr5_title = '';
- if (!empty($attr5_array))
- {
- $tmpArray = $$attr5_array;
- if (!empty($attr5_var))
- $tmp_text = $tmpArray[$attr5_var];
- else
- $tmp_text = lang($tmpArray[$attr5_text]);
- }
- elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
- elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
- elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
- elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
- elseif (!empty($attr5_raw))
- $tmp_text = str_replace('_',' ',$attr5_raw);
- elseif (!empty($attr5_value))
- $tmp_text = $attr5_value;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+<?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"width";s:3:"50%";s:5:"class";s:4:"help";s:7:"colspan";s:1:"2";}' ?><?php $attr7 = array('width'=>'50%','class'=>'help','colspan'=>'2') ?><?php $attr7_width='50%' ?><?php $attr7_class='help' ?><?php $attr7_colspan='2' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr7_class))
+ $attr7['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) )
+ $attr7['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php unset($attr7_colspan) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
{
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
+ }
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
$tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
- if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
- if (isset($attr5_accesskey))
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:7:"present";s:5:"right";}' ?><?php $attr6 = array('present'=>'right') ?><?php $attr6_present='right' ?><?php
+ if ( isset($attr6_true) )
+ {
+ if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
+ $exec = $$attr6_true == true;
+ else
+ $exec = $attr6_true == true;
+ }
+ elseif ( isset($attr6_false) )
+ {
+ if (gettype($attr6_false) === '' && gettype($attr6_false) === '1')
+ $exec = $$attr6_false == false;
+ else
+ $exec = $attr6_false == false;
+ }
+ elseif( isset($attr6_contains) )
+ $exec = in_array($attr6_value,explode(',',$attr6_contains));
+ elseif( isset($attr6_equals)&& isset($attr6_value) )
+ $exec = $attr6_equals == $attr6_value;
+ elseif( isset($attr6_lessthan)&& isset($attr6_value) )
+ $exec = intval($attr6_lessthan) > intval($attr6_value);
+ elseif( isset($attr6_greaterthan)&& isset($attr6_value) )
+ $exec = intval($attr6_greaterthan) < intval($attr6_value);
+ elseif ( isset($attr6_empty) )
+ {
+ if ( !isset($$attr6_empty) )
+ $exec = empty($attr6_empty);
+ elseif ( is_array($$attr6_empty) )
+ $exec = (count($$attr6_empty)==0);
+ elseif ( is_bool($$attr6_empty) )
+ $exec = true;
+ else
+ $exec = empty( $$attr6_empty );
+ }
+ elseif ( isset($attr6_present) )
+ {
+ $exec = isset($$attr6_present);
+ }
+ else
+ {
+ trigger_error("error in IF, assume: FALSE");
+ $exec = false;
+ }
+ if ( !empty($attr6_invert) )
+ $exec = !$exec;
+ if ( !empty($attr6_not) )
+ $exec = !$exec;
+ unset($attr6_true);
+ unset($attr6_false);
+ unset($attr6_notempty);
+ unset($attr6_empty);
+ unset($attr6_contains);
+ unset($attr6_present);
+ unset($attr6_invert);
+ unset($attr6_not);
+ unset($attr6_value);
+ unset($attr6_equals);
+ $last_exec = $exec;
+ if ( $exec )
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey));
+?>
+<?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7_debug_info = 'a:2:{s:5:"width";s:2:"5%";s:5:"class";s:4:"line";}' ?><?php $attr7 = array('width'=>'5%','class'=>'line') ?><?php $attr7_width='5%' ?><?php $attr7_class='line' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr7_class))
+ $attr7['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) )
+ $attr7['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8_debug_info = 'a:4:{s:5:"class";s:4:"text";s:4:"text";s:19:"arrayvar:right:line";s:6:"escape";s:4:"true";s:4:"type";s:2:"tt";}' ?><?php $attr8 = array('class'=>'text','text'=>@$right[line],'escape'=>true,'type'=>'tt') ?><?php $attr8_class='text' ?><?php $attr8_text=@$right[line] ?><?php $attr8_escape=true ?><?php $attr8_type='tt' ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
+ {
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
+ }
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:6:"title2";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','var'=>'title2','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='title2' ?><?php $attr5_escape=true ?><?php
- if ( isset($attr5_prefix)&& isset($attr5_key))
- $attr5_key = $attr5_prefix.$attr5_key;
- if ( isset($attr5_suffix)&& isset($attr5_key))
- $attr5_key = $attr5_key.$attr5_suffix;
- if(empty($attr5_title))
- if (!empty($attr5_key))
- $attr5_title = lang($attr5_key.'_HELP');
- else
- $attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
- $attr5_title = '';
- if (!empty($attr5_array))
- {
- $tmpArray = $$attr5_array;
- if (!empty($attr5_var))
- $tmp_text = $tmpArray[$attr5_var];
- else
- $tmp_text = lang($tmpArray[$attr5_text]);
- }
- elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
- elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
- elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
- elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
- elseif (!empty($attr5_raw))
- $tmp_text = str_replace('_',' ',$attr5_raw);
- elseif (!empty($attr5_value))
- $tmp_text = $attr5_value;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php unset($attr8_type) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:5:"width";s:3:"45%";s:5:"class";s:19:"arrayvar:right:type";}' ?><?php $attr7 = array('width'=>'45%','class'=>@$right[type]) ?><?php $attr7_width='45%' ?><?php $attr7_class=@$right[type] ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr7_class))
+ $attr7['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) )
+ $attr7['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:19:"arrayvar:right:text";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>@$right[text],'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=@$right[text] ?><?php $attr8_escape=true ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
{
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
+ }
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
$tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
+ {
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
+ if ( $pos !== false )
+ $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
+ }
+ echo $tmp_text;
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+<?php unset($attr6) ?><?php $attr7_debug_info = 'a:3:{s:5:"width";s:3:"50%";s:5:"class";s:4:"help";s:7:"colspan";s:1:"2";}' ?><?php $attr7 = array('width'=>'50%','class'=>'help','colspan'=>'2') ?><?php $attr7_width='50%' ?><?php $attr7_class='help' ?><?php $attr7_colspan='2' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr7_class))
+ $attr7['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) )
+ $attr7['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php unset($attr7_colspan) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php
+ if ( isset($attr8_prefix)&& isset($attr8_key))
+ $attr8_key = $attr8_prefix.$attr8_key;
+ if ( isset($attr8_suffix)&& isset($attr8_key))
+ $attr8_key = $attr8_key.$attr8_suffix;
+ if(empty($attr8_title))
+ if (!empty($attr8_key))
+ $attr8_title = lang($attr8_key.'_HELP');
+ else
+ $attr8_title = '';
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ $attr8_title = '';
+ if (!empty($attr8_array))
+ {
+ $tmpArray = $$attr8_array;
+ if (!empty($attr8_var))
+ $tmp_text = $tmpArray[$attr8_var];
+ else
+ $tmp_text = lang($tmpArray[$attr8_text]);
}
- if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
- if (isset($attr5_accesskey))
+ elseif (!empty($attr8_text))
+ if ( isset($$attr8_text))
+ $tmp_text = lang($$attr8_text);
+ else
+ $tmp_text = lang($attr8_text);
+ elseif (!empty($attr8_textvar))
+ $tmp_text = lang($$attr8_textvar);
+ elseif (!empty($attr8_key))
+ $tmp_text = lang($attr8_key);
+ elseif (!empty($attr8_var))
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
+ elseif (!empty($attr8_raw))
+ $tmp_text = str_replace('_',' ',$attr8_raw);
+ elseif (!empty($attr8_value))
+ $tmp_text = $attr8_value;
+ else
+ $tmp_text = ' ';
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
+ if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
+ if (isset($attr8_accesskey))
{
- $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey));
+ $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey));
if ( $pos !== false )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $fx = '';
-if (count($text1) > 0)
-{
-$i=0;
-while( isset($text1[$i]) || isset($text2[$i]) )
-{
-$fx = '';
-?>
-<tr>
-<?php
-if ( isset($text1[$i]['text']) )
-{
-?>
-<td class="<?php echo $fx ?>" width="5%" ><?php echo $text1[$i]['line'] ?></td>
-<td class="diff_<?php echo $text1[$i]['type'] ?>" width="45%"><?php echo $text1[$i]['text'] ?></td>
-<?php
-}
-else
-{
-?>
-<td colspan="2" class="help" with="50%"> </td>
-<?php
-}
-if ( isset($text2[$i]['text']) )
-{
-?>
-<td class="<?php echo $fx ?>" width="5%" ><?php echo $text2[$i]['line'] ?></td>
-<td class="diff_<?php echo $text2[$i]['type'] ?>" width="45%"><?php echo $text2[$i]['text'] ?></td>
-<?php
-}
-else
-{
-?>
-<td colspan="2" class="help" with="50%"> </td>
-<?php
-}
-?>
-</tr>
-<?php
-$i++;
-}
-}
-else
-{ ?>
-<tr>
-<td class="f1" colspan="4"><strong><?php echo lang('GLOBAL_NO_DIFFERENCES_FOUND') ?></strong></td>
-</tr>
-<?php } ?>
-<?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:3:"var";s:4:"left";}' ?><?php $attr5 = array('var'=>'left') ?><?php $attr5_var='left' ?><?php
+ if (!isset($attr5_value))
+ unset($$attr5_var);
+ elseif (isset($attr5_key))
+ $$attr5_var = $attr5_value[$attr5_key];
+ else
+ $$attr5_var = $attr5_value;
+?><?php unset($attr5) ?><?php unset($attr5_var) ?><?php $attr5_debug_info = 'a:1:{s:3:"var";s:5:"right";}' ?><?php $attr5 = array('var'=>'right') ?><?php $attr5_var='right' ?><?php
+ if (!isset($attr5_value))
+ unset($$attr5_var);
+ elseif (isset($attr5_key))
+ $$attr5_var = $attr5_value[$attr5_key];
+ else
+ $$attr5_var = $attr5_value;
+?><?php unset($attr5) ?><?php unset($attr5_var) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $row_class=$row_classes[$row_class_idx-1];
+ if (empty($attr4_class))
+ $attr4_class=$row_class;
+ global $cell_column_nr;
+ $cell_column_nr=0;
+ $column_class_idx = 999;
+?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"4";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'4') ?><?php $attr5_class='act' ?><?php $attr5_colspan='4' ?><?php
+ $column_class_idx++;
+ if ($column_class_idx > count($column_classes))
+ $column_class_idx=1;
+ $column_class=$column_classes[$column_class_idx-1];
+ if (empty($attr5_class))
+ $attr5['class']=$column_class;
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) )
+ $attr5['width']=$column_widths[$cell_column_nr-1];
+?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:6:"submit";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:11:"BUTTON_BACK";}' ?><?php $attr6 = array('type'=>'submit','class'=>'ok','value'=>'ok','text'=>'BUTTON_BACK') ?><?php $attr6_type='submit' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='BUTTON_BACK' ?><?php
+ if ($attr6_type=='ok')
+ $attr6_type = 'submit';
+ if (isset($attr6_src))
+ $attr6_type = 'image';
+ else
+ $attr6_src = '';
+?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value=" <?php echo lang($attr6_text) ?> " /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table>
</td>
</tr>
</table>
@@ -514,5 +1301,6 @@ else
<?php $dur = time()-START_TIME;
echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center>
<?php } ?>
+<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form>
<?php unset($attr1) ?><?php $attr0_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body>
</html><?php unset($attr0) ?>
\ No newline at end of file
diff --git a/themes/default/pages/html/pageelement/edit.tpl.php b/themes/default/pages/html/pageelement/edit.tpl.php
@@ -186,7 +186,27 @@ if ($attr3_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -206,15 +226,15 @@ if ($attr3_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -224,7 +244,8 @@ if ($attr3_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:6:"equals";s:4:"date";s:5:"value";s:8:"var:type";}' ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:6:"equals";s:4:"date";s:5:"value";s:8:"var:type";}' ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -583,6 +604,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -695,6 +717,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -899,6 +922,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -1169,7 +1193,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1189,15 +1233,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1207,7 +1251,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -1217,7 +1262,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1237,15 +1302,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1255,7 +1320,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -1357,7 +1423,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1377,15 +1463,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1395,7 +1481,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -1405,7 +1492,27 @@ if ( $attr7_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1425,15 +1532,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1443,7 +1550,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/pageelement/export.tpl.php b/themes/default/pages/html/pageelement/export.tpl.php
@@ -177,6 +177,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/pageelement/import.tpl.php b/themes/default/pages/html/pageelement/import.tpl.php
@@ -177,6 +177,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/pageelement/link.tpl.php b/themes/default/pages/html/pageelement/link.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -246,6 +267,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -510,7 +532,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -530,15 +572,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -548,7 +590,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_RELEASE' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_RELEASE' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -558,7 +601,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -578,15 +641,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -596,7 +659,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -698,7 +762,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -718,15 +802,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -736,7 +820,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr8_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?php $attr8 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr8_escape=true ?><?php
if ( isset($attr8_prefix)&& isset($attr8_key))
$attr8_key = $attr8_prefix.$attr8_key;
if ( isset($attr8_suffix)&& isset($attr8_key))
@@ -746,7 +831,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -766,15 +871,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -784,7 +889,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/pageelement/show.tpl.php b/themes/default/pages/html/pageelement/show.tpl.php
@@ -165,7 +165,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -185,15 +205,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -203,7 +223,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/profile/confirmmail.tpl.php b/themes/default/pages/html/profile/confirmmail.tpl.php
@@ -203,7 +203,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -223,15 +243,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -241,7 +261,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/profile/edit.tpl.php b/themes/default/pages/html/profile/edit.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -369,7 +432,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -389,15 +472,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -407,7 +490,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -459,7 +543,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -479,15 +583,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -497,7 +601,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -543,7 +648,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -563,15 +688,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -581,7 +706,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -627,7 +753,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -647,15 +793,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -665,7 +811,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -711,7 +858,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -731,15 +898,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -749,7 +916,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -765,6 +933,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/profile/groups.tpl.php b/themes/default/pages/html/profile/groups.tpl.php
@@ -184,7 +184,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -204,15 +224,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -222,7 +242,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/profile/mail.tpl.php b/themes/default/pages/html/profile/mail.tpl.php
@@ -224,7 +224,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -244,15 +264,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -262,7 +282,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/profile/pwchange.tpl.php b/themes/default/pages/html/profile/pwchange.tpl.php
@@ -224,7 +224,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -244,15 +264,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -262,7 +282,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -325,7 +346,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -345,15 +386,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -363,7 +404,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -405,7 +447,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -425,15 +487,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -443,7 +505,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/project/edit.tpl.php b/themes/default/pages/html/project/edit.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -350,7 +392,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -370,15 +432,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -388,7 +450,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -455,7 +518,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -475,15 +558,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -493,7 +576,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -560,7 +644,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -580,15 +684,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -598,7 +702,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -660,7 +765,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -680,15 +805,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -698,7 +823,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -739,7 +865,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -759,15 +905,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -777,7 +923,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/project/export.tpl.php b/themes/default/pages/html/project/export.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'50%','class'=>'fx') ?><?php $attr5_width='50%' ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('width'=>'50%','class'=>'fx') ?><?php $attr5_width='50%' ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -236,6 +257,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/project/listing.tpl.php b/themes/default/pages/html/project/listing.tpl.php
@@ -216,7 +216,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -236,15 +256,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -254,7 +274,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -295,7 +316,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -315,15 +356,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -333,7 +374,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/project/remove.tpl.php b/themes/default/pages/html/project/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -310,7 +352,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -330,15 +392,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -348,7 +410,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -400,7 +463,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -420,15 +503,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -438,7 +521,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/search/content.tpl.php b/themes/default/pages/html/search/content.tpl.php
@@ -189,7 +189,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -209,15 +229,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -227,7 +247,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -243,6 +264,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -300,7 +322,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -320,15 +362,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -338,7 +380,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/search/prop.tpl.php b/themes/default/pages/html/search/prop.tpl.php
@@ -210,7 +210,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -230,15 +250,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -248,7 +268,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:15:"lastchange_user";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'lastchange_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='lastchange_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:15:"lastchange_user";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'lastchange_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='lastchange_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
if ( isset($$attr6_name) )
$attr6_tmp_default = $$attr6_name;
elseif ( isset($attr6_default) )
@@ -265,7 +286,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -285,15 +326,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -303,7 +344,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -319,6 +361,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
@@ -397,7 +440,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -417,15 +480,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -435,7 +498,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:4:"name";s:7:"default";s:4:"true";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'name','default'=>true,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='name' ?><?php $attr6_default=true ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:4:"name";s:7:"default";s:4:"true";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'name','default'=>true,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='name' ?><?php $attr6_default=true ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
if ( isset($$attr6_name) )
$attr6_tmp_default = $$attr6_name;
elseif ( isset($attr6_default) )
@@ -452,7 +516,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -472,15 +556,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -490,7 +574,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:11:"description";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'description','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='description' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:11:"description";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'description','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='description' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
if ( isset($$attr6_name) )
$attr6_tmp_default = $$attr6_name;
elseif ( isset($attr6_default) )
@@ -507,7 +592,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -527,15 +632,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -545,7 +650,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:8:"filename";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'filename','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='filename' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:8:"filename";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'filename','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='filename' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php
if ( isset($$attr6_name) )
$attr6_tmp_default = $$attr6_name;
elseif ( isset($attr6_default) )
@@ -562,7 +668,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -582,15 +708,15 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -600,7 +726,8 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/search/result.tpl.php b/themes/default/pages/html/search/result.tpl.php
@@ -216,7 +216,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -236,15 +256,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -254,7 +274,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -271,7 +292,17 @@ if (isset($attr7_elementtype)) {
if ( $time==0)
echo lang('GLOBAL_UNKNOWN');
elseif ( !$conf['interface']['human_date_format'] )
+ {
+ echo '<span title="';
+ $dl = date(lang('DATE_FORMAT_LONG'),$time);
+ $dl = str_replace('{weekday}',lang('DATE_WEEKDAY'.strval(date('w',$time))),$dl);
+ $dl = str_replace('{month}' ,lang('DATE_MONTH' .strval(date('n',$time))),$dl);
+ echo $dl;
+ unset($dl);
+ echo '">';
echo date(lang('DATE_FORMAT'),$time);
+ echo '</span>';
+ }
else
{
$sekunden = time()-$time;
diff --git a/themes/default/pages/html/template/add.tpl.php b/themes/default/pages/html/template/add.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -320,6 +362,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/template/addel.tpl.php b/themes/default/pages/html/template/addel.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -266,7 +287,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -286,15 +327,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -304,7 +345,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -346,7 +388,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -366,15 +428,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -384,7 +446,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -407,6 +470,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/template/edit.tpl.php b/themes/default/pages/html/template/edit.tpl.php
@@ -166,7 +166,27 @@
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -186,15 +206,15 @@
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -204,7 +224,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><code>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><code>
<?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
diff --git a/themes/default/pages/html/template/el.tpl.php b/themes/default/pages/html/template/el.tpl.php
@@ -216,7 +216,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -236,15 +256,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -254,7 +274,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -275,7 +296,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -295,15 +336,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -313,7 +354,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_prefix) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:5:"empty";s:2:"el";}' ?><?php $attr3 = array('empty'=>'el') ?><?php $attr3_empty='el' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_prefix) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:5:"empty";s:2:"el";}' ?><?php $attr3 = array('empty'=>'el') ?><?php $attr3_empty='el' ?><?php
if ( isset($attr3_true) )
{
if (gettype($attr3_true) === '' && gettype($attr3_true) === '1')
@@ -405,7 +447,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -425,15 +487,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -443,7 +505,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/template/extension.tpl.php b/themes/default/pages/html/template/extension.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/template/listing.tpl.php b/themes/default/pages/html/template/listing.tpl.php
@@ -204,7 +204,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -224,15 +244,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -242,7 +262,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:5:"empty";s:9:"templates";}' ?><?php $attr3 = array('empty'=>'templates') ?><?php $attr3_empty='templates' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:5:"empty";s:9:"templates";}' ?><?php $attr3 = array('empty'=>'templates') ?><?php $attr3_empty='templates' ?><?php
if ( isset($attr3_true) )
{
if (gettype($attr3_true) === '' && gettype($attr3_true) === '1')
@@ -334,7 +355,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -354,15 +395,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -372,7 +413,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/template/name.tpl.php b/themes/default/pages/html/template/name.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
diff --git a/themes/default/pages/html/template/pages.tpl.php b/themes/default/pages/html/template/pages.tpl.php
@@ -204,7 +204,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -224,15 +244,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -242,7 +262,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/template/remove.tpl.php b/themes/default/pages/html/template/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -320,7 +362,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -340,15 +402,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -358,7 +420,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/template/srcelement.tpl.php b/themes/default/pages/html/template/srcelement.tpl.php
@@ -259,6 +259,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -386,6 +387,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -513,6 +515,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
@@ -640,6 +643,7 @@ if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_
?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php
if (count($$attr7_list)<=1) echo ' disabled="disabled"';
if ($attr7_multiple) echo ' multiple="multiple"';
+if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr7_size).'"';
?>><?php
$attr7_tmp_list = $$attr7_list;
diff --git a/themes/default/pages/html/title/show.tpl.php b/themes/default/pages/html/title/show.tpl.php
@@ -97,7 +97,27 @@ if (isset($attr5_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -117,15 +137,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -135,7 +155,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_-_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_-_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_-_' ?><?php $attr5_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:3:"_-_";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_-_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_-_' ?><?php $attr5_escape=true ?><?php
if ( isset($attr5_prefix)&& isset($attr5_key))
$attr5_key = $attr5_prefix.$attr5_key;
if ( isset($attr5_suffix)&& isset($attr5_key))
@@ -145,7 +166,27 @@ if (isset($attr5_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -165,15 +206,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -183,7 +224,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:9:"cms_title";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','var'=>'cms_title','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='cms_title' ?><?php $attr5_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:9:"cms_title";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','var'=>'cms_title','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='cms_title' ?><?php $attr5_escape=true ?><?php
if ( isset($attr5_prefix)&& isset($attr5_key))
$attr5_key = $attr5_prefix.$attr5_key;
if ( isset($attr5_suffix)&& isset($attr5_key))
@@ -193,7 +235,27 @@ if (isset($attr5_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -213,15 +275,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -231,7 +293,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:3:{s:5:"width";s:3:"40%";s:5:"style";s:19:":text-align:center;";s:5:"class";s:5:"title";}' ?><?php $attr4 = array('width'=>'40%','style'=>'text-align:center;','class'=>'title') ?><?php $attr4_width='40%' ?><?php $attr4_style='text-align:center;' ?><?php $attr4_class='title' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:3:{s:5:"width";s:3:"40%";s:5:"style";s:19:":text-align:center;";s:5:"class";s:5:"title";}' ?><?php $attr4 = array('width'=>'40%','style'=>'text-align:center;','class'=>'title') ?><?php $attr4_width='40%' ?><?php $attr4_style='text-align:center;' ?><?php $attr4_class='title' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -313,7 +376,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -333,15 +416,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -351,7 +434,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:7:"present";s:9:"modelname";}' ?><?php $attr5 = array('present'=>'modelname') ?><?php $attr5_present='modelname' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:7:"present";s:9:"modelname";}' ?><?php $attr5 = array('present'=>'modelname') ?><?php $attr5_present='modelname' ?><?php
if ( isset($attr5_true) )
{
if (gettype($attr5_true) === '' && gettype($attr5_true) === '1')
@@ -422,7 +506,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -442,15 +546,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -460,7 +564,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:13:"message:model";s:5:"class";s:4:"text";s:4:"text";s:13:"var:modelname";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('title'=>lang('model'),'class'=>'text','text'=>$modelname,'escape'=>true) ?><?php $attr6_title=lang('model') ?><?php $attr6_class='text' ?><?php $attr6_text=$modelname ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:13:"message:model";s:5:"class";s:4:"text";s:4:"text";s:13:"var:modelname";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('title'=>lang('model'),'class'=>'text','text'=>$modelname,'escape'=>true) ?><?php $attr6_title=lang('model') ?><?php $attr6_class='text' ?><?php $attr6_text=$modelname ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -470,7 +575,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -490,15 +615,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -508,7 +633,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:",";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>',','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=',' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:",";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>',','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=',' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -518,7 +644,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -538,15 +684,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -556,7 +702,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:16:"message:language";s:5:"class";s:4:"text";s:4:"text";s:16:"var:languagename";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('title'=>lang('language'),'class'=>'text','text'=>$languagename,'escape'=>true) ?><?php $attr6_title=lang('language') ?><?php $attr6_class='text' ?><?php $attr6_text=$languagename ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:4:{s:5:"title";s:16:"message:language";s:5:"class";s:4:"text";s:4:"text";s:16:"var:languagename";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('title'=>lang('language'),'class'=>'text','text'=>$languagename,'escape'=>true) ?><?php $attr6_title=lang('language') ?><?php $attr6_class='text' ?><?php $attr6_text=$languagename ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -566,7 +713,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -586,15 +753,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -604,7 +771,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:")";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:")";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -614,7 +782,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -634,15 +822,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -652,7 +840,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:3:{s:5:"width";s:3:"30%";s:5:"style";s:18:":text-align:right;";s:5:"class";s:5:"title";}' ?><?php $attr4 = array('width'=>'30%','style'=>'text-align:right;','class'=>'title') ?><?php $attr4_width='30%' ?><?php $attr4_style='text-align:right;' ?><?php $attr4_class='title' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4_debug_info = 'a:3:{s:5:"width";s:3:"30%";s:5:"style";s:18:":text-align:right;";s:5:"class";s:5:"title";}' ?><?php $attr4 = array('width'=>'30%','style'=>'text-align:right;','class'=>'title') ?><?php $attr4_width='30%' ?><?php $attr4_style='text-align:right;' ?><?php $attr4_class='title' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -705,7 +894,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -725,15 +934,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -743,7 +952,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"_(";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_(' ?><?php $attr5_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"_(";s:6:"escape";s:4:"true";}' ?><?php $attr5 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_(' ?><?php $attr5_escape=true ?><?php
if ( isset($attr5_prefix)&& isset($attr5_key))
$attr5_key = $attr5_prefix.$attr5_key;
if ( isset($attr5_suffix)&& isset($attr5_key))
@@ -753,7 +963,27 @@ if (isset($attr5_elementtype)) {
$attr5_title = lang($attr5_key.'_HELP');
else
$attr5_title = '';
-?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
+ if (empty($attr5_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr5_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
if (!empty($attr5_array))
{
@@ -773,15 +1003,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr5_key))
$tmp_text = lang($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
elseif (!empty($attr5_raw))
$tmp_text = str_replace('_',' ',$attr5_raw);
elseif (!empty($attr5_value))
$tmp_text = $attr5_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr5_escape && empty($attr5_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) );
if (isset($attr5_accesskey))
@@ -791,7 +1021,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:4:{s:5:"title";s:25:"message:USER_PROFILE_DESC";s:6:"target";s:13:"cms_main_main";s:3:"url";s:15:"var:profile_url";s:5:"class";s:0:"";}' ?><?php $attr5 = array('title'=>lang('USER_PROFILE_DESC'),'target'=>'cms_main_main','url'=>$profile_url,'class'=>'') ?><?php $attr5_title=lang('USER_PROFILE_DESC') ?><?php $attr5_target='cms_main_main' ?><?php $attr5_url=$profile_url ?><?php $attr5_class='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5_debug_info = 'a:4:{s:5:"title";s:25:"message:USER_PROFILE_DESC";s:6:"target";s:13:"cms_main_main";s:3:"url";s:15:"var:profile_url";s:5:"class";s:0:"";}' ?><?php $attr5 = array('title'=>lang('USER_PROFILE_DESC'),'target'=>'cms_main_main','url'=>$profile_url,'class'=>'') ?><?php $attr5_title=lang('USER_PROFILE_DESC') ?><?php $attr5_target='cms_main_main' ?><?php $attr5_url=$profile_url ?><?php $attr5_class='' ?><?php
$params = array();
if (!empty($attr5_var1) && isset($attr5_value1))
$params[$attr5_var1]=$attr5_value1;
@@ -821,7 +1052,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -841,15 +1092,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -859,7 +1110,8 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:")";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:")";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -869,7 +1121,27 @@ if (isset($attr5_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -889,15 +1161,15 @@ if (isset($attr5_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -907,5 +1179,6 @@ if (isset($attr5_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></table><?php unset($attr1) ?><?php $attr0_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></table><?php unset($attr1) ?><?php $attr0_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body>
</html><?php unset($attr0) ?>
\ No newline at end of file
diff --git a/themes/default/pages/html/treetitle/show.tpl.php b/themes/default/pages/html/treetitle/show.tpl.php
@@ -197,7 +197,27 @@ if (isset($attr6_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -217,15 +237,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -235,7 +255,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:4:"type";s:7:"filesep";}' ?><?php $attr7 = array('type'=>'filesep') ?><?php $attr7_type='filesep' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:4:"type";s:7:"filesep";}' ?><?php $attr7 = array('type'=>'filesep') ?><?php $attr7_type='filesep' ?><?php
if ($attr7_type=='filesep')
echo ' <strong>»</strong> ';
else
@@ -250,7 +271,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -270,15 +311,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -288,7 +329,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -419,7 +461,27 @@ if (isset($attr6_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -439,15 +501,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -457,7 +519,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_accesskey) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_accesskey) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php if (!$last_exec) { ?>
<?php unset($attr6) ?><?php $attr7_debug_info = 'a:4:{s:5:"class";s:13:"menu_disabled";s:4:"text";s:8:"var:text";s:9:"accesskey";s:14:"messagevar:key";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'menu_disabled','text'=>$text,'accesskey'=>lang($key),'escape'=>true) ?><?php $attr7_class='menu_disabled' ?><?php $attr7_text=$text ?><?php $attr7_accesskey=lang($key) ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
@@ -468,7 +531,27 @@ if (isset($attr6_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -488,15 +571,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -506,7 +589,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_accesskey) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php $attr6_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_accesskey) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:2:"__";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php $attr6_escape=true ?><?php
if ( isset($attr6_prefix)&& isset($attr6_key))
$attr6_key = $attr6_prefix.$attr6_key;
if ( isset($attr6_suffix)&& isset($attr6_key))
@@ -516,7 +600,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -536,15 +640,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -554,7 +658,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:2:{s:3:"var";s:3:"url";s:5:"value";s:0:"";}' ?><?php $attr6 = array('var'=>'url','value'=>'') ?><?php $attr6_var='url' ?><?php $attr6_value='' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:2:{s:3:"var";s:3:"url";s:5:"value";s:0:"";}' ?><?php $attr6 = array('var'=>'url','value'=>'') ?><?php $attr6_var='url' ?><?php $attr6_value='' ?><?php
if (!isset($attr6_value))
unset($$attr6_var);
elseif (isset($attr6_key))
diff --git a/themes/default/pages/html/user/addgroup.tpl.php b/themes/default/pages/html/user/addgroup.tpl.php
@@ -177,6 +177,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -287,7 +308,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -307,15 +348,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -325,7 +366,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -371,7 +413,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -391,15 +453,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -409,7 +471,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -455,7 +518,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -475,15 +558,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -493,7 +576,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -539,7 +623,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -559,15 +663,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -577,7 +681,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -665,7 +770,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -685,15 +810,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -703,7 +828,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -734,7 +860,27 @@ if ( $attr6_readonly && $checked )
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -754,15 +900,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -772,7 +918,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -818,7 +965,27 @@ if ($attr6_readonly) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -838,15 +1005,15 @@ if ($attr6_readonly) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -856,7 +1023,8 @@ if ($attr6_readonly) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -872,6 +1040,7 @@ if ($attr6_addempty) $$attr6_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr6_
?><select id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name; if ($attr6_multiple) echo '[]'; ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php
if (count($$attr6_list)<=1) echo ' disabled="disabled"';
if ($attr6_multiple) echo ' multiple="multiple"';
+if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"';
echo ' size="'.intval($attr6_size).'"';
?>><?php
$attr6_tmp_list = $$attr6_list;
diff --git a/themes/default/pages/html/user/groups.tpl.php b/themes/default/pages/html/user/groups.tpl.php
@@ -196,7 +196,27 @@ if (isset($attr6_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -216,15 +236,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -234,7 +254,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -275,7 +296,27 @@ if (isset($attr6_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -295,15 +336,15 @@ if (isset($attr6_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -313,7 +354,8 @@ if (isset($attr6_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/user/listing.tpl.php b/themes/default/pages/html/user/listing.tpl.php
@@ -216,7 +216,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -236,15 +256,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -254,7 +274,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -275,7 +296,27 @@ if (isset($attr7_elementtype)) {
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -295,15 +336,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -313,7 +354,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:1:{s:4:"true";s:11:"var:isAdmin";}' ?><?php $attr6 = array('true'=>$isAdmin) ?><?php $attr6_true=$isAdmin ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_escape) ?><?php $attr6_debug_info = 'a:1:{s:4:"true";s:11:"var:isAdmin";}' ?><?php $attr6 = array('true'=>$isAdmin) ?><?php $attr6_true=$isAdmin ?><?php
if ( isset($attr6_true) )
{
if (gettype($attr6_true) === '' && gettype($attr6_true) === '1')
@@ -384,7 +426,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -404,15 +466,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -422,7 +484,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:10:"USER_ADMIN";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','key'=>'USER_ADMIN','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='USER_ADMIN' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:10:"USER_ADMIN";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','key'=>'USER_ADMIN','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='USER_ADMIN' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -432,7 +495,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -452,15 +535,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -470,7 +553,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:")";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw=')' ?><?php $attr7_escape=true ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:")";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw=')' ?><?php $attr7_escape=true ?><?php
if ( isset($attr7_prefix)&& isset($attr7_key))
$attr7_key = $attr7_prefix.$attr7_key;
if ( isset($attr7_suffix)&& isset($attr7_key))
@@ -480,7 +564,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -500,15 +604,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -518,7 +622,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/user/pw.tpl.php b/themes/default/pages/html/user/pw.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -331,7 +373,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -351,15 +413,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -369,7 +431,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -411,7 +474,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -431,15 +514,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -449,7 +532,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -583,7 +667,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -603,15 +707,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -621,7 +725,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -662,7 +767,27 @@ if ( $attr7_readonly && $checked )
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -682,15 +807,15 @@ if ( $attr7_readonly && $checked )
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -700,7 +825,8 @@ if ( $attr7_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -741,7 +867,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -761,15 +907,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -779,7 +925,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/user/remove.tpl.php b/themes/default/pages/html/user/remove.tpl.php
@@ -182,7 +182,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -202,15 +222,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -220,7 +240,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -241,7 +262,27 @@
$attr6_title = lang($attr6_key.'_HELP');
else
$attr6_title = '';
-?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
+ if (empty($attr6_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr6_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
if (!empty($attr6_array))
{
@@ -261,15 +302,15 @@
elseif (!empty($attr6_key))
$tmp_text = lang($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
elseif (!empty($attr6_raw))
$tmp_text = str_replace('_',' ',$attr6_raw);
elseif (!empty($attr6_value))
$tmp_text = $attr6_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) );
if (isset($attr6_accesskey))
@@ -279,7 +320,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -331,7 +373,27 @@ if ( $attr6_readonly && $checked )
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -351,15 +413,15 @@ if ( $attr6_readonly && $checked )
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -369,7 +431,8 @@ if ( $attr6_readonly && $checked )
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
diff --git a/themes/default/pages/html/user/rights.tpl.php b/themes/default/pages/html/user/rights.tpl.php
@@ -266,7 +266,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -286,15 +306,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -304,7 +324,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:3:"not";s:4:"true";s:5:"empty";s:4:"acls";}' ?><?php $attr4 = array('not'=>true,'empty'=>'acls') ?><?php $attr4_not=true ?><?php $attr4_empty='acls' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:2:{s:3:"not";s:4:"true";s:5:"empty";s:4:"acls";}' ?><?php $attr4 = array('not'=>true,'empty'=>'acls') ?><?php $attr4_not=true ?><?php $attr4_empty='acls' ?><?php
if ( isset($attr4_true) )
{
if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
@@ -396,7 +417,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -416,15 +457,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -434,7 +475,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -455,7 +497,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -475,15 +537,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -493,7 +555,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"class";s:4:"help";}' ?><?php $attr6 = array('class'=>'help') ?><?php $attr6_class='help' ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -514,7 +577,27 @@
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -534,15 +617,15 @@
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -552,7 +635,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:1:"t";}' ?><?php $attr6 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr6_list='show' ?><?php $attr6_extract=false ?><?php $attr6_key='list_key' ?><?php $attr6_value='t' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:1:"t";}' ?><?php $attr6 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr6_list='show' ?><?php $attr6_extract=false ?><?php $attr6_key='list_key' ?><?php $attr6_value='t' ?><?php
$attr6_list_tmp_key = $attr6_key;
$attr6_list_tmp_value = $attr6_value;
$attr6_list_extract = $attr6_extract;
@@ -592,7 +676,27 @@
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -612,15 +716,15 @@
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -630,7 +734,8 @@
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_suffix) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:6:"rights";s:7:"extract";s:4:"true";s:3:"key";s:5:"aclid";s:5:"value";s:3:"acl";}' ?><?php $attr4 = array('list'=>'rights','extract'=>true,'key'=>'aclid','value'=>'acl') ?><?php $attr4_list='rights' ?><?php $attr4_extract=true ?><?php $attr4_key='aclid' ?><?php $attr4_value='acl' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_suffix) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:4:{s:4:"list";s:6:"rights";s:7:"extract";s:4:"true";s:3:"key";s:5:"aclid";s:5:"value";s:3:"acl";}' ?><?php $attr4 = array('list'=>'rights','extract'=>true,'key'=>'aclid','value'=>'acl') ?><?php $attr4_list='rights' ?><?php $attr4_extract=true ?><?php $attr4_key='aclid' ?><?php $attr4_value='acl' ?><?php
$attr4_list_tmp_key = $attr4_key;
$attr4_list_tmp_value = $attr4_value;
$attr4_list_extract = $attr4_extract;
@@ -753,7 +858,27 @@ if (isset($attr8_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -773,15 +898,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -791,7 +916,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:7:"present";s:9:"groupname";}' ?><?php $attr7 = array('present'=>'groupname') ?><?php $attr7_present='groupname' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:7:"present";s:9:"groupname";}' ?><?php $attr7 = array('present'=>'groupname') ?><?php $attr7_present='groupname' ?><?php
if ( isset($attr7_true) )
{
if (gettype($attr7_true) === '' && gettype($attr7_true) === '1')
@@ -874,7 +1000,27 @@ if (isset($attr8_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -894,15 +1040,15 @@ if (isset($attr8_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -912,7 +1058,8 @@ if (isset($attr8_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:3:"not";s:4:"true";s:7:"present";s:8:"username";}' ?><?php $attr7 = array('not'=>true,'present'=>'username') ?><?php $attr7_not=true ?><?php $attr7_present='username' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:2:{s:3:"not";s:4:"true";s:7:"present";s:8:"username";}' ?><?php $attr7 = array('not'=>true,'present'=>'username') ?><?php $attr7_not=true ?><?php $attr7_present='username' ?><?php
if ( isset($attr7_true) )
{
if (gettype($attr7_true) === '' && gettype($attr7_true) === '1')
@@ -1056,7 +1203,27 @@ if (isset($attr9_elementtype)) {
$attr9_title = lang($attr9_key.'_HELP');
else
$attr9_title = '';
-?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
+ if (empty($attr9_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr9_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php
$attr9_title = '';
if (!empty($attr9_array))
{
@@ -1076,15 +1243,15 @@ if (isset($attr9_elementtype)) {
elseif (!empty($attr9_key))
$tmp_text = lang($attr9_key);
elseif (!empty($attr9_var))
- $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?';
+ $tmp_text = isset($$attr9_var)?$$attr9_var:'?'.$attr9_var.'?';
elseif (!empty($attr9_raw))
$tmp_text = str_replace('_',' ',$attr9_raw);
elseif (!empty($attr9_value))
$tmp_text = $attr9_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr9_escape && empty($attr9_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) );
if (isset($attr9_accesskey))
@@ -1094,7 +1261,8 @@ if (isset($attr9_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_key) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:3:"var";s:8:"username";}' ?><?php $attr7 = array('var'=>'username') ?><?php $attr7_var='username' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_key) ?><?php unset($attr9_escape) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7_debug_info = 'a:1:{s:3:"var";s:8:"username";}' ?><?php $attr7 = array('var'=>'username') ?><?php $attr7_var='username' ?><?php
if (!isset($attr7_value))
unset($$attr7_var);
elseif (isset($attr7_key))
@@ -1161,7 +1329,27 @@ if (isset($attr7_elementtype)) {
$attr8_title = lang($attr8_key.'_HELP');
else
$attr8_title = '';
-?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
+ if (empty($attr8_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr8_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php
$attr8_title = '';
if (!empty($attr8_array))
{
@@ -1181,15 +1369,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr8_key))
$tmp_text = lang($attr8_key);
elseif (!empty($attr8_var))
- $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?';
+ $tmp_text = isset($$attr8_var)?$$attr8_var:'?'.$attr8_var.'?';
elseif (!empty($attr8_raw))
$tmp_text = str_replace('_',' ',$attr8_raw);
elseif (!empty($attr8_value))
$tmp_text = $attr8_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr8_escape && empty($attr8_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) );
if (isset($attr8_accesskey))
@@ -1199,7 +1387,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php
$column_class_idx++;
if ($column_class_idx > count($column_classes))
$column_class_idx=1;
@@ -1220,7 +1409,27 @@ if (isset($attr7_elementtype)) {
$attr7_title = lang($attr7_key.'_HELP');
else
$attr7_title = '';
-?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ if (empty($attr7_type))
+ $tmp_tag = 'span';
+ else
+ switch( $attr7_type )
+ {
+ case 'emphatic':
+ case 'italic':
+ $tmp_tag = 'em';
+ break;
+ case 'strong':
+ case 'bold':
+ $tmp_tag = 'strong';
+ break;
+ case 'tt':
+ case 'teletype':
+ $tmp_tag = 'tt';
+ break;
+ default:
+ $tmp_tag = 'span';
+ }
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
if (!empty($attr7_array))
{
@@ -1240,15 +1449,15 @@ if (isset($attr7_elementtype)) {
elseif (!empty($attr7_key))
$tmp_text = lang($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
elseif (!empty($attr7_raw))
$tmp_text = str_replace('_',' ',$attr7_raw);
elseif (!empty($attr7_value))
$tmp_text = $attr7_value;
else
- {
$tmp_text = ' ';
- }
+ if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' )
+ $tmp_text = htmlentities($tmp_text);
if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) );
if (isset($attr7_accesskey))
@@ -1258,7 +1467,8 @@ if (isset($attr7_elementtype)) {
$tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1);
}
echo $tmp_text;
-?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr6 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'list_value') ?><?php $attr6_list='show' ?><?php $attr6_extract=false ?><?php $attr6_key='list_key' ?><?php $attr6_value='list_value' ?><?php
+ unset($tmp_text);
+?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:4:{s:4:"list";s:4:"show";s:7:"extract";s:5:"false";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr6 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'list_value') ?><?php $attr6_list='show' ?><?php $attr6_extract=false ?><?php $attr6_key='list_key' ?><?php $attr6_value='list_value' ?><?php
$attr6_list_tmp_key = $attr6_key;
$attr6_list_tmp_value = $attr6_value;
$attr6_list_extract = $attr6_extract;
