commit 227781815d2744f77b3417bcc3a1443b2f0ecf45
parent 754098551a171c26a12a9a015d1cc16c52b8654b
Author: dankert <devnull@localhost>
Date: Sun, 21 Jan 2007 23:53:38 +0100
Kl. Korrektur im Value-Binding.
Diffstat:
3 files changed, 259 insertions(+), 153 deletions(-)
diff --git a/serviceClasses/TemplateEngine.class.php b/serviceClasses/TemplateEngine.class.php
@@ -112,14 +112,16 @@ class TemplateEngine
function attributeValue( $value )
{
- $parts = explode( ':', $value );
- if ( count($parts) >= 2 )
+ $parts = explode( ':', $value, 2 );
+ if ( count($parts) == 2 )
{
list( $type,$value ) = $parts;
switch( $type )
{
case 'var':
return '$'.$value;
+ case '':
+ return "'".$value."'";
case 'method':
return '$this->'.$value.'()';
case 'property':
diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php
@@ -1,8 +1,8 @@
-<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main title') ?><?php $attr_class='main title' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
- <title><?php echo $cms_title ?></title>
+ <title><?php echo $attr_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" />
@@ -14,8 +14,7 @@
<body class="<?php echo $attr_class ?>">
-
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','width'=>'100%','space'=>'0','padding'=>'5','widths'=>'','rowclasses'=>'a,b','columnclasses'=>'a,b') ?><?php $attr_class='' ?><?php $attr_width='100%' ?><?php $attr_space='0' ?><?php $attr_padding='5' ?><?php $attr_widths='' ?><?php $attr_rowclasses='a,b' ?><?php $attr_columnclasses='a,b' ?><?php
+<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'100%','space'=>'0','padding'=>'5','rowclasses'=>'a,b','columnclasses'=>'a,b') ?><?php $attr_width='100%' ?><?php $attr_space='0' ?><?php $attr_padding='5' ?><?php $attr_rowclasses='a,b' ?><?php $attr_columnclasses='a,b' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -41,7 +40,7 @@
unset($attr['columnclasses']);
}
-?><table class="<?php echo $attr_class ?>" cellspacing="<?php echo $attr_space ?>" width="<?php echo $attr_width ?>" cellpadding="<?php echo $attr_padding ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_width) ?><?php unset($attr_space) ?><?php unset($attr_padding) ?><?php unset($attr_widths) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><?php
+?><table class="<?php echo $attr_class ?>" cellspacing="<?php echo $attr_space ?>" width="<?php echo $attr_width ?>" cellpadding="<?php echo $attr_padding ?>"><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_space) ?><?php unset($attr_padding) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -55,7 +54,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'menu','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='menu' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'menu') ?><?php $attr_class='menu' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -70,29 +69,20 @@
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('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_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)) {
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('align'=>'left','type'=>$type) ?><?php $attr_align='left' ?><?php $attr_type=$type ?><?php
+if (isset($attr_elementtype)) {
+?><img src="<?php echo $image_dir.'icon_el_'.$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (isset($attr_type)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (isset($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('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
+} elseif (isset($attr_url)) {
+?><img src="<?php echo $attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (isset($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_align) ?><?php unset($attr_type) ?><?php $attr = array('list'=>'path','extract'=>'1','key'=>'list_key','value'=>'xy') ?><?php $attr_list='path' ?><?php $attr_extract='1' ?><?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');
+ $list_extract = ($attr_extract==true);
foreach( $$attr_list as $$list_tmp_key => $$list_tmp_value )
@@ -106,13 +96,20 @@ elseif (!empty($attr_type)) {
}
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','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='url' ?><?php $attr_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))
- {
+?><?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') ?><?php $attr_title=$title ?><?php $attr_target='cms_main' ?><?php $attr_url=$url ?><?php $attr_class='path' ?><?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 } ?><?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="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
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo $attr_title ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','maxlength'=>'20','value'=>$name) ?><?php $attr_class='text' ?><?php $attr_maxlength='20' ?><?php $attr_value=$name ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -124,27 +121,42 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
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';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);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_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
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_maxlength) ?><?php unset($attr_value) ?><?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'=>'','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
+?><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array('title'=>$text,'class'=>'title','value'=>$text) ?><?php $attr_title=$text ?><?php $attr_class='title' ?><?php $attr_value=$text ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -156,20 +168,29 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
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';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);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_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
+?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('style'=>'text-align:right;','class'=>'menu') ?><?php $attr_style='text-align:right;' ?><?php $attr_class='menu' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -184,10 +205,10 @@ elseif (!empty($attr_type)) {
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
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'windowIcons','extract'=>'1','key'=>'list_key','value'=>'list_value') ?><?php $attr_list='windowIcons' ?><?php $attr_extract='1' ?><?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');
+ $list_extract = ($attr_extract==true);
foreach( $$attr_list as $$list_tmp_key => $$list_tmp_value )
@@ -201,30 +222,22 @@ elseif (!empty($attr_type)) {
}
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))
- {
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('title'=>'','target'=>'_top','url'=>$url,'class'=>'') ?><?php $attr_title='' ?><?php $attr_target='_top' ?><?php $attr_url=$url ?><?php $attr_class='' ?><?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 } ?><?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)) {
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo $attr_title ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php $attr = array('align'=>'middle','type'=>$type) ?><?php $attr_align='middle' ?><?php $attr_type=$type ?><?php
+if (isset($attr_elementtype)) {
+?><img src="<?php echo $image_dir.'icon_el_'.$attr_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (isset($attr_type)) {
+?><img src="<?php echo $image_dir.'icon_'.$attr_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (isset($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('class'=>'') ?><?php $attr_class='' ?><?php
+} elseif (isset($attr_url)) {
+?><img src="<?php echo $attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
+} elseif (isset($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_align) ?><?php unset($attr_type) ?><?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
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -238,7 +251,7 @@ elseif (!empty($attr_type)) {
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'subaction','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='subaction' ?><?php $attr_colspan='2' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'subaction','colspan'=>'2') ?><?php $attr_class='subaction' ?><?php $attr_colspan='2' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -253,10 +266,10 @@ elseif (!empty($attr_type)) {
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'=>'windowMenu','extract'=>'true','key'=>'list_key','value'=>'xy') ?><?php $attr_list='windowMenu' ?><?php $attr_extract='true' ?><?php $attr_key='list_key' ?><?php $attr_value='xy' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('list'=>'windowMenu','extract'=>'1','key'=>'list_key','value'=>'xy') ?><?php $attr_list='windowMenu' ?><?php $attr_extract='1' ?><?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');
+ $list_extract = ($attr_extract==true);
foreach( $$attr_list as $$list_tmp_key => $$list_tmp_value )
@@ -270,29 +283,40 @@ elseif (!empty($attr_type)) {
}
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('var'=>'','value'=>'','invert'=>'true','empty'=>'url','present'=>'','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='true' ?><?php $attr_empty='url' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('not'=>'1','empty'=>'url') ?><?php $attr_not='1' ?><?php $attr_empty='url' ?><?php
// Wahr-Vergleich
- if ( !empty($attr_true) )
- $exec = $$attr_true == true;
+// Html::debug($attr);
+
+ if ( isset($attr_true) )
+ {
+ if (gettype($attr_true) === '' && gettype($attr_true) === '1')
+ $exec = $$attr_true == true;
+ else
+ $exec = $attr_true == true;
+ }
// Falsch-Vergleich
- elseif ( !empty($attr_false) )
- $exec = $$attr_false != true;
-
+ elseif ( isset($attr_false) )
+ {
+ if (gettype($attr_false) === '' && gettype($attr_false) === '1')
+ $exec = $$attr_false == false;
+ else
+ $exec = $attr_false == false;
+ }
// Inhalt-Vergleich mit Wertliste
- elseif( !empty($attr_contains) )
+ elseif( isset($attr_contains) )
$exec = in_array($$attr_var,explode(',',$attr_contains));
// Inhalt-Vergleich
- elseif( !empty($attr_var) )
+ elseif( isset($attr_var) )
$exec = $$attr_var == $attr_value;
// Vergleich auf leer
- elseif ( !empty($attr_empty) )
+ elseif ( isset($attr_empty) )
{
if ( !isset($$attr_empty) )
- $exec = true;
+ $exec = empty($attr_empty);
elseif ( is_array($$attr_empty) )
$exec = (count($$attr_empty)==0);
elseif ( is_bool($$attr_empty) )
@@ -302,7 +326,7 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
$exec = false;
@@ -316,38 +340,49 @@ elseif (!empty($attr_type)) {
$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
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
if ( !empty($attr_invert) )
$exec = !$exec;
+ // Ergebnis umdrehen
+ if ( !empty($attr_not) )
+ $exec = !$exec;
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_not);
+ unset($attr_value);
+ unset($attr_var);
+
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'=>'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))
- {
+?><?php unset($attr) ?><?php unset($attr_not) ?><?php unset($attr_empty) ?><?php $attr = array('title'=>'title','target'=>'cms_main_main','url'=>$url,'class'=>'') ?><?php $attr_title='title' ?><?php $attr_target='cms_main_main' ?><?php $attr_url=$url ?><?php $attr_class='' ?><?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 } ?><?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
+?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo $attr_title ?>"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_target) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','var'=>'text') ?><?php $attr_class='text' ?><?php $attr_var='text' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -359,44 +394,65 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
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';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);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_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'url','present'=>'','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='url' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
+
+?><?php unset($attr) ?><?php $attr = array('empty'=>'url') ?><?php $attr_empty='url' ?><?php
// Wahr-Vergleich
- if ( !empty($attr_true) )
- $exec = $$attr_true == true;
+// Html::debug($attr);
+
+ if ( isset($attr_true) )
+ {
+ if (gettype($attr_true) === '' && gettype($attr_true) === '1')
+ $exec = $$attr_true == true;
+ else
+ $exec = $attr_true == true;
+ }
// Falsch-Vergleich
- elseif ( !empty($attr_false) )
- $exec = $$attr_false != true;
-
+ elseif ( isset($attr_false) )
+ {
+ if (gettype($attr_false) === '' && gettype($attr_false) === '1')
+ $exec = $$attr_false == false;
+ else
+ $exec = $attr_false == false;
+ }
// Inhalt-Vergleich mit Wertliste
- elseif( !empty($attr_contains) )
+ elseif( isset($attr_contains) )
$exec = in_array($$attr_var,explode(',',$attr_contains));
// Inhalt-Vergleich
- elseif( !empty($attr_var) )
+ elseif( isset($attr_var) )
$exec = $$attr_var == $attr_value;
// Vergleich auf leer
- elseif ( !empty($attr_empty) )
+ elseif ( isset($attr_empty) )
{
if ( !isset($$attr_empty) )
- $exec = true;
+ $exec = empty($attr_empty);
elseif ( is_array($$attr_empty) )
$exec = (count($$attr_empty)==0);
elseif ( is_bool($$attr_empty) )
@@ -406,7 +462,7 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
$exec = false;
@@ -420,34 +476,44 @@ elseif (!empty($attr_type)) {
$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
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
if ( !empty($attr_invert) )
$exec = !$exec;
+ // Ergebnis umdrehen
+ if ( !empty($attr_not) )
+ $exec = !$exec;
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_not);
+ unset($attr_value);
+ unset($attr_var);
+
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'=>'','class'=>'inactive','var'=>'text','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='inactive' ?><?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
+?><?php unset($attr) ?><?php unset($attr_empty) ?><?php $attr = array('class'=>'inactive','var'=>'text') ?><?php $attr_class='inactive' ?><?php $attr_var='text' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -459,24 +525,40 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
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';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);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_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php $attr = array() ?><?php
}
-?><?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
+
+?><?php unset($attr) ?><?php $attr = array('class'=>'text','raw'=>'__') ?><?php $attr_class='text' ?><?php $attr_raw='__' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
+
+?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php
+ $attr_title = '';
if (!empty($attr_array))
{
//geht nicht:
@@ -488,20 +570,40 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
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';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);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_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() ?>
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_raw) ?><!--
+//<?php
+// if ( hasLang('MENU_'.$act.'_KEY' ) )
+// {
+// $attrAccesskey = ' accesskey="'.lang('MENU_'.$act.'_KEY').'"';
+// $title.=' ('.lang('GLOBAL_KEY').': ALT+'.lang('MENU_'.$act.'_KEY').')';
+// }
+// else
+// $attrAccesskey = '';
+// ?>
+-->
+<?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/templates/mainmenu/show.tpl.src.php b/themes/default/templates/mainmenu/show.tpl.src.php
@@ -3,29 +3,29 @@ page
row
cell class:menu
- image type:type
+ image type:var:type
list list:path extract:true value:xy
- link var:url title:title class:path target:cms_main
- text var:name maxlength:20
+ link url:var:url title:var:title class:path target:cms_main
+ text value:var:name maxlength:20
char type:filesep
- text var:text title:text class:title
- cell class:menu style:text-align:right;
+ text value:var:text title:var:text class:title
+ cell class:menu style::text-align:right;
list list:windowIcons extract:true
- #text raw:_
- link var:url target:_top
- image type:type align:middle
+ link url:var:url target:_top
+ image type:var:type align:middle
+
row
cell class:subaction colspan:2
# Schleife über alle Menüpunkte
list list:windowMenu extract:true value:xy
- if empty:url invert:true
+ if not:true empty:url
# Menüpunkt
- link var:url target:cms_main_main title:title
+ link url:var:url target:cms_main_main title:title
text var:text
if empty:url
text var:text class:inactive
@@ -34,6 +34,7 @@ page
text raw:__
RAW
+<!--
//<?php
// if ( hasLang('MENU_'.$act.'_KEY' ) )
// {
@@ -43,4 +44,5 @@ RAW
// else
// $attrAccesskey = '';
// ?>
+-->
END
\ No newline at end of file
