commit 9f1a1443575779bf23a26faa8417acbc0ab99a5d
parent 5d79dadb5797ac3aacae595a5f3f81c8b9451470
Author: dankert <devnull@localhost>
Date: Tue, 3 Mar 2009 00:33:07 +0100
Umwandlung Template.
Diffstat:
3 files changed, 245 insertions(+), 228 deletions(-)
diff --git a/themes/default/pages/html/folder/order.tpl.php b/themes/default/pages/html/folder/order.tpl.php
@@ -68,19 +68,19 @@
echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">';
if ($this->isEditable()) { ?>
<?php if ($this->getRequestVar('mode')=='edit') {
- ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo lang('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else {
- ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo lang('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/readonly.png" style="vertical-align:top; " border="0" /></a> <?php }
+ ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else {
+ ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/readonly.png" style="vertical-align:top; " border="0" /></a> <?php }
?><?php }
- echo '<span class="path">'.lang('GLOBAL_'.$actionName).'</span> <strong>»</strong> ';
+ echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> ';
if ( !isset($path) || is_array($path) )
$path = array();
foreach( $path as $pathElement)
{
extract($pathElement);
- echo '<a href="'.$url.'" class="path">'.lang($name).'</a>';
+ echo '<a href="'.$url.'" class="path">'.langHtml($name).'</a>';
echo ' » ';
}
- echo '<span class="title">'.lang($windowTitle).'</span>';
+ echo '<span class="title">'.langHtml($windowTitle).'</span>';
?>
</td>
<?php
@@ -89,7 +89,7 @@
<?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
+ ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.langHtml($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php
}
?>
</td>-->
@@ -99,23 +99,23 @@
$windowMenu = array();
foreach( $windowMenu as $menu )
{
- $tmp_text = lang($menu['text']);
- $tmp_key = strtoupper(lang($menu['key' ]));
+ $tmp_text = langHtml($menu['text']);
+ $tmp_key = strtoupper(langHtml($menu['key' ]));
$tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key));
if ( $tmp_pos !== false )
$tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1);
if ( isset($menu['url']) )
{
- ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a> <?php
+ ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a> <?php
}
else
{
- ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php
+ ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php
}
}
if (@$conf['help']['enabled'] )
{
- ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':lang('MENU_HELP') ?></a><?php
+ ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php
}
?></td>
</tr>
@@ -133,7 +133,7 @@
<?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 } ?>
+ <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?>
<?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?>
</td>
</tr>
@@ -175,9 +175,6 @@
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 = '';
if (empty($attr5_type))
$tmp_tag = 'span';
@@ -201,33 +198,32 @@
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
+ if ( $attr5_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr5_array))
{
$tmpArray = $$attr5_array;
if (!empty($attr5_var))
$tmp_text = $tmpArray[$attr5_var];
else
- $tmp_text = lang($tmpArray[$attr5_text]);
+ $tmp_text = $langF($tmpArray[$attr5_text]);
}
elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
+ $tmp_text = $langF($attr5_text);
elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
+ $tmp_text = $langF($$attr5_textvar);
elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
+ $tmp_text = $langF($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?unset:'.$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))
@@ -279,15 +275,12 @@
$tmp_url = $attr5_url;
else
$tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params);
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"FOLDER_ORDER";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'FOLDER_ORDER','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='FOLDER_ORDER' ?><?php $attr6_escape=true ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo encodeHtml($attr5_title) ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"FOLDER_ORDER";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'FOLDER_ORDER','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='FOLDER_ORDER' ?><?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';
@@ -311,33 +304,32 @@
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
+ if ( $attr6_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr6_array))
{
$tmpArray = $$attr6_array;
if (!empty($attr6_var))
$tmp_text = $tmpArray[$attr6_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = $langF($tmpArray[$attr6_text]);
}
elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
- else
- $tmp_text = lang($attr6_text);
+ $tmp_text = $langF($attr6_text);
elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
+ $tmp_text = $langF($$attr6_textvar);
elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
+ $tmp_text = $langF($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$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))
@@ -379,15 +371,12 @@
$tmp_url = $attr5_url;
else
$tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params);
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_TYPE";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_TYPE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_TYPE' ?><?php $attr6_escape=true ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo encodeHtml($attr5_title) ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"GLOBAL_TYPE";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_TYPE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_TYPE' ?><?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';
@@ -411,33 +400,32 @@
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
+ if ( $attr6_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr6_array))
{
$tmpArray = $$attr6_array;
if (!empty($attr6_var))
$tmp_text = $tmpArray[$attr6_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = $langF($tmpArray[$attr6_text]);
}
elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
- else
- $tmp_text = lang($attr6_text);
+ $tmp_text = $langF($attr6_text);
elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
+ $tmp_text = $langF($$attr6_textvar);
elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
+ $tmp_text = $langF($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$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))
@@ -454,9 +442,6 @@
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 = '';
if (empty($attr5_type))
$tmp_tag = 'span';
@@ -480,33 +465,32 @@
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php
$attr5_title = '';
+ if ( $attr5_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr5_array))
{
$tmpArray = $$attr5_array;
if (!empty($attr5_var))
$tmp_text = $tmpArray[$attr5_var];
else
- $tmp_text = lang($tmpArray[$attr5_text]);
+ $tmp_text = $langF($tmpArray[$attr5_text]);
}
elseif (!empty($attr5_text))
- if ( isset($$attr5_text))
- $tmp_text = lang($$attr5_text);
- else
- $tmp_text = lang($attr5_text);
+ $tmp_text = $langF($attr5_text);
elseif (!empty($attr5_textvar))
- $tmp_text = lang($$attr5_textvar);
+ $tmp_text = $langF($$attr5_textvar);
elseif (!empty($attr5_key))
- $tmp_text = lang($attr5_key);
+ $tmp_text = $langF($attr5_key);
elseif (!empty($attr5_var))
- $tmp_text = isset($$attr5_var)?$$attr5_var:'?'.$attr5_var.'?';
+ $tmp_text = isset($$attr5_var)?$$attr5_var:'?unset:'.$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))
@@ -537,15 +521,12 @@
$tmp_url = $attr5_url;
else
$tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params);
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?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
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo encodeHtml($attr5_title) ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?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))
$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';
@@ -569,33 +550,32 @@
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
+ if ( $attr6_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr6_array))
{
$tmpArray = $$attr6_array;
if (!empty($attr6_var))
$tmp_text = $tmpArray[$attr6_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = $langF($tmpArray[$attr6_text]);
}
elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
- else
- $tmp_text = lang($attr6_text);
+ $tmp_text = $langF($attr6_text);
elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
+ $tmp_text = $langF($$attr6_textvar);
elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
+ $tmp_text = $langF($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$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))
@@ -637,15 +617,12 @@
$tmp_url = $attr5_url;
else
$tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params);
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"GLOBAL_LASTCHANGE";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LASTCHANGE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LASTCHANGE' ?><?php $attr6_escape=true ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo encodeHtml($attr5_title) ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"GLOBAL_LASTCHANGE";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LASTCHANGE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LASTCHANGE' ?><?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';
@@ -669,33 +646,32 @@
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
+ if ( $attr6_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr6_array))
{
$tmpArray = $$attr6_array;
if (!empty($attr6_var))
$tmp_text = $tmpArray[$attr6_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = $langF($tmpArray[$attr6_text]);
}
elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
- else
- $tmp_text = lang($attr6_text);
+ $tmp_text = $langF($attr6_text);
elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
+ $tmp_text = $langF($$attr6_textvar);
elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
+ $tmp_text = $langF($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$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))
@@ -827,7 +803,7 @@
$tmp_url = $attr7_url;
else
$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:2:{s:3:"var";s:4:"bild";s:5:"value";s:8:"arrow_up";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_up') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_up' ?><?php
+?><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 encodeHtml($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:2:{s:3:"var";s:4:"bild";s:5:"value";s:8:"arrow_up";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_up') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_up' ?><?php
if (!isset($attr8_value))
unset($$attr8_var);
elseif (isset($attr8_key))
@@ -913,9 +889,6 @@ if (isset($attr8_elementtype)) {
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
$attr7_title = '';
if (empty($attr7_type))
$tmp_tag = 'span';
@@ -939,33 +912,32 @@ if (isset($attr8_elementtype)) {
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
+ if ( $attr7_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr7_array))
{
$tmpArray = $$attr7_array;
if (!empty($attr7_var))
$tmp_text = $tmpArray[$attr7_var];
else
- $tmp_text = lang($tmpArray[$attr7_text]);
+ $tmp_text = $langF($tmpArray[$attr7_text]);
}
elseif (!empty($attr7_text))
- if ( isset($$attr7_text))
- $tmp_text = lang($$attr7_text);
- else
- $tmp_text = lang($attr7_text);
+ $tmp_text = $langF($attr7_text);
elseif (!empty($attr7_textvar))
- $tmp_text = lang($$attr7_textvar);
+ $tmp_text = $langF($$attr7_textvar);
elseif (!empty($attr7_key))
- $tmp_text = lang($attr7_key);
+ $tmp_text = $langF($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$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))
@@ -1068,7 +1040,7 @@ if (isset($attr8_elementtype)) {
$tmp_url = $attr7_url;
else
$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:2:{s:3:"var";s:4:"bild";s:5:"value";s:9:"arrow_top";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_top') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_top' ?><?php
+?><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 encodeHtml($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:2:{s:3:"var";s:4:"bild";s:5:"value";s:9:"arrow_top";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_top') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_top' ?><?php
if (!isset($attr8_value))
unset($$attr8_var);
elseif (isset($attr8_key))
@@ -1154,9 +1126,6 @@ if (isset($attr8_elementtype)) {
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
$attr7_title = '';
if (empty($attr7_type))
$tmp_tag = 'span';
@@ -1180,33 +1149,32 @@ if (isset($attr8_elementtype)) {
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
+ if ( $attr7_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr7_array))
{
$tmpArray = $$attr7_array;
if (!empty($attr7_var))
$tmp_text = $tmpArray[$attr7_var];
else
- $tmp_text = lang($tmpArray[$attr7_text]);
+ $tmp_text = $langF($tmpArray[$attr7_text]);
}
elseif (!empty($attr7_text))
- if ( isset($$attr7_text))
- $tmp_text = lang($$attr7_text);
- else
- $tmp_text = lang($attr7_text);
+ $tmp_text = $langF($attr7_text);
elseif (!empty($attr7_textvar))
- $tmp_text = lang($$attr7_textvar);
+ $tmp_text = $langF($$attr7_textvar);
elseif (!empty($attr7_key))
- $tmp_text = lang($attr7_key);
+ $tmp_text = $langF($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$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))
@@ -1309,7 +1277,7 @@ if (isset($attr8_elementtype)) {
$tmp_url = $attr7_url;
else
$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:2:{s:3:"var";s:4:"bild";s:5:"value";s:12:"arrow_bottom";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_bottom') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_bottom' ?><?php
+?><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 encodeHtml($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:2:{s:3:"var";s:4:"bild";s:5:"value";s:12:"arrow_bottom";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_bottom') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_bottom' ?><?php
if (!isset($attr8_value))
unset($$attr8_var);
elseif (isset($attr8_key))
@@ -1395,9 +1363,6 @@ if (isset($attr8_elementtype)) {
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
$attr7_title = '';
if (empty($attr7_type))
$tmp_tag = 'span';
@@ -1421,33 +1386,32 @@ if (isset($attr8_elementtype)) {
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
+ if ( $attr7_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr7_array))
{
$tmpArray = $$attr7_array;
if (!empty($attr7_var))
$tmp_text = $tmpArray[$attr7_var];
else
- $tmp_text = lang($tmpArray[$attr7_text]);
+ $tmp_text = $langF($tmpArray[$attr7_text]);
}
elseif (!empty($attr7_text))
- if ( isset($$attr7_text))
- $tmp_text = lang($$attr7_text);
- else
- $tmp_text = lang($attr7_text);
+ $tmp_text = $langF($attr7_text);
elseif (!empty($attr7_textvar))
- $tmp_text = lang($$attr7_textvar);
+ $tmp_text = $langF($$attr7_textvar);
elseif (!empty($attr7_key))
- $tmp_text = lang($attr7_key);
+ $tmp_text = $langF($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$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))
@@ -1550,7 +1514,7 @@ if (isset($attr8_elementtype)) {
$tmp_url = $attr7_url;
else
$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:2:{s:3:"var";s:4:"bild";s:5:"value";s:10:"arrow_down";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_down') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_down' ?><?php
+?><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 encodeHtml($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:2:{s:3:"var";s:4:"bild";s:5:"value";s:10:"arrow_down";}' ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_down') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_down' ?><?php
if (!isset($attr8_value))
unset($$attr8_var);
elseif (isset($attr8_key))
@@ -1636,9 +1600,6 @@ if (isset($attr8_elementtype)) {
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
$attr7_title = '';
if (empty($attr7_type))
$tmp_tag = 'span';
@@ -1662,33 +1623,32 @@ if (isset($attr8_elementtype)) {
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
$attr7_title = '';
+ if ( $attr7_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr7_array))
{
$tmpArray = $$attr7_array;
if (!empty($attr7_var))
$tmp_text = $tmpArray[$attr7_var];
else
- $tmp_text = lang($tmpArray[$attr7_text]);
+ $tmp_text = $langF($tmpArray[$attr7_text]);
}
elseif (!empty($attr7_text))
- if ( isset($$attr7_text))
- $tmp_text = lang($$attr7_text);
- else
- $tmp_text = lang($attr7_text);
+ $tmp_text = $langF($attr7_text);
elseif (!empty($attr7_textvar))
- $tmp_text = lang($$attr7_textvar);
+ $tmp_text = $langF($$attr7_textvar);
elseif (!empty($attr7_key))
- $tmp_text = lang($attr7_key);
+ $tmp_text = $langF($attr7_key);
elseif (!empty($attr7_var))
- $tmp_text = isset($$attr7_var)?$$attr7_var:'?'.$attr7_var.'?';
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$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))
@@ -1728,9 +1688,6 @@ if (isset($attr6_elementtype)) {
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';
@@ -1754,33 +1711,32 @@ if (isset($attr6_elementtype)) {
}
?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
$attr6_title = '';
+ if ( $attr6_escape )
+ $langF = 'langHtml';
+ else
+ $langF = 'lang';
if (!empty($attr6_array))
{
$tmpArray = $$attr6_array;
if (!empty($attr6_var))
$tmp_text = $tmpArray[$attr6_var];
else
- $tmp_text = lang($tmpArray[$attr6_text]);
+ $tmp_text = $langF($tmpArray[$attr6_text]);
}
elseif (!empty($attr6_text))
- if ( isset($$attr6_text))
- $tmp_text = lang($$attr6_text);
- else
- $tmp_text = lang($attr6_text);
+ $tmp_text = $langF($attr6_text);
elseif (!empty($attr6_textvar))
- $tmp_text = lang($$attr6_textvar);
+ $tmp_text = $langF($$attr6_textvar);
elseif (!empty($attr6_key))
- $tmp_text = lang($attr6_key);
+ $tmp_text = $langF($attr6_key);
elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?$$attr6_var:'?'.$attr6_var.'?';
+ $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$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))
diff --git a/themes/default/pages/html/pageelement/edit.tpl.php b/themes/default/pages/html/pageelement/edit.tpl.php
@@ -59,7 +59,7 @@
?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:6:"hidden";s:4:"name";s:9:"elementid";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr3 = array('class'=>'','default'=>'','type'=>'hidden','name'=>'elementid','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr3_class='' ?><?php $attr3_default='' ?><?php $attr3_type='hidden' ?><?php $attr3_name='elementid' ?><?php $attr3_size='40' ?><?php $attr3_maxlength='256' ?><?php $attr3_onchange='' ?><?php $attr3_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr3_readonly=true;
if ($attr3_readonly && empty($$attr3_name)) $$attr3_name = '- '.lang('EMPTY').' -';
if(!isset($attr3_default)) $attr3_default='';
-?><?php if (!$attr3_readonly) {
+?><?php if (!$attr3_readonly || $attr3_type=='hidden') {
?><input<?php if ($attr3_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr3_name ?><?php if ($attr3_readonly) echo '_disabled' ?>" name="<?php echo $attr3_name ?><?php if ($attr3_readonly) echo '_disabled' ?>" type="<?php echo $attr3_type ?>" size="<?php echo $attr3_size ?>" maxlength="<?php echo $attr3_maxlength ?>" class="<?php echo $attr3_class ?>" value="<?php echo isset($$attr3_name)?$$attr3_name:$attr3_default ?>" <?php if (in_array($attr3_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr3_readonly) {
?><input type="hidden" id="id_<?php echo $attr3_name ?>" name="<?php echo $attr3_name ?>" value="<?php echo isset($$attr3_name)?$$attr3_name:$attr3_default ?>" /><?php
@@ -348,7 +348,7 @@ if ($attr3_readonly) {
?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7_debug_info = 'a:8:{s:5:"class";s:8:"ansidate";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:8:"ansidate";s:4:"size";s:2:"25";s:9:"maxlength";s:2:"25";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'ansidate','default'=>'','type'=>'text','name'=>'ansidate','size'=>'25','maxlength'=>'25','onchange'=>'','readonly'=>false) ?><?php $attr7_class='ansidate' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='ansidate' ?><?php $attr7_size='25' ?><?php $attr7_maxlength='25' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr7_readonly=true;
if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -';
if(!isset($attr7_default)) $attr7_default='';
-?><?php if (!$attr7_readonly) {
+?><?php if (!$attr7_readonly || $attr7_type=='hidden') {
?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr7_readonly) {
?><input type="hidden" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" /><?php
@@ -443,7 +443,7 @@ document.forms[0].<?php echo $attr7_field ?>.select();
?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7_debug_info = 'a:8:{s:5:"class";s:4:"text";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"text";s:4:"size";s:2:"50";s:9:"maxlength";s:3:"255";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'text','default'=>'','type'=>'text','name'=>'text','size'=>'50','maxlength'=>'255','onchange'=>'','readonly'=>false) ?><?php $attr7_class='text' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='text' ?><?php $attr7_size='50' ?><?php $attr7_maxlength='255' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr7_readonly=true;
if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -';
if(!isset($attr7_default)) $attr7_default='';
-?><?php if (!$attr7_readonly) {
+?><?php if (!$attr7_readonly || $attr7_type=='hidden') {
?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr7_readonly) {
?><input type="hidden" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" /><?php
@@ -2854,7 +2854,7 @@ else
?><input type="hidden" name="<?php echo $attr7_name ?>" value="<?php echo $attr7_tmp_value ?>" /><?php unset($attr7) ?><?php unset($attr7_name) ?><?php unset($attr7_default) ?><?php $attr7_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:6:"number";s:4:"size";s:2:"15";s:9:"maxlength";s:2:"20";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'number','size'=>'15','maxlength'=>'20','onchange'=>'','readonly'=>false) ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='number' ?><?php $attr7_size='15' ?><?php $attr7_maxlength='20' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr7_readonly=true;
if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -';
if(!isset($attr7_default)) $attr7_default='';
-?><?php if (!$attr7_readonly) {
+?><?php if (!$attr7_readonly || $attr7_type=='hidden') {
?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr7_readonly) {
?><input type="hidden" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" /><?php
diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php
@@ -270,7 +270,7 @@
?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:8:{s:5:"class";s:4:"name";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"size";s:2:"20";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'name','default'=>'','type'=>'text','name'=>'name','size'=>'20','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='name' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='20' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true;
if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -';
if(!isset($attr6_default)) $attr6_default='';
-?><?php if (!$attr6_readonly) {
+?><?php if (!$attr6_readonly || $attr6_type=='hidden') {
?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr6_readonly) {
?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php
@@ -295,7 +295,7 @@ if ($attr6_readonly) {
$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_colspan) ?><?php $attr6_debug_info = 'a:1:{s:5:"title";s:23:"message:ADDITIONAL_INFO";}' ?><?php $attr6 = array('title'=>lang('ADDITIONAL_INFO')) ?><?php $attr6_title=lang('ADDITIONAL_INFO') ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo $attr6_title ?></legend><?php } ?><?php unset($attr6) ?><?php unset($attr6_title) ?><?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:0:{}' ?><?php $attr4 = array() ?><?php
+?><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:1:{s:5:"title";s:23:"message:ADDITIONAL_INFO";}' ?><?php $attr6 = array('title'=>lang('ADDITIONAL_INFO')) ?><?php $attr6_title=lang('ADDITIONAL_INFO') ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6) ?><?php unset($attr6_title) ?><?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:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -395,42 +395,103 @@ if ($attr6_readonly) {
?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:8:"fullname";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'fullname','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='fullname' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true;
if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -';
if(!isset($attr6_default)) $attr6_default='';
-?><?php if (!$attr6_readonly) {
+?><?php if (!$attr6_readonly || $attr6_type=='hidden') {
?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr6_readonly) {
?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php
- } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php unset($attr6_readonly) ?><?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
+ } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php unset($attr6_readonly) ?><?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:4:"true";s:30:"config:security/user/show_mail";}' ?><?php $attr4 = array('true'=>@$conf['security']['user']['show_mail']) ?><?php $attr4_true=@$conf['security']['user']['show_mail'] ?><?php
+ if ( isset($attr4_true) )
+ {
+ if (gettype($attr4_true) === '' && gettype($attr4_true) === '1')
+ $exec = $$attr4_true == true;
+ else
+ $exec = $attr4_true == true;
+ }
+ elseif ( isset($attr4_false) )
+ {
+ if (gettype($attr4_false) === '' && gettype($attr4_false) === '1')
+ $exec = $$attr4_false == false;
+ else
+ $exec = $attr4_false == false;
+ }
+ elseif( isset($attr4_contains) )
+ $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) )
+ $exec = empty($attr4_empty);
+ elseif ( is_array($$attr4_empty) )
+ $exec = (count($$attr4_empty)==0);
+ elseif ( is_bool($$attr4_empty) )
+ $exec = true;
+ else
+ $exec = empty( $$attr4_empty );
+ }
+ elseif ( isset($attr4_present) )
+ {
+ $exec = isset($$attr4_present);
+ }
+ else
+ {
+ trigger_error("error in IF, assume: FALSE");
+ $exec = false;
+ }
+ if ( !empty($attr4_invert) )
+ $exec = !$exec;
+ if ( !empty($attr4_not) )
+ $exec = !$exec;
+ unset($attr4_true);
+ unset($attr4_false);
+ unset($attr4_notempty);
+ unset($attr4_empty);
+ unset($attr4_contains);
+ unset($attr4_present);
+ unset($attr4_invert);
+ unset($attr4_not);
+ unset($attr4_value);
+ unset($attr4_equals);
+ $last_exec = $exec;
+ if ( $exec )
+ {
+?>
+<?php unset($attr4) ?><?php unset($attr4_true) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = 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;
+ if (empty($attr5_class))
+ $attr5_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:0:{}' ?><?php $attr5 = array() ?><?php
+?><tr class="<?php echo $attr5_class ?>"><?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($attr5_class))
- $attr5['class']=$column_class;
+ if (empty($attr6_class))
+ $attr6['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:3:{s:5:"class";s:4:"text";s:4:"text";s:9:"user_mail";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>'user_mail','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_mail' ?><?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))
- $attr6_title = '';
- if (empty($attr6_type))
+ 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:3:{s:5:"class";s:4:"text";s:4:"text";s:9:"user_mail";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'user_mail','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='user_mail' ?><?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))
+ $attr7_title = '';
+ if (empty($attr7_type))
$tmp_tag = 'span';
else
- switch( $attr6_type )
+ switch( $attr7_type )
{
case 'emphatic':
case 'italic':
@@ -447,63 +508,63 @@ if ($attr6_readonly) {
default:
$tmp_tag = 'span';
}
-?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php
- $attr6_title = '';
- if ( $attr6_escape )
+?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php
+ $attr7_title = '';
+ if ( $attr7_escape )
$langF = 'langHtml';
else
$langF = 'lang';
- if (!empty($attr6_array))
+ 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 = $langF($tmpArray[$attr6_text]);
+ $tmp_text = $langF($tmpArray[$attr7_text]);
}
- elseif (!empty($attr6_text))
- $tmp_text = $langF($attr6_text);
- elseif (!empty($attr6_textvar))
- $tmp_text = $langF($$attr6_textvar);
- elseif (!empty($attr6_key))
- $tmp_text = $langF($attr6_key);
- elseif (!empty($attr6_var))
- $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?';
- elseif (!empty($attr6_raw))
- $tmp_text = str_replace('_',' ',$attr6_raw);
- elseif (!empty($attr6_value))
- $tmp_text = $attr6_value;
+ elseif (!empty($attr7_text))
+ $tmp_text = $langF($attr7_text);
+ elseif (!empty($attr7_textvar))
+ $tmp_text = $langF($$attr7_textvar);
+ elseif (!empty($attr7_key))
+ $tmp_text = $langF($attr7_key);
+ elseif (!empty($attr7_var))
+ $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$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 ( !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;
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
+?></<?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;
$column_class=$column_classes[$column_class_idx-1];
- if (empty($attr5_class))
- $attr5['class']=$column_class;
+ if (empty($attr6_class))
+ $attr6['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:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"mail";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'mail','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='mail' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true;
- if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -';
- if(!isset($attr6_default)) $attr6_default='';
-?><?php if (!$attr6_readonly) {
-?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
-if ($attr6_readonly) {
-?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php
- } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php unset($attr6_readonly) ?><?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
+ 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:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"mail";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'mail','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='mail' ?><?php $attr7_size='40' ?><?php $attr7_maxlength='256' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr7_readonly=true;
+ if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -';
+ if(!isset($attr7_default)) $attr7_default='';
+?><?php if (!$attr7_readonly || $attr7_type=='hidden') {
+?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
+if ($attr7_readonly) {
+?><input type="hidden" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" /><?php
+ } } else { ?><span class="<?php echo $attr7_class ?>"><?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?></span><?php } ?><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_default) ?><?php unset($attr7_type) ?><?php unset($attr7_name) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_onchange) ?><?php unset($attr7_readonly) ?><?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;
@@ -603,7 +664,7 @@ if ($attr6_readonly) {
?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"desc";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'desc','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='desc' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true;
if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -';
if(!isset($attr6_default)) $attr6_default='';
-?><?php if (!$attr6_readonly) {
+?><?php if (!$attr6_readonly || $attr6_type=='hidden') {
?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr6_readonly) {
?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php
@@ -707,7 +768,7 @@ if ($attr6_readonly) {
?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:3:"tel";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'tel','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='tel' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true;
if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -';
if(!isset($attr6_default)) $attr6_default='';
-?><?php if (!$attr6_readonly) {
+?><?php if (!$attr6_readonly || $attr6_type=='hidden') {
?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr6_readonly) {
?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php
@@ -732,7 +793,7 @@ if ($attr6_readonly) {
$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_colspan) ?><?php $attr6_debug_info = 'a:1:{s:5:"title";s:15:"message:options";}' ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo $attr6_title ?></legend><?php } ?><?php unset($attr6) ?><?php unset($attr6_title) ?><?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:0:{}' ?><?php $attr4 = array() ?><?php
+?><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:1:{s:5:"title";s:15:"message:options";}' ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6) ?><?php unset($attr6_title) ?><?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:0:{}' ?><?php $attr4 = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -940,7 +1001,7 @@ if ( $attr6_readonly && $checked )
?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:7:"ldap_dn";s:4:"size";s:2:"50";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'ldap_dn','size'=>'50','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='ldap_dn' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true;
if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -';
if(!isset($attr6_default)) $attr6_default='';
-?><?php if (!$attr6_readonly) {
+?><?php if (!$attr6_readonly || $attr6_type=='hidden') {
?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php
if ($attr6_readonly) {
?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php
