commit e5097b18b276d1b7ae996f772c8dfb906ce8be9c
parent db412c9371513ef282b386ea842a1429d999b0f1
Author: dankert <devnull@localhost>
Date: Thu, 27 Jul 2006 22:39:49 +0200
*** empty log message ***
Diffstat:
8 files changed, 722 insertions(+), 223 deletions(-)
diff --git a/themes/default/pages/html/index/projectmenu.tpl.php b/themes/default/pages/html/index/projectmenu.tpl.php
@@ -1,4 +1,4 @@
-<?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,10 +12,10 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('title'=>'GLOBAL_PROJECTS','name'=>'login','icon'=>'','widths'=>'','width'=>'400') ?><?php $attr_title='GLOBAL_PROJECTS' ?><?php $attr_name='login' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?php $attr_width='400' ?><?php
+<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('title'=>'GLOBAL_PROJECTS','name'=>'login','icon'=>'project','widths'=>'','width'=>'400') ?><?php $attr_title='GLOBAL_PROJECTS' ?><?php $attr_name='login' ?><?php $attr_icon='project' ?><?php $attr_widths='' ?><?php $attr_width='400' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -72,7 +72,26 @@
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php $attr = array('list'=>'el','extract'=>'true','key'=>'list_key','value'=>'list_value') ?><?php $attr_list='el' ?><?php $attr_extract='true' ?><?php $attr_key='list_key' ?><?php $attr_value='list_value' ?><?php
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php $attr = array() ?><?php
+ global $fx;
+ if ( $fx =='f1')
+ $fx='f2';
+ else $fx='f1';
+
+ global $cell_column_nr;
+ $cell_column_nr=0;
+
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'logo','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
+ global $fx;
+ if (!isset($attr_class)) $attr_class='';
+ if ($attr_class=='fx') $attr['class']=$fx;
+
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
+ $attr['width']=$column_widths[$cell_column_nr-1];
+
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'projectmenu') ?><?php $attr_name='projectmenu' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array('list'=>'el','extract'=>'true','key'=>'list_key','value'=>'list_value') ?><?php $attr_list='el' ?><?php $attr_extract='true' ?><?php $attr_key='list_key' ?><?php $attr_value='list_value' ?><?php
$list_tmp_key = $attr_key;
$list_tmp_value = $attr_value;
$list_extract = ($attr_extract=='true');
@@ -108,20 +127,30 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'TREE_CHOOSE_PROJECT','target'=>'','url'=>'url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='TREE_CHOOSE_PROJECT' ?><?php $attr_target='' ?><?php $attr_url='url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if(!empty($attr_url))
- $tmp_url = $$attr_url;
- else
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'TREE_CHOOSE_PROJECT','config'=>'','target'=>'','var'=>'url','url'=>'','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='TREE_CHOOSE_PROJECT' ?><?php $attr_config='' ?><?php $attr_target='' ?><?php $attr_var='url' ?><?php $attr_url='' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if (!empty($attr_action))
+ {
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('var'=>'project','value'=>'project') ?><?php $attr_var='project' ?><?php $attr_value='project' ?><?php $$attr_var = $attr_value ?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php $attr = array('file'=>'','url'=>'','align'=>'left','type'=>'project','elementtype'=>'') ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_align='left' ?><?php $attr_type='project' ?><?php $attr_elementtype='' ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="<?php echo $url ?>" class="" target="" title="TREE_CHOOSE_PROJECT"><?php $attr = array('var'=>'project','value'=>'project') ?><?php $attr_var='project' ?><?php $attr_value='project' ?><?php $$attr_var = $attr_value ?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php $attr = array('config'=>'','file'=>'','url'=>'','icon'=>'','align'=>'left','type'=>'project','elementtype'=>'') ?><?php $attr_config='' ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_icon='' ?><?php $attr_align='left' ?><?php $attr_type='project' ?><?php $attr_elementtype='' ?><?php
if (!empty($attr_elementtype)) {
?><img src="<?php echo $image_dir.'icon_el_'.$$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($attr_type)) {
+} elseif(!empty($attr_config)) {
+ global $conf;
+ $c = $conf;
+ $path = explode('/',$attr_config);
+ foreach($path as $part)
+ $c = $c[$part];
+ $tmp_url = $c;
+?><img src="<?php echo $tmp_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+ }
+elseif (!empty($attr_type)) {
?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($$attr_url)) {
?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($attr_file)) {
-?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array('title'=>'','class'=>'','var'=>'name','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='name' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_config) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array('title'=>'','class'=>'','var'=>'name','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='name' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -136,6 +165,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -146,7 +177,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?> </table>
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
</table>
diff --git a/themes/default/pages/html/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php
@@ -1,4 +1,4 @@
-<?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,7 +12,7 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'index','subaction'=>'login','id'=>'','name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='index' ?><?php $attr_subaction='login' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
@@ -33,7 +33,7 @@
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php
if ( $conf['interface']['url_sessionid'] )
echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
-?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_LOGIN','name'=>'login','icon'=>'','widths'=>'','width'=>'400') ?><?php $attr_title='GLOBAL_LOGIN' ?><?php $attr_name='login' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?php $attr_width='400' ?><?php
+?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_LOGIN','name'=>'login','icon'=>'user','widths'=>'','width'=>'400') ?><?php $attr_title='GLOBAL_LOGIN' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='' ?><?php $attr_width='400' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -121,7 +121,7 @@
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -133,7 +133,22 @@
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -196,7 +211,7 @@
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -208,7 +223,22 @@
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -221,20 +251,30 @@
if ( $exec )
{
-?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php $attr = array('title'=>'','target'=>'_top','url'=>'logo_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='_top' ?><?php $attr_url='logo_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if(!empty($attr_url))
- $tmp_url = $$attr_url;
- else
+?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php $attr = array('title'=>'','config'=>'login/logo_url','target'=>'_top','var'=>'','url'=>'','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_config='login/logo_url' ?><?php $attr_target='_top' ?><?php $attr_var='' ?><?php $attr_url='' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if (!empty($attr_action))
+ {
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('file'=>'','url'=>'logo','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_file='' ?><?php $attr_url='logo' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="<?php echo $conf['login']['logo_url'] ?>" class="" target="_top" title=""><?php $attr = array('config'=>'login/logo','file'=>'','url'=>'','icon'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_config='login/logo' ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_icon='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
if (!empty($attr_elementtype)) {
?><img src="<?php echo $image_dir.'icon_el_'.$$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($attr_type)) {
+} elseif(!empty($attr_config)) {
+ global $conf;
+ $c = $conf;
+ $path = explode('/',$attr_config);
+ foreach($path as $part)
+ $c = $c[$part];
+ $tmp_url = $c;
+?><img src="<?php echo $tmp_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+ }
+elseif (!empty($attr_type)) {
?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($$attr_url)) {
?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($attr_file)) {
-?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?><?php
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_config) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?><?php
}
?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'logo_url','present'=>'','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='logo_url' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
@@ -267,7 +307,7 @@ if (!empty($attr_elementtype)) {
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -279,7 +319,22 @@ if (!empty($attr_elementtype)) {
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -292,15 +347,26 @@ if (!empty($attr_elementtype)) {
if ( $exec )
{
-?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php $attr = array('file'=>'','url'=>'logo','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_file='' ?><?php $attr_url='logo' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
+?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php $attr = array('config'=>'','file'=>'','url'=>'logo','icon'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_config='' ?><?php $attr_file='' ?><?php $attr_url='logo' ?><?php $attr_icon='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
if (!empty($attr_elementtype)) {
?><img src="<?php echo $image_dir.'icon_el_'.$$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($attr_type)) {
+} elseif(!empty($attr_config)) {
+ global $conf;
+ $c = $conf;
+ $path = explode('/',$attr_config);
+ foreach($path as $part)
+ $c = $c[$part];
+ $tmp_url = $c;
+?><img src="<?php echo $tmp_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+ }
+elseif (!empty($attr_type)) {
?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($$attr_url)) {
?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($attr_file)) {
-?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array() ?><?php
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_config) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array() ?><?php
}
?><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
@@ -335,7 +401,7 @@ if (!empty($attr_elementtype)) {
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -347,7 +413,22 @@ if (!empty($attr_elementtype)) {
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -379,7 +460,7 @@ if (!empty($attr_elementtype)) {
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'motd','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='motd' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'motd','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='motd' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -394,6 +475,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -404,7 +487,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'nologin','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='nologin' ?><?php $attr_false='' ?><?php
@@ -437,7 +520,7 @@ if (!empty($attr_elementtype)) {
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -449,7 +532,22 @@ if (!empty($attr_elementtype)) {
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -481,7 +579,7 @@ if (!empty($attr_elementtype)) {
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'LOGIN_NOLOGIN_DESC','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='LOGIN_NOLOGIN_DESC' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'LOGIN_NOLOGIN_DESC','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='LOGIN_NOLOGIN_DESC' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -496,6 +594,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -506,7 +606,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'readonly','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='readonly' ?><?php $attr_false='' ?><?php
@@ -539,7 +639,7 @@ if (!empty($attr_elementtype)) {
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -551,7 +651,22 @@ if (!empty($attr_elementtype)) {
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -583,7 +698,7 @@ if (!empty($attr_elementtype)) {
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_READONLY_DESC','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_READONLY_DESC' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_READONLY_DESC','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_READONLY_DESC' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -598,6 +713,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -608,7 +725,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'nopublish','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='nopublish' ?><?php $attr_false='' ?><?php
@@ -641,7 +758,7 @@ if (!empty($attr_elementtype)) {
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -653,7 +770,22 @@ if (!empty($attr_elementtype)) {
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -685,7 +817,7 @@ if (!empty($attr_elementtype)) {
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_NOPUBLISH_DESC','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_NOPUBLISH_DESC' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_NOPUBLISH_DESC','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_NOPUBLISH_DESC' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -700,6 +832,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -710,7 +844,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'','false'=>'nologin') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='nologin' ?><?php
@@ -743,7 +877,7 @@ if (!empty($attr_elementtype)) {
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -755,7 +889,22 @@ if (!empty($attr_elementtype)) {
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -777,6 +926,25 @@ if (!empty($attr_elementtype)) {
global $cell_column_nr;
$cell_column_nr=0;
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'logo','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
+ global $fx;
+ if (!isset($attr_class)) $attr_class='';
+ if ($attr_class=='fx') $attr['class']=$fx;
+
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
+ $attr['width']=$column_widths[$cell_column_nr-1];
+
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'login') ?><?php $attr_name='login' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ global $fx;
+ if ( $fx =='f1')
+ $fx='f2';
+ else $fx='f1';
+
+ global $cell_column_nr;
+ $cell_column_nr=0;
+
?><tr><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
@@ -787,7 +955,7 @@ if (!empty($attr_elementtype)) {
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_USERNAME','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_USERNAME' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_USERNAME','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_USERNAME' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -802,6 +970,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -812,7 +982,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -841,7 +1011,7 @@ if (!empty($attr_elementtype)) {
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_PASSWORD','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_PASSWORD' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_PASSWORD','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_PASSWORD' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -856,6 +1026,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -866,7 +1038,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -895,7 +1067,7 @@ if (!empty($attr_elementtype)) {
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_DATABASE','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_DATABASE' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_DATABASE','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_DATABASE' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -910,6 +1082,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -920,7 +1094,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -989,12 +1163,11 @@ document.forms[0].screenwidth.value=window.innerWidth;
<?php $dur = time()-START_TIME;
echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small>
<?php } ?>
-<?php unset($attr) ?><?php $attr = array() ?></form><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array('title'=>'','target'=>'_top','url'=>'http://www.gnu.org/copyleft/gpl.html','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='_top' ?><?php $attr_url='http://www.gnu.org/copyleft/gpl.html' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if(!empty($attr_url))
- $tmp_url = $$attr_url;
- else
+<?php unset($attr) ?><?php $attr = array() ?></form><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array('title'=>'','config'=>'','target'=>'_top','var'=>'','url'=>'http://www.gnu.org/copyleft/gpl.html','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_config='' ?><?php $attr_target='_top' ?><?php $attr_var='' ?><?php $attr_url='http://www.gnu.org/copyleft/gpl.html' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if (!empty($attr_action))
+ {
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_GPL','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_GPL' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="http://www.gnu.org/copyleft/gpl.html" class="" target="_top" title=""><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_GPL','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_GPL' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -1009,6 +1182,8 @@ document.forms[0].screenwidth.value=window.innerWidth;
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -1019,7 +1194,7 @@ document.forms[0].screenwidth.value=window.innerWidth;
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('field'=>'login_name') ?><?php $attr_field='login_name' ?><script name="JavaScript" type="text/javascript"><!--
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('field'=>'login_name') ?><?php $attr_field='login_name' ?><script name="JavaScript" type="text/javascript"><!--
document.forms[0].<?php echo $attr_field ?>.focus();
document.forms[0].<?php echo $attr_field ?>.select();
//--></script>
diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php
@@ -1,4 +1,4 @@
-<?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,7 +12,7 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','width'=>'100%','space'=>'0','padding'=>'5','widths'=>'') ?><?php $attr_class='' ?><?php $attr_width='100%' ?><?php $attr_space='0' ?><?php $attr_padding='5' ?><?php $attr_widths='' ?><?php
@@ -41,15 +41,26 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('file'=>'','url'=>'','align'=>'left','type'=>'type','elementtype'=>'') ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_align='left' ?><?php $attr_type='type' ?><?php $attr_elementtype='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('config'=>'','file'=>'','url'=>'','icon'=>'','align'=>'left','type'=>'type','elementtype'=>'') ?><?php $attr_config='' ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_icon='' ?><?php $attr_align='left' ?><?php $attr_type='type' ?><?php $attr_elementtype='' ?><?php
if (!empty($attr_elementtype)) {
?><img src="<?php echo $image_dir.'icon_el_'.$$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($attr_type)) {
+} elseif(!empty($attr_config)) {
+ global $conf;
+ $c = $conf;
+ $path = explode('/',$attr_config);
+ foreach($path as $part)
+ $c = $c[$part];
+ $tmp_url = $c;
+?><img src="<?php echo $tmp_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+ }
+elseif (!empty($attr_type)) {
?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($$attr_url)) {
?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
} elseif (!empty($attr_file)) {
-?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array('list'=>'path','extract'=>'true','key'=>'list_key','value'=>'xy') ?><?php $attr_list='path' ?><?php $attr_extract='true' ?><?php $attr_key='list_key' ?><?php $attr_value='xy' ?><?php
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_config) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array('list'=>'path','extract'=>'true','key'=>'list_key','value'=>'xy') ?><?php $attr_list='path' ?><?php $attr_extract='true' ?><?php $attr_key='list_key' ?><?php $attr_value='xy' ?><?php
$list_tmp_key = $attr_key;
$list_tmp_value = $attr_value;
$list_extract = ($attr_extract=='true');
@@ -66,12 +77,11 @@ if (!empty($attr_elementtype)) {
}
extract($$list_tmp_value);
}
-?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'title','target'=>'cms_main','url'=>'url','class'=>'path','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='title' ?><?php $attr_target='cms_main' ?><?php $attr_url='url' ?><?php $attr_class='path' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if(!empty($attr_url))
- $tmp_url = $$attr_url;
- else
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'title','config'=>'','target'=>'cms_main','var'=>'','url'=>'url','class'=>'path','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='title' ?><?php $attr_config='' ?><?php $attr_target='cms_main' ?><?php $attr_var='' ?><?php $attr_url='url' ?><?php $attr_class='path' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if (!empty($attr_action))
+ {
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'name','text'=>'','raw'=>'','maxlength'=>'20') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='name' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='20' ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="url" class="path" target="cms_main" title="title"><?php $attr = array('title'=>'','class'=>'','var'=>'name','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'20') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='name' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='20' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -86,6 +96,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -96,12 +108,12 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('type'=>'filesep') ?><?php $attr_type='filesep' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('type'=>'filesep') ?><?php $attr_type='filesep' ?><?php
if ($attr_type=='filesep')
echo ' <strong>»</strong> ';
else
echo "char error";
-?><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array('title'=>'text','class'=>'title','var'=>'text','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='text' ?><?php $attr_class='title' ?><?php $attr_var='text' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array('title'=>'text','class'=>'title','var'=>'text','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='text' ?><?php $attr_class='title' ?><?php $attr_var='text' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -116,6 +128,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -126,7 +140,57 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'text-align:right;','class'=>'menu','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='text-align:right;' ?><?php $attr_class='menu' ?><?php $attr_colspan='' ?><?php
+ global $fx;
+ if (!isset($attr_class)) $attr_class='';
+ if ($attr_class=='fx') $attr['class']=$fx;
+
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
+ $attr['width']=$column_widths[$cell_column_nr-1];
+
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('list'=>'windowIcons','extract'=>'true','key'=>'list_key','value'=>'list_value') ?><?php $attr_list='windowIcons' ?><?php $attr_extract='true' ?><?php $attr_key='list_key' ?><?php $attr_value='list_value' ?><?php
+ $list_tmp_key = $attr_key;
+ $list_tmp_value = $attr_value;
+ $list_extract = ($attr_extract=='true');
+
+
+ foreach( $$attr_list as $$list_tmp_key => $$list_tmp_value )
+ {
+ if ( $list_extract )
+ {
+ if ( !is_array($$list_tmp_value) )
+ {
+ print_r($$list_tmp_value);
+ die( 'not an array at key: '.$$list_tmp_key );
+ }
+ extract($$list_tmp_value);
+ }
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'','config'=>'','target'=>'_top','var'=>'url','url'=>'','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_config='' ?><?php $attr_target='_top' ?><?php $attr_var='url' ?><?php $attr_url='' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if (!empty($attr_action))
+ {
+ $tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="<?php echo $url ?>" class="" target="_top" title=""><?php $attr = array('config'=>'','file'=>'','url'=>'','icon'=>'','align'=>'middle','type'=>'type','elementtype'=>'') ?><?php $attr_config='' ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_icon='' ?><?php $attr_align='middle' ?><?php $attr_type='type' ?><?php $attr_elementtype='' ?><?php
+if (!empty($attr_elementtype)) {
+?><img src="<?php echo $image_dir.'icon_el_'.$$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif(!empty($attr_config)) {
+ global $conf;
+ $c = $conf;
+ $path = explode('/',$attr_config);
+ foreach($path as $part)
+ $c = $c[$part];
+ $tmp_url = $c;
+?><img src="<?php echo $tmp_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+ }
+elseif (!empty($attr_type)) {
+?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($$attr_url)) {
+?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_file)) {
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_config) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -135,7 +199,7 @@ if (!empty($attr_elementtype)) {
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'subaction','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='subaction' ?><?php $attr_colspan='' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'subaction','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='subaction' ?><?php $attr_colspan='2' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -162,12 +226,11 @@ if (!empty($attr_elementtype)) {
}
extract($$list_tmp_value);
}
-?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'','target'=>'cms_main_main','url'=>'url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main_main' ?><?php $attr_url='url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if(!empty($attr_url))
- $tmp_url = $$attr_url;
- else
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'title','config'=>'','target'=>'cms_main_main','var'=>'url','url'=>'','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='title' ?><?php $attr_config='' ?><?php $attr_target='cms_main_main' ?><?php $attr_var='url' ?><?php $attr_url='' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if (!empty($attr_action))
+ {
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'text','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='text' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="<?php echo $url ?>" class="" target="cms_main_main" title="title"><?php $attr = array('title'=>'','class'=>'','var'=>'text','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='text' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -182,6 +245,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -192,7 +257,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','raw'=>'__','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_raw='__' ?><?php $attr_maxlength='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','textvar'=>'','raw'=>'__','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='__' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -207,6 +272,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -217,7 +284,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></table><?php unset($attr) ?><?php $attr = array() ?>
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></table><?php unset($attr) ?><?php $attr = array() ?>
<!-- $Id$ -->
<?php if ($showDuration) { ?>
diff --git a/themes/default/pages/html/pageelement/editlongtext.tpl.php b/themes/default/pages/html/pageelement/editlongtext.tpl.php
@@ -1,4 +1,4 @@
-<?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,7 +12,7 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
@@ -168,7 +168,7 @@ insert('text',"\n|","| |\n| | |\n");
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'desc','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='desc' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'desc','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='desc' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -183,6 +183,8 @@ insert('text',"\n|","| |\n| | |\n");
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -193,7 +195,7 @@ insert('text',"\n|","| |\n| | |\n");
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'preview_text','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='preview_text' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'preview_text','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='preview_text' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
// Wahr-Vergleich
if ( !empty($attr_true) )
@@ -224,7 +226,7 @@ insert('text',"\n|","| |\n| | |\n");
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -236,7 +238,22 @@ insert('text',"\n|","| |\n| | |\n");
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -268,7 +285,7 @@ insert('text',"\n|","| |\n| | |\n");
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'preview_text','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='preview_text' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'preview_text','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='preview_text' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -283,6 +300,8 @@ insert('text',"\n|","| |\n| | |\n");
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -293,7 +312,7 @@ insert('text',"\n|","| |\n| | |\n");
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php editBar() ?>
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php editBar() ?>
<?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
?><?php unset($attr) ?><?php $attr = array() ?><?php
@@ -315,7 +334,7 @@ insert('text',"\n|","| |\n| | |\n");
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'text','rows'=>'10','cols'=>'40','value'=>'','index'=>'','onchange'=>'','prefix'=>'','class'=>'longtext','default'=>'') ?><?php $attr_name='text' ?><?php $attr_rows='10' ?><?php $attr_cols='40' ?><?php $attr_value='' ?><?php $attr_index='' ?><?php $attr_onchange='' ?><?php $attr_prefix='' ?><?php $attr_class='longtext' ?><?php $attr_default='' ?><textarea name="<?php echo $attr_name ?>" rows="<?php echo $attr_rows ?>" cols="<?php echo $attr_cols ?>"><?php echo htmlentities(isset($$attr_name)?$$attr_name:$attr_default) ?></textarea><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_rows) ?><?php unset($attr_cols) ?><?php unset($attr_value) ?><?php unset($attr_index) ?><?php unset($attr_onchange) ?><?php unset($attr_prefix) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><tr>
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'text','rows'=>'25','cols'=>'70','value'=>'','index'=>'','onchange'=>'','prefix'=>'','class'=>'longtext','default'=>'') ?><?php $attr_name='text' ?><?php $attr_rows='25' ?><?php $attr_cols='70' ?><?php $attr_value='' ?><?php $attr_index='' ?><?php $attr_onchange='' ?><?php $attr_prefix='' ?><?php $attr_class='longtext' ?><?php $attr_default='' ?><textarea class="<?php echo $attr_class ?>" name="<?php echo $attr_name ?>" rows="<?php echo $attr_rows ?>" cols="<?php echo $attr_cols ?>"><?php echo htmlentities(isset($$attr_name)?$$attr_name:$attr_default) ?></textarea><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_rows) ?><?php unset($attr_cols) ?><?php unset($attr_value) ?><?php unset($attr_index) ?><?php unset($attr_onchange) ?><?php unset($attr_prefix) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><tr>
<td class="f2"><?php if ( $release ) echo Html::checkBox('release',true).' '.lang('GLOBAL_RELEASE') ?></td>
<td class="f2"><?php echo Html::checkBox('html',$html,false) ?> <span title="<?php echo lang('EL_PROP_HTML_DESC') ?>"><?php echo lang('EL_PROP_HTML') ?></span></td>
</tr>
diff --git a/themes/default/pages/html/pageelement/editnumber.tpl.php b/themes/default/pages/html/pageelement/editnumber.tpl.php
@@ -1,4 +1,4 @@
-<?php /* source: ./themes/default/include/html/page.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,10 +12,10 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php /* source: ./themes/default/include/html/form.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
+<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
if (empty($attr_action))
$attr_action = $actionName;
if (empty($attr_subaction))
@@ -33,7 +33,7 @@
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php
if ( $conf['interface']['url_sessionid'] )
echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
-?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php /* source: ./themes/default/include/html/window.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','name'=>'element','icon'=>'','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='element' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?php $attr_width='85%' ?><?php
+?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'','name'=>'element','icon'=>'','widths'=>'','width'=>'93%') ?><?php $attr_title='' ?><?php $attr_name='element' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?php $attr_width='93%' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -54,13 +54,23 @@
}
echo '<span class="title">'.lang($windowTitle).'</span>';
?>
- </th>
+ </td><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
+ }
+ ?>
+ </td>
</tr>
<tr><td class="subaction">
<?php foreach( $windowMenu as $menu )
{
?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a> <?php
}
+ if ($conf['help']['enabled'] )
+ {
+ ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('GLOBAL_HELP') ?>" class="menu">?</a><?php
+ }
?></td>
</tr>
@@ -86,7 +96,7 @@
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -95,7 +105,7 @@
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'help','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='help' ?><?php $attr_colspan='2' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'help','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='help' ?><?php $attr_colspan='2' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -105,7 +115,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'desc','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='desc' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'desc','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='desc' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -120,8 +130,10 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present';
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
@@ -130,7 +142,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -139,7 +151,7 @@
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='2' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='2' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -149,7 +161,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php /* source: ./themes/default/include/html/hidden.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('name'=>'decimals','default'=>'decimals') ?><?php $attr_name='decimals' ?><?php $attr_default='decimals' ?><input type="hidden" name="<?php echo $attr_name ?>" value="<?php echo isset($$attr_name)?$$attr_name:$attr_default ?>" /><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php /* source: ./themes/default/include/html/input.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'number','prefix'=>'','value'=>'','size'=>'15','maxlength'=>'20','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='number' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='15' ?><?php $attr_maxlength='20' ?><?php $attr_onchange='' ?><input name="<?php echo $attr_name ?>" size="<?php echo $attr_size ?>" maxlength="<?php echo $attr_maxlength ?>" class="<?php echo $attr_class ?>" value="<?php echo isset($$attr_name)?$$attr_name:$attr_default ?>" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_index) ?><?php unset($attr_name) ?><?php unset($attr_prefix) ?><?php unset($attr_value) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php unset($attr_onchange) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'decimals','default'=>'decimals') ?><?php $attr_name='decimals' ?><?php $attr_default='decimals' ?><input type="hidden" name="<?php echo $attr_name ?>" value="<?php echo isset($$attr_name)?$$attr_name:$attr_default ?>" /><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'number','prefix'=>'','value'=>'','size'=>'15','maxlength'=>'20','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='number' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='15' ?><?php $attr_maxlength='20' ?><?php $attr_onchange='' ?><input name="<?php echo $attr_name ?>" size="<?php echo $attr_size ?>" maxlength="<?php echo $attr_maxlength ?>" class="<?php echo $attr_class ?>" value="<?php echo isset($$attr_name)?$$attr_name:$attr_default ?>" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_index) ?><?php unset($attr_name) ?><?php unset($attr_prefix) ?><?php unset($attr_value) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php unset($attr_onchange) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -158,7 +170,7 @@
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -168,7 +180,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'global_decimals','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='global_decimals' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'global_decimals','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='global_decimals' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -183,8 +195,10 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present';
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
@@ -193,7 +207,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -203,7 +217,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'decimals','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='decimals' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'decimals','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='decimals' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -218,8 +232,10 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present';
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
@@ -228,7 +244,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/if.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'release','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='release' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'release','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='release' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
// Wahr-Vergleich
if ( !empty($attr_true) )
@@ -259,7 +275,7 @@
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -271,7 +287,22 @@
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -284,7 +315,7 @@
if ( $exec )
{
-?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -293,7 +324,7 @@
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='2' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='2' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -303,7 +334,16 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php /* source: ./themes/default/include/html/checkbox.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('default'=>'false','var'=>'','readonly'=>'false','name'=>'release','prefix'=>'') ?><?php $attr_default='false' ?><?php $attr_var='' ?><?php $attr_readonly='false' ?><?php $attr_name='release' ?><?php $attr_prefix='' ?><input type="checkbox" name="<?php echo !empty($$attr_var)?$attr_prefix.$$attr_var:$attr_name ?>" <?php if ($attr_readonly=='true') echo ' disabled="disabled"' ?> value="1" <?php if( ($attr_default=='true')||(isset($$attr_name)&&$$attr_name) ) echo 'checked="checked"' ?> /><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_var) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?php unset($attr_prefix) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','raw'=>'_','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_raw='_' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('default'=>'false','readonly'=>'false','name'=>'release') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='release' ?><?php
+ $attr_name = !empty($$attr_name)?$$attr_name:$attr_name;
+ $attr_readonly = ( $attr_readonly == 'true' );
+ $attr_default = ( $attr_default == 'true' );
+
+ if ( isset($$attr_name) )
+ $checked = isset($$$attr_name)&& $$$attr_name==true;
+ else
+ $checked = $attr_default;
+?><input type="checkbox" name="<?php echo $attr_name ?>" <?php if ($attr_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','textvar'=>'','raw'=>'_','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='_' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -318,8 +358,10 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present';
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
@@ -328,7 +370,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_RELEASE','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_RELEASE' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_RELEASE','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_RELEASE' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -343,8 +385,10 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present';
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
@@ -353,9 +397,9 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/if-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php /* source: ./themes/default/include/html/if.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'publish','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='publish' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
+?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'publish','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='publish' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
// Wahr-Vergleich
if ( !empty($attr_true) )
@@ -386,7 +430,7 @@
$exec = empty( $$attr_empty );
}
- // Vergleich auf nicht-leer
+ // Vergleich auf Vorhandensein
elseif ( !empty($attr_present) )
{
if ( !isset($$attr_present) )
@@ -398,7 +442,22 @@
elseif ( is_numeric($$attr_present) )
$exec = $$attr_present>=0;
else
- $exec = !empty( $$attr_present );
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( !empty($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = false;
+ elseif ( is_array($$attr_notempty) )
+ $exec = (count($$attr_notempty)>0);
+ elseif ( is_bool($$attr_notempty) )
+ $exec = true;
+ elseif ( is_numeric($$attr_notempty) )
+ $exec = $$attr_notempty>=0;
+ else
+ $exec = !empty( $$attr_notempty );
}
else
{
@@ -411,7 +470,7 @@
if ( $exec )
{
-?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -420,7 +479,7 @@
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='2' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='2' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -430,7 +489,16 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php /* source: ./themes/default/include/html/checkbox.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('default'=>'false','var'=>'','readonly'=>'false','name'=>'publish','prefix'=>'') ?><?php $attr_default='false' ?><?php $attr_var='' ?><?php $attr_readonly='false' ?><?php $attr_name='publish' ?><?php $attr_prefix='' ?><input type="checkbox" name="<?php echo !empty($$attr_var)?$attr_prefix.$$attr_var:$attr_name ?>" <?php if ($attr_readonly=='true') echo ' disabled="disabled"' ?> value="1" <?php if( ($attr_default=='true')||(isset($$attr_name)&&$$attr_name) ) echo 'checked="checked"' ?> /><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_var) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?php unset($attr_prefix) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','raw'=>'_','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_raw='_' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('default'=>'false','readonly'=>'false','name'=>'publish') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='publish' ?><?php
+ $attr_name = !empty($$attr_name)?$$attr_name:$attr_name;
+ $attr_readonly = ( $attr_readonly == 'true' );
+ $attr_default = ( $attr_default == 'true' );
+
+ if ( isset($$attr_name) )
+ $checked = isset($$$attr_name)&& $$$attr_name==true;
+ else
+ $checked = $attr_default;
+?><input type="checkbox" name="<?php echo $attr_name ?>" <?php if ($attr_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','textvar'=>'','raw'=>'_','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='_' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -445,8 +513,10 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present';
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
@@ -455,7 +525,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'PAGE_PUBLISH_AFTER_SAVE','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'PAGE_PUBLISH_AFTER_SAVE','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -470,8 +540,10 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present';
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
else echo 'text error';
@@ -480,9 +552,9 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/if-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?><?php
+?><?php unset($attr) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -491,7 +563,7 @@
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -501,7 +573,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php /* source: ./themes/default/include/html/button.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('type'=>'ok') ?><?php $attr_type='ok' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('type'=>'ok') ?><?php $attr_type='ok' ?><?php
if ($attr_type=='ok')
{
$attr_type = 'submit';
@@ -509,7 +581,7 @@
$attr_text = 'BUTTON_OK';
$attr_value = 'ok';
}
-?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/window-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?> </table>
+?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
</table>
@@ -523,11 +595,11 @@
<?php $dur = time()-START_TIME;
echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small>
<?php } ?>
-<?php unset($attr) ?><?php /* source: ./themes/default/include/html/form-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?></form><?php unset($attr) ?><?php /* source: ./themes/default/include/html/focus.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array('field'=>'text') ?><?php $attr_field='text' ?><script name="JavaScript" type="text/javascript"><!--
+<?php unset($attr) ?><?php $attr = array() ?></form><?php unset($attr) ?><?php $attr = array('field'=>'text') ?><?php $attr_field='text' ?><script name="JavaScript" type="text/javascript"><!--
document.forms[0].<?php echo $attr_field ?>.focus();
document.forms[0].<?php echo $attr_field ?>.select();
//--></script>
-<?php unset($attr) ?><?php unset($attr_field) ?><?php /* source: ./themes/default/include/html/page-end.inc.php - compile time: Sun, 29 Jan 2006 19:46:15 +0100 */ ?><?php $attr = array() ?>
+<?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?>
<!-- $Id$ -->
<?php if ($showDuration) { ?>
diff --git a/themes/default/pages/html/pageelement/show.tpl.php b/themes/default/pages/html/pageelement/show.tpl.php
@@ -0,0 +1,144 @@
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<!-- $Id$ -->
+<head>
+ <title><?php echo $cms_title ?></title>
+ <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
+ <meta name="MSSmartTagsPreventParsing" content="true" />
+ <meta name="robots" content="noindex,nofollow" />
+ <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" />
+<?php if($stylesheet!='default') { ?>
+ <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" />
+<?php } ?>
+</head>
+
+<body class="<?php echo $attr_class ?>">
+
+
+<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('title'=>'','name'=>'element','icon'=>'','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='element' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?php $attr_width='85%' ?><?php
+ $coloumn_widths=array();
+ if (!empty($attr_widths))
+ {
+ $column_widths = explode(',',$attr_widths);
+ unset($attr['widths']);
+ }
+ global $image_dir;
+ echo '<br/><br/><br/><center>';
+ echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">';
+ echo '<tr><td class="menu">';
+ if ( !empty($attr_icon) )
+ echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">';
+ foreach( $path as $pathElement)
+ {
+ extract($pathElement);
+ echo '<a href="'.$url.'" class="path">'.lang($name).'</a>';
+ echo ' » ';
+ }
+ echo '<span class="title">'.lang($windowTitle).'</span>';
+ ?>
+ </th>
+ </tr>
+ <tr><td class="subaction">
+ <?php foreach( $windowMenu as $menu )
+ {
+ ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a> <?php
+ }
+ if ($conf['help']['enabled'] )
+ {
+ ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('GLOBAL_HELP') ?>" class="menu">?</a><?php
+ }
+ ?></td>
+ </tr>
+
+<?php if (isset($notices) && count($notices)>0 )
+ { ?>
+
+ <tr>
+ <td><table>
+
+ <?php foreach( $notices as $notice ) { ?>
+
+ <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td>
+ <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td>
+ </tr>
+ <?php } ?>
+
+ </table></td>
+ </tr>
+
+<?php } ?>
+
+
+
+ <tr>
+ <td>
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php $attr = array() ?><?php
+ global $fx;
+ if ( $fx =='f1')
+ $fx='f2';
+ else $fx='f1';
+
+ global $cell_column_nr;
+ $cell_column_nr=0;
+
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='2' ?><?php
+ global $fx;
+ if (!isset($attr_class)) $attr_class='';
+ if ($attr_class=='fx') $attr['class']=$fx;
+
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
+ $attr['width']=$column_widths[$cell_column_nr-1];
+
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'value','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='value' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+ if(empty($attr_title)) $attr_title = $attr_text;
+?><span class="<?php echo $attr_class ?>"><?php
+ if (!empty($attr_array))
+ {
+ //geht nicht:
+ //echo $$attr_array[$attr_var].'%';
+ $tmpArray = $$attr_array;
+ if (!empty($attr_var))
+ $tmp_text = $tmpArray[$attr_var];
+ else
+ $tmp_text = lang($tmpArray[$attr_text]);
+ }
+ elseif (!empty($attr_text))
+ $tmp_text = lang($attr_text);
+ elseif (!empty($attr_var))
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
+ elseif (!empty($attr_raw))
+ $tmp_text = str_replace('_',' ',$attr_raw);
+ else echo 'text error';
+
+ if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
+ $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
+
+ echo $tmp_text;
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
+ </td>
+ </tr>
+</table>
+
+</center>
+
+<?php if ($showDuration)
+ { ?>
+<br/>
+<small>
+<?php $dur = time()-START_TIME;
+ echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small>
+<?php } ?>
+<?php unset($attr) ?><?php $attr = array() ?>
+<!-- $Id$ -->
+
+<?php if ($showDuration) { ?>
+<br/>
+<small>
+<?php $dur = time()-START_TIME;
+// echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small>
+<?php } ?>
+
+</body>
+</html><?php unset($attr) ?>+
\ No newline at end of file
diff --git a/themes/default/pages/html/title/show.tpl.php b/themes/default/pages/html/title/show.tpl.php
@@ -12,7 +12,7 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','width'=>'100%','space'=>'0','padding'=>'5','widths'=>'') ?><?php $attr_class='' ?><?php $attr_width='100%' ?><?php $attr_space='0' ?><?php $attr_padding='5' ?><?php $attr_widths='' ?><?php
@@ -31,7 +31,7 @@
global $cell_column_nr;
$cell_column_nr=0;
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'40%','style'=>'','class'=>'title','colspan'=>'') ?><?php $attr_width='40%' ?><?php $attr_style='' ?><?php $attr_class='title' ?><?php $attr_colspan='' ?><?php
+?><tr><?php unset($attr) ?><?php $attr = array('width'=>'30%','style'=>'','class'=>'title','colspan'=>'') ?><?php $attr_width='30%' ?><?php $attr_style='' ?><?php $attr_class='title' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -41,7 +41,17 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'USER_LOGINAS','class'=>'','var'=>'userfullname','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='USER_LOGINAS' ?><?php $attr_class='' ?><?php $attr_var='userfullname' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('file'=>'','url'=>'','icon'=>'database','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_icon='database' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
+if (!empty($attr_elementtype)) {
+?><img src="<?php echo $image_dir.'icon_el_'.$$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_type)) {
+?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($$attr_url)) {
+?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_file)) {
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array('title'=>'dbid','class'=>'','var'=>'dbname','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='dbid' ?><?php $attr_class='' ?><?php $attr_var='dbname' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -56,6 +66,8 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -66,57 +78,17 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','raw'=>'_(','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_raw='_(' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
- if (!empty($attr_array))
- {
- //geht nicht:
- //echo $$attr_array[$attr_var].'%';
- $tmpArray = $$attr_array;
- if (!empty($attr_var))
- $tmp_text = $tmpArray[$attr_var];
- else
- $tmp_text = lang($tmpArray[$attr_text]);
- }
- elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
- elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
- elseif (!empty($attr_raw))
- $tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
-
- if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
-
- echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'dbid','class'=>'','var'=>'dbname','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='dbid' ?><?php $attr_class='' ?><?php $attr_var='dbname' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
- if (!empty($attr_array))
- {
- //geht nicht:
- //echo $$attr_array[$attr_var].'%';
- $tmpArray = $$attr_array;
- if (!empty($attr_var))
- $tmp_text = $tmpArray[$attr_var];
- else
- $tmp_text = lang($tmpArray[$attr_text]);
- }
- elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
- elseif (!empty($attr_var))
- $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
- elseif (!empty($attr_raw))
- $tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'40%','style'=>'text-align:center;','class'=>'title','colspan'=>'') ?><?php $attr_width='40%' ?><?php $attr_style='text-align:center;' ?><?php $attr_class='title' ?><?php $attr_colspan='' ?><?php
+ global $fx;
+ if (!isset($attr_class)) $attr_class='';
+ if ($attr_class=='fx') $attr['class']=$fx;
- if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
- $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
+ global $cell_column_nr;
+ $cell_column_nr++;
+ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
+ $attr['width']=$column_widths[$cell_column_nr-1];
- echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','raw'=>')_','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_raw=')_' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'cms_title','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='cms_title' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -131,6 +103,8 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -141,7 +115,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'20%','style'=>'text-align:center;','class'=>'title','colspan'=>'') ?><?php $attr_width='20%' ?><?php $attr_style='text-align:center;' ?><?php $attr_class='title' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'30%','style'=>'text-align:right;','class'=>'title','colspan'=>'') ?><?php $attr_width='30%' ?><?php $attr_style='text-align:right;' ?><?php $attr_class='title' ?><?php $attr_colspan='' ?><?php
global $fx;
if (!isset($attr_class)) $attr_class='';
if ($attr_class=='fx') $attr['class']=$fx;
@@ -151,7 +125,22 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'cms_title','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='cms_title' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('file'=>'','url'=>'','icon'=>'user','align'=>'right','type'=>'','elementtype'=>'') ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_icon='user' ?><?php $attr_align='right' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
+if (!empty($attr_elementtype)) {
+?><img src="<?php echo $image_dir.'icon_el_'.$$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_type)) {
+?><img src="<?php echo $image_dir.'icon_'.$$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_icon)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($$attr_url)) {
+?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (!empty($attr_file)) {
+?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array('title'=>'USER_LOGOUT_DESC','target'=>'_top','url'=>'logout_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='USER_LOGOUT_DESC' ?><?php $attr_target='_top' ?><?php $attr_url='logout_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if(!empty($attr_url))
+ $tmp_url = $$attr_url;
+ else
+ $tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_LOGOUT','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_LOGOUT' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -166,6 +155,8 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -176,22 +167,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'40%','style'=>'text-align:right;','class'=>'title','colspan'=>'') ?><?php $attr_width='40%' ?><?php $attr_style='text-align:right;' ?><?php $attr_class='title' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
-
- global $cell_column_nr;
- $cell_column_nr++;
- if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
- $attr['width']=$column_widths[$cell_column_nr-1];
-
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'USER_PROFILE_DESC','target'=>'cms_main_main','url'=>'profile_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='USER_PROFILE_DESC' ?><?php $attr_target='cms_main_main' ?><?php $attr_url='profile_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if(!empty($attr_url))
- $tmp_url = $$attr_url;
- else
- $tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_YOURPROFILE','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_YOURPROFILE' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','textvar'=>'','raw'=>' (','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw=' (' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -206,6 +182,8 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -216,7 +194,12 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','raw'=>'_|_','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_raw='_|_' ?><?php $attr_maxlength='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'USER_PROFILE_DESC','target'=>'cms_main_main','url'=>'profile_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='USER_PROFILE_DESC' ?><?php $attr_target='cms_main_main' ?><?php $attr_url='profile_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+ if(!empty($attr_url))
+ $tmp_url = $$attr_url;
+ else
+ $tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'userfullname','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='userfullname' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -231,6 +214,8 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -241,12 +226,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'USER_LOGOUT_DESC','target'=>'_top','url'=>'logout_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='USER_LOGOUT_DESC' ?><?php $attr_target='_top' ?><?php $attr_url='logout_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if(!empty($attr_url))
- $tmp_url = $$attr_url;
- else
- $tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_LOGOUT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_LOGOUT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','textvar'=>'','raw'=>')','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw=')' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -261,6 +241,8 @@
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -271,7 +253,7 @@
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></table><?php unset($attr) ?><?php $attr = array() ?>
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></table><?php unset($attr) ?><?php $attr = array() ?>
<!-- $Id$ -->
<?php if ($showDuration) { ?>
diff --git a/themes/default/pages/html/treetitle/show.tpl.php b/themes/default/pages/html/treetitle/show.tpl.php
@@ -1,4 +1,4 @@
-<?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,7 +12,7 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','width'=>'100%','space'=>'0','padding'=>'5','widths'=>'') ?><?php $attr_class='' ?><?php $attr_width='100%' ?><?php $attr_space='0' ?><?php $attr_padding='5' ?><?php $attr_widths='' ?><?php
@@ -71,7 +71,7 @@ if (!empty($attr_elementtype)) {
$tmp_url = $$attr_url;
else
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'name','text'=>'','raw'=>'','maxlength'=>'20') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='name' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='20' ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'name','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'20') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='name' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='20' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -86,6 +86,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -96,12 +98,12 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('type'=>'filesep') ?><?php $attr_type='filesep' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('type'=>'filesep') ?><?php $attr_type='filesep' ?><?php
if ($attr_type=='filesep')
echo ' <strong>»</strong> ';
else
echo "char error";
-?><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array('title'=>'text','class'=>'title','var'=>'text','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='text' ?><?php $attr_class='title' ?><?php $attr_var='text' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array('title'=>'text','class'=>'title','var'=>'text','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='text' ?><?php $attr_class='title' ?><?php $attr_var='text' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -116,6 +118,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -126,7 +130,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
global $fx;
if ( $fx =='f1')
$fx='f2';
@@ -162,12 +166,12 @@ if (!empty($attr_elementtype)) {
}
extract($$list_tmp_value);
}
-?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'','target'=>'_parent','url'=>'url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='_parent' ?><?php $attr_url='url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'title','target'=>'_parent','url'=>'url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='title' ?><?php $attr_target='_parent' ?><?php $attr_url='url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
if(!empty($attr_url))
$tmp_url = $$attr_url;
else
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'text','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='text' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','textvar'=>'text','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_textvar='text' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -182,6 +186,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -192,7 +198,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','raw'=>'__','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_raw='__' ?><?php $attr_maxlength='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'','textvar'=>'','raw'=>'__','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='__' ?><?php $attr_maxlength='' ?><?php
if(empty($attr_title)) $attr_title = $attr_text;
?><span class="<?php echo $attr_class ?>"><?php
if (!empty($attr_array))
@@ -207,6 +213,8 @@ if (!empty($attr_elementtype)) {
}
elseif (!empty($attr_text))
$tmp_text = lang($attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
@@ -217,7 +225,7 @@ if (!empty($attr_elementtype)) {
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></table><?php unset($attr) ?><?php $attr = array() ?>
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></table><?php unset($attr) ?><?php $attr = array() ?>
<!-- $Id$ -->
<?php if ($showDuration) { ?>
