openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 337a8bc536d6a9a1f8a193b533c8d0370977d89f
parent 65f62bf98325e0b09cb03d76062f98f39ae1eeb1
Author: dankert <devnull@localhost>
Date:   Sun, 21 Jan 2007 23:17:06 +0100

Neukompilierung, da Template?nderung.

Diffstat:
themes/default/pages/html/element/properties.tpl.php | 3126+++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------
themes/default/pages/html/index/show.tpl.php | 14+++++++-------
themes/default/pages/html/language/remove.tpl.php | 474+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
themes/default/pages/html/main/show.tpl.php | 4++--
themes/default/pages/html/model/listing.tpl.php | 237+++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
themes/default/pages/html/project/listing.tpl.php | 155++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
themes/default/pages/html/user/edit.tpl.php | 673+++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
themes/default/pages/html/user/listing.tpl.php | 311+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
8 files changed, 3577 insertions(+), 1417 deletions(-)

diff --git a/themes/default/pages/html/element/properties.tpl.php b/themes/default/pages/html/element/properties.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('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('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?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,13 +32,24 @@ <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'=>'','name'=>'GLOBAL_PREFS','icon'=>'','widths'=>'30%,70%','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='GLOBAL_PREFS' ?><?php $attr_icon='' ?><?php $attr_widths='30%,70%' ?><?php $attr_width='85%' ?><?php +?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('name'=>'GLOBAL_PREFS','widths'=>'30%,70%','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_PREFS' ?><?php $attr_widths='30%,70%' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr_widths)) { $column_widths = explode(',',$attr_widths); unset($attr['widths']); } + if (!empty($attr_rowclasses)) + { + $row_classes = explode(',',$attr_rowclasses); + $row_class_idx = 999; + unset($attr['rowclasses']); + } + if (!empty($attr_columnclasses)) + { + $column_classes = explode(',',$attr_columnclasses); + unset($attr['columnclasses']); + } global $image_dir; echo '<br/><br/><br/><center>'; echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; @@ -54,7 +64,13 @@ } 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>&nbsp;<?php + } + ?> + </td> </tr> <tr><td class="subaction"> <?php foreach( $windowMenu as $menu ) @@ -90,29 +106,40 @@ <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('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'subtype','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='subtype' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('present'=>'subtype') ?><?php $attr_present='subtype' ?><?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) ) @@ -122,7 +149,7 @@ } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -136,53 +163,73 @@ $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'ELEMENT_SUBTYPE','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='ELEMENT_SUBTYPE' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'ELEMENT_SUBTYPE') ?><?php $attr_class='text' ?><?php $attr_text='ELEMENT_SUBTYPE' ?><?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: @@ -194,50 +241,77 @@ $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'subtypes','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='subtypes' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('present'=>'subtypes') ?><?php $attr_present='subtypes' ?><?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) ) @@ -247,7 +321,7 @@ } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -261,68 +335,84 @@ $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('list'=>'subtypes','name'=>'subtype','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='subtypes' ?><?php $attr_name='subtype' ?><?php $attr_default='' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array('list'=>'subtypes','name'=>'subtype','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='subtypes' ?><?php $attr_name='subtype' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php if (count($$attr_list)==1) echo ' disabled="disabled"' ?>><?php foreach( $$attr_list as $box_key=>$box_value ) { echo '<option class="'.$attr_class.'" value="'.$box_key.'"'; - if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default) + if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />' -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?><?php +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?><?php } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'true','empty'=>'','present'=>'subtypes','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='true' ?><?php $attr_empty='' ?><?php $attr_present='subtypes' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('not'=>'1','present'=>'subtypes') ?><?php $attr_not='1' ?><?php $attr_present='subtypes' ?><?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) ) @@ -332,7 +422,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -346,58 +436,75 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'subtype','prefix'=>'','value'=>'','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='subtype' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><?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() ?><?php +?><?php unset($attr) ?><?php unset($attr_not) ?><?php unset($attr_present) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'subtype','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='subtype' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php unset($attr_onchange) ?><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'with_icon','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='with_icon' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'with_icon') ?><?php $attr_present='with_icon' ?><?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) ) @@ -407,7 +514,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -421,53 +528,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_WITH_ICON','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_WITH_ICON' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_WITH_ICON') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_WITH_ICON' ?><?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: @@ -479,61 +606,88 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('default'=>'false','readonly'=>'false','name'=>'with_icon') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='with_icon' ?><?php - $attr_name = !empty($$attr_name)?$$attr_name:$attr_name; - $attr_readonly = ( $attr_readonly == 'true' ); - $attr_default = ( $attr_default == 'true' ); +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('default'=>'','readonly'=>'','name'=>'with_icon') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='with_icon' ?><?php + $attr_default = ( $attr_default == true ); if ( isset($$attr_name) ) - $checked = isset($$$attr_name)&& $$$attr_name==true; + $checked = $$attr_name == true; +// $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() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php + $checked = $attr_default == true; +?><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_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?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'=>'all_languages','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='all_languages' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'all_languages') ?><?php $attr_present='all_languages' ?><?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) ) @@ -543,7 +697,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -557,53 +711,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_ALL_LANGUAGES','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_ALL_LANGUAGES' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_ALL_LANGUAGES') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_ALL_LANGUAGES' ?><?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: @@ -615,61 +789,88 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('default'=>'false','readonly'=>'false','name'=>'all_languages') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='all_languages' ?><?php - $attr_name = !empty($$attr_name)?$$attr_name:$attr_name; - $attr_readonly = ( $attr_readonly == 'true' ); - $attr_default = ( $attr_default == 'true' ); +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('default'=>'','readonly'=>'','name'=>'all_languages') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='all_languages' ?><?php + $attr_default = ( $attr_default == true ); if ( isset($$attr_name) ) - $checked = isset($$$attr_name)&& $$$attr_name==true; + $checked = $$attr_name == true; +// $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() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php + $checked = $attr_default == true; +?><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_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?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'=>'writable','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='writable' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'writable') ?><?php $attr_present='writable' ?><?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) ) @@ -679,7 +880,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -693,53 +894,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_writable','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_writable' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_writable') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_writable' ?><?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: @@ -751,61 +972,88 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('default'=>'false','readonly'=>'false','name'=>'writable') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='writable' ?><?php - $attr_name = !empty($$attr_name)?$$attr_name:$attr_name; - $attr_readonly = ( $attr_readonly == 'true' ); - $attr_default = ( $attr_default == 'true' ); +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('default'=>'','readonly'=>'','name'=>'writable') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='writable' ?><?php + $attr_default = ( $attr_default == true ); if ( isset($$attr_name) ) - $checked = isset($$$attr_name)&& $$$attr_name==true; + $checked = $$attr_name == true; +// $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() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php + $checked = $attr_default == true; +?><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_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?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'=>'width','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='width' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'width') ?><?php $attr_present='width' ?><?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) ) @@ -815,7 +1063,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -829,53 +1077,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'width','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='width' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'width') ?><?php $attr_class='text' ?><?php $attr_text='width' ?><?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: @@ -887,52 +1155,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'width','prefix'=>'','value'=>'','size'=>'10','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='width' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='10' ?><?php $attr_maxlength='256' ?><?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 +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'width','size'=>'10','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='width' ?><?php $attr_size='10' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'height','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='height' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'height') ?><?php $attr_present='height' ?><?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) ) @@ -942,7 +1238,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -956,53 +1252,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'height','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='height' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'height') ?><?php $attr_class='text' ?><?php $attr_text='height' ?><?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: @@ -1014,52 +1330,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'height','prefix'=>'','value'=>'','size'=>'10','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='height' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='10' ?><?php $attr_maxlength='256' ?><?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 +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'height','size'=>'10','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='height' ?><?php $attr_size='10' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'dateformat','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='dateformat' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'dateformat') ?><?php $attr_present='dateformat' ?><?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) ) @@ -1069,7 +1413,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -1083,53 +1427,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_DATEFORMAT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_DATEFORMAT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_DATEFORMAT') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_DATEFORMAT' ?><?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: @@ -1141,64 +1505,92 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'dateformats','name'=>'dateformat','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='dateformats' ?><?php $attr_name='dateformat' ?><?php $attr_default='' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'dateformats','name'=>'dateformat','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='dateformats' ?><?php $attr_name='dateformat' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php if (count($$attr_list)==1) echo ' disabled="disabled"' ?>><?php foreach( $$attr_list as $box_key=>$box_value ) { echo '<option class="'.$attr_class.'" value="'.$box_key.'"'; - if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default) + if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />' -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?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'=>'wiki','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='wiki' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'wiki') ?><?php $attr_present='wiki' ?><?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) ) @@ -1208,7 +1600,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -1222,53 +1614,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_wiki','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_wiki' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_wiki') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_wiki' ?><?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: @@ -1280,61 +1692,88 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('default'=>'false','readonly'=>'false','name'=>'wiki') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='wiki' ?><?php - $attr_name = !empty($$attr_name)?$$attr_name:$attr_name; - $attr_readonly = ( $attr_readonly == 'true' ); - $attr_default = ( $attr_default == 'true' ); +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('default'=>'','readonly'=>'','name'=>'wiki') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='wiki' ?><?php + $attr_default = ( $attr_default == true ); if ( isset($$attr_name) ) - $checked = isset($$$attr_name)&& $$$attr_name==true; + $checked = $$attr_name == true; +// $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() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php + $checked = $attr_default == true; +?><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_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?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'=>'html','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='html' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'html') ?><?php $attr_present='html' ?><?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) ) @@ -1344,7 +1783,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -1358,53 +1797,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_html','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_html' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_html') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_html' ?><?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: @@ -1416,61 +1875,88 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('default'=>'false','readonly'=>'false','name'=>'html') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='html' ?><?php - $attr_name = !empty($$attr_name)?$$attr_name:$attr_name; - $attr_readonly = ( $attr_readonly == 'true' ); - $attr_default = ( $attr_default == 'true' ); +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('default'=>'','readonly'=>'','name'=>'html') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='html' ?><?php + $attr_default = ( $attr_default == true ); if ( isset($$attr_name) ) - $checked = isset($$$attr_name)&& $$$attr_name==true; + $checked = $$attr_name == true; +// $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() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php + $checked = $attr_default == true; +?><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_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?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'=>'decimals','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='decimals' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'decimals') ?><?php $attr_present='decimals' ?><?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) ) @@ -1480,7 +1966,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -1494,53 +1980,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_DECIMALS','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_DECIMALS' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_DECIMALS') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_DECIMALS' ?><?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: @@ -1552,52 +2058,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'decimals','prefix'=>'','value'=>'','size'=>'10','maxlength'=>'2','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='decimals' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='10' ?><?php $attr_maxlength='2' ?><?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 +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'decimals','size'=>'10','maxlength'=>'2','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='decimals' ?><?php $attr_size='10' ?><?php $attr_maxlength='2' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'dec_point','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='dec_point' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'dec_point') ?><?php $attr_present='dec_point' ?><?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) ) @@ -1607,7 +2141,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -1621,53 +2155,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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) ) + 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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_DEC_POINT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_DEC_POINT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_DEC_POINT') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_DEC_POINT' ?><?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: @@ -1679,52 +2233,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'dec_point','prefix'=>'','value'=>'','size'=>'10','maxlength'=>'5','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='dec_point' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='10' ?><?php $attr_maxlength='5' ?><?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 +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'dec_point','size'=>'10','maxlength'=>'5','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='dec_point' ?><?php $attr_size='10' ?><?php $attr_maxlength='5' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'thousand_sep','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='thousand_sep' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'thousand_sep') ?><?php $attr_present='thousand_sep' ?><?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) ) @@ -1734,7 +2316,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -1748,53 +2330,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_thousand_sep','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_thousand_sep' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_thousand_sep') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_thousand_sep' ?><?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: @@ -1806,52 +2408,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'thousand_sep','prefix'=>'','value'=>'','size'=>'10','maxlength'=>'1','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='thousand_sep' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='10' ?><?php $attr_maxlength='1' ?><?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 +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'thousand_sep','size'=>'10','maxlength'=>'1','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='thousand_sep' ?><?php $attr_size='10' ?><?php $attr_maxlength='1' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'default_text','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='default_text' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'default_text') ?><?php $attr_present='default_text' ?><?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) ) @@ -1861,7 +2491,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -1875,53 +2505,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_default_text','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_default_text' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_default_text') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_default_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: @@ -1933,52 +2583,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'default_text','prefix'=>'','value'=>'','size'=>'40','maxlength'=>'255','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='default_text' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='40' ?><?php $attr_maxlength='255' ?><?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 +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'default_text','size'=>'40','maxlength'=>'255','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='default_text' ?><?php $attr_size='40' ?><?php $attr_maxlength='255' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'default_longtext','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='default_longtext' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'default_longtext') ?><?php $attr_present='default_longtext' ?><?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) ) @@ -1988,7 +2666,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -2002,53 +2680,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_default_longtext','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_default_longtext' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_default_longtext') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_default_longtext' ?><?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: @@ -2060,52 +2758,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'default_longtext','rows'=>'10','cols'=>'40','value'=>'','index'=>'','onchange'=>'','prefix'=>'','class'=>'','default'=>'') ?><?php $attr_name='default_longtext' ?><?php $attr_rows='10' ?><?php $attr_cols='40' ?><?php $attr_value='' ?><?php $attr_index='' ?><?php $attr_onchange='' ?><?php $attr_prefix='' ?><?php $attr_class='' ?><?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) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'default_longtext','rows'=>'10','cols'=>'40','class'=>'') ?><?php $attr_name='default_longtext' ?><?php $attr_rows='10' ?><?php $attr_cols='40' ?><?php $attr_class='' ?><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_class) ?><?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'=>'parameters','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='parameters' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'parameters') ?><?php $attr_present='parameters' ?><?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) ) @@ -2115,7 +2841,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -2129,53 +2855,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_DYNAMIC_PARAMETERS','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_DYNAMIC_PARAMETERS' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_DYNAMIC_PARAMETERS') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_DYNAMIC_PARAMETERS' ?><?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: @@ -2187,57 +2933,88 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'parameters','rows'=>'15','cols'=>'40','value'=>'','index'=>'','onchange'=>'','prefix'=>'','class'=>'','default'=>'') ?><?php $attr_name='parameters' ?><?php $attr_rows='15' ?><?php $attr_cols='40' ?><?php $attr_value='' ?><?php $attr_index='' ?><?php $attr_onchange='' ?><?php $attr_prefix='' ?><?php $attr_class='' ?><?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) ?><?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'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'parameters','rows'=>'15','cols'=>'40','class'=>'') ?><?php $attr_name='parameters' ?><?php $attr_rows='15' ?><?php $attr_cols='40' ?><?php $attr_class='' ?><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_class) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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() ?></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; +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'dynamic_class_parameters','extract'=>'false','key'=>'paramName','value'=>'defaultValue') ?><?php $attr_list='dynamic_class_parameters' ?><?php $attr_extract='false' ?><?php $attr_key='paramName' ?><?php $attr_value='defaultValue' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'dynamic_class_parameters','extract'=>'','key'=>'paramName','value'=>'defaultValue') ?><?php $attr_list='dynamic_class_parameters' ?><?php $attr_extract='' ?><?php $attr_key='paramName' ?><?php $attr_value='defaultValue' ?><?php $list_tmp_key = $attr_key; $list_tmp_value = $attr_value; $list_extract = ($attr_extract=='true'); @@ -2254,9 +3031,15 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } 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'=>'','class'=>'','var'=>'paramName','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='paramName' ?><?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 +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array('class'=>'text','var'=>'paramName') ?><?php $attr_class='text' ?><?php $attr_var='paramName' ?><?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: @@ -2268,20 +3051,37 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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 +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?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: @@ -2293,20 +3093,37 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_DEFAULT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_DEFAULT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_raw) ?><?php $attr = array('class'=>'text','text'=>'GLOBAL_DEFAULT') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_DEFAULT' ?><?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: @@ -2318,20 +3135,37 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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 +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?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: @@ -2343,20 +3177,37 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array('title'=>'','class'=>'','var'=>'defaultValue','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='defaultValue' ?><?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 +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_raw) ?><?php $attr = array('class'=>'text','var'=>'defaultValue') ?><?php $attr_class='text' ?><?php $attr_var='defaultValue' ?><?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: @@ -2368,42 +3219,65 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?><br/><?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 +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php $attr = array() ?><br/><?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 } -?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'select_items','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='select_items' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'select_items') ?><?php $attr_present='select_items' ?><?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) ) @@ -2413,7 +3287,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -2427,53 +3301,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_select_items','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_select_items' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_select_items') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_select_items' ?><?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: @@ -2485,52 +3379,80 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'select_items','rows'=>'15','cols'=>'40','value'=>'','index'=>'','onchange'=>'','prefix'=>'','class'=>'','default'=>'') ?><?php $attr_name='select_items' ?><?php $attr_rows='15' ?><?php $attr_cols='40' ?><?php $attr_value='' ?><?php $attr_index='' ?><?php $attr_onchange='' ?><?php $attr_prefix='' ?><?php $attr_class='' ?><?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) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'select_items','rows'=>'15','cols'=>'40','class'=>'') ?><?php $attr_name='select_items' ?><?php $attr_rows='15' ?><?php $attr_cols='40' ?><?php $attr_class='' ?><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_class) ?><?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'=>'folderobjectid','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='folderobjectid' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'folderobjectid') ?><?php $attr_present='folderobjectid' ?><?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) ) @@ -2540,7 +3462,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -2554,53 +3476,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_DEFAULT_FOLDEROBJECT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_DEFAULT_FOLDEROBJECT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_DEFAULT_FOLDEROBJECT') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_DEFAULT_FOLDEROBJECT' ?><?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: @@ -2612,64 +3554,92 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'folders','name'=>'folderobjectid','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='folders' ?><?php $attr_name='folderobjectid' ?><?php $attr_default='' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'folders','name'=>'folderobjectid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='folders' ?><?php $attr_name='folderobjectid' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php if (count($$attr_list)==1) echo ' disabled="disabled"' ?>><?php foreach( $$attr_list as $box_key=>$box_value ) { echo '<option class="'.$attr_class.'" value="'.$box_key.'"'; - if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default) + if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />' -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?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'=>'default_objectid','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='default_objectid' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'default_objectid') ?><?php $attr_present='default_objectid' ?><?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) ) @@ -2679,7 +3649,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -2693,53 +3663,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_DEFAULT_OBJECT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_DEFAULT_OBJECT' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_DEFAULT_OBJECT') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_DEFAULT_OBJECT' ?><?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: @@ -2751,64 +3741,92 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'objects','name'=>'default_objectid','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='objects' ?><?php $attr_name='default_objectid' ?><?php $attr_default='' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'objects','name'=>'default_objectid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='objects' ?><?php $attr_name='default_objectid' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php if (count($$attr_list)==1) echo ' disabled="disabled"' ?>><?php foreach( $$attr_list as $box_key=>$box_value ) { echo '<option class="'.$attr_class.'" value="'.$box_key.'"'; - if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default) + if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />' -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?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'=>'code','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='code' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php + +?><?php unset($attr) ?><?php $attr = array('present'=>'code') ?><?php $attr_present='code' ?><?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) ) @@ -2818,7 +3836,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu } // Vergleich auf Vorhandensein - elseif ( !empty($attr_present) ) + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -2832,53 +3850,73 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','text'=>'EL_PROP_code','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='EL_PROP_code' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'EL_PROP_code') ?><?php $attr_class='text' ?><?php $attr_text='EL_PROP_code' ?><?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: @@ -2890,57 +3928,84 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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('_','&nbsp;',$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_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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'code','rows'=>'35','cols'=>'60','value'=>'','index'=>'','onchange'=>'','prefix'=>'','class'=>'','default'=>'') ?><?php $attr_name='code' ?><?php $attr_rows='35' ?><?php $attr_cols='60' ?><?php $attr_value='' ?><?php $attr_index='' ?><?php $attr_onchange='' ?><?php $attr_prefix='' ?><?php $attr_class='' ?><?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) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'code','rows'=>'35','cols'=>'60','class'=>'') ?><?php $attr_name='code' ?><?php $attr_rows='35' ?><?php $attr_cols='60' ?><?php $attr_class='' ?><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_class) ?><?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 - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; +?><?php unset($attr) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'act','colspan'=>'2') ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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('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_class) ?><?php unset($attr_colspan) ?><?php $attr = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr_type='ok' ?><?php $attr_class='ok' ?><?php $attr_value='ok' ?><?php $attr_text='button_ok' ?><?php if ($attr_type=='ok') { $attr_type = 'submit'; - $attr_class = 'ok'; - $attr_text = 'BUTTON_OK'; - $attr_value = 'ok'; +// $attr_class = 'ok'; +// $attr_text = 'BUTTON_OK'; +// $attr_value = 'ok'; } -?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?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> +?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table> </td> </tr> </table> @@ -2954,10 +4019,15 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu <?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('field'=>'name') ?><?php $attr_field='name' ?><script name="JavaScript" type="text/javascript"><!-- +<?php unset($attr) ?><?php $attr = array() ?></form> + +<?php unset($attr) ?><?php $attr = array('field'=>'name') ?><?php $attr_field='name' ?> +<script name="JavaScript" type="text/javascript"> +<!-- document.forms[0].<?php echo $attr_field ?>.focus(); document.forms[0].<?php echo $attr_field ?>.select(); -//--></script> +// --> +</script> <?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?> <!-- $Id$ --> diff --git a/themes/default/pages/html/index/show.tpl.php b/themes/default/pages/html/index/show.tpl.php @@ -9,21 +9,21 @@ <?php unset($attr) ?><?php $attr = array('rows'=>'23,3,*,3,5') ?><?php $attr_rows='23,3,*,3,5' ?><frameset <?php echo !empty($attr_rows) ?' rows="'.$attr_rows.'"':'' ?> <?php echo !empty($attr_columns)?' cols="'.$attr_columns.'"':'' ?> - border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($attr) ?><?php unset($attr_rows) ?><?php $attr = array('file'=>'frame_src_title','name'=>'cms_title') ?><?php $attr_file='frame_src_title' ?><?php $attr_name='cms_title' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> -<?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php $attr = array('file'=>'frame_src_border') ?><?php $attr_file='frame_src_border' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> + border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($attr) ?><?php unset($attr_rows) ?><?php $attr = array('file'=>$frame_src_title,'name'=>'cms_title') ?><?php $attr_file=$frame_src_title ?><?php $attr_name='cms_title' ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> +<?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php $attr = array('file'=>$frame_src_border) ?><?php $attr_file=$frame_src_border ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> <?php unset($attr) ?><?php unset($attr_file) ?><?php $attr = array('columns'=>'25%,*') ?><?php $attr_columns='25%,*' ?><frameset <?php echo !empty($attr_rows) ?' rows="'.$attr_rows.'"':'' ?> <?php echo !empty($attr_columns)?' cols="'.$attr_columns.'"':'' ?> border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($attr) ?><?php unset($attr_columns) ?><?php $attr = array('rows'=>'54,*') ?><?php $attr_rows='54,*' ?><frameset <?php echo !empty($attr_rows) ?' rows="'.$attr_rows.'"':'' ?> <?php echo !empty($attr_columns)?' cols="'.$attr_columns.'"':'' ?> - border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($attr) ?><?php unset($attr_rows) ?><?php $attr = array('file'=>'frame_src_tree_title','name'=>'cms_treemenu') ?><?php $attr_file='frame_src_tree_title' ?><?php $attr_name='cms_treemenu' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> -<?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php $attr = array('file'=>'frame_src_tree','name'=>'cms_tree','scrolling'=>'auto') ?><?php $attr_file='frame_src_tree' ?><?php $attr_name='cms_tree' ?><?php $attr_scrolling='auto' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> + border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($attr) ?><?php unset($attr_rows) ?><?php $attr = array('file'=>$frame_src_tree_title,'name'=>'cms_treemenu') ?><?php $attr_file=$frame_src_tree_title ?><?php $attr_name='cms_treemenu' ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> +<?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php $attr = array('file'=>$frame_src_tree,'name'=>'cms_tree','scrolling'=>'auto') ?><?php $attr_file=$frame_src_tree ?><?php $attr_name='cms_tree' ?><?php $attr_scrolling='auto' ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> <?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php unset($attr_scrolling) ?><?php $attr = array() ?></frameset> -<?php unset($attr) ?><?php $attr = array('file'=>'frame_src_main','name'=>'cms_main') ?><?php $attr_file='frame_src_main' ?><?php $attr_name='cms_main' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> +<?php unset($attr) ?><?php $attr = array('file'=>$frame_src_main,'name'=>'cms_main') ?><?php $attr_file=$frame_src_main ?><?php $attr_name='cms_main' ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> <?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php $attr = array() ?></frameset> -<?php unset($attr) ?><?php $attr = array('file'=>'frame_src_border') ?><?php $attr_file='frame_src_border' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> -<?php unset($attr) ?><?php unset($attr_file) ?><?php $attr = array('file'=>'frame_src_background') ?><?php $attr_file='frame_src_background' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> +<?php unset($attr) ?><?php $attr = array('file'=>$frame_src_border) ?><?php $attr_file=$frame_src_border ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> +<?php unset($attr) ?><?php unset($attr_file) ?><?php $attr = array('file'=>$frame_src_background) ?><?php $attr_file=$frame_src_background ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> <?php unset($attr) ?><?php unset($attr_file) ?><?php $attr = array() ?></frameset> <?php unset($attr) ?><?php $attr = array() ?> </html><?php unset($attr) ?> \ No newline at end of file diff --git a/themes/default/pages/html/language/remove.tpl.php b/themes/default/pages/html/language/remove.tpl.php @@ -0,0 +1,473 @@ +<?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 $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" /> + <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('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?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)) + $attr_subaction = $targetSubActionName; + if (empty($attr_id)) + $attr_id = $this->getRequestId(); + +?><form name="<?php echo $attr_name ?>" + target="<?php echo $attr_target ?>" + action="<?php echo Html::url( $attr_action,$attr_subaction,$attr_id ) ?>" + method="<?php echo $attr_method ?>" + enctype="<?php echo $attr_enctype ?>"> +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr_subaction ?>" /> +<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_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('name'=>'GLOBAL_GROUPS','icon'=>'group','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_GROUPS' ?><?php $attr_icon='group' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php + $coloumn_widths=array(); + if (!empty($attr_widths)) + { + $column_widths = explode(',',$attr_widths); + unset($attr['widths']); + } + if (!empty($attr_rowclasses)) + { + $row_classes = explode(',',$attr_rowclasses); + $row_class_idx = 999; + unset($attr['rowclasses']); + } + if (!empty($attr_columnclasses)) + { + $column_classes = explode(',',$attr_columnclasses); + unset($attr['columnclasses']); + } + 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 '&nbsp;&raquo;&nbsp;'; + } + echo '<span class="title">'.lang($windowTitle).'</span>'; + ?> + </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>&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?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_name) ?><?php unset($attr_icon) ?><?php unset($attr_width) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; + + 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 $attr = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_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: + //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)) + 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('_','&nbsp;',$attr_raw); + 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_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; + + 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_class) ?><?php $attr = array('class'=>'text','var'=>'name') ?><?php $attr_class='text' ?><?php $attr_var='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: + //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)) + 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('_','&nbsp;',$attr_raw); + 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_class) ?><?php unset($attr_var) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; + + 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 $attr = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_DELETE' ?><?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: + //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)) + 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('_','&nbsp;',$attr_raw); + 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_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; + + 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 $attr = array('default'=>'','readonly'=>'','name'=>'delete') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='delete' ?><?php + $attr_default = ( $attr_default == true ); + + if ( isset($$attr_name) ) + $checked = $$attr_name == true; +// $checked = isset($$$attr_name)&& $$$attr_name==true; + else + $checked = $attr_default == true; +?><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_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'help','colspan'=>'2') ?><?php $attr_class='help' ?><?php $attr_colspan='2' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; + + 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_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'text','text'=>'GROUP_DELETE_DESC') ?><?php $attr_class='text' ?><?php $attr_text='GROUP_DELETE_DESC' ?><?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: + //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)) + 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('_','&nbsp;',$attr_raw); + 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_class) ?><?php unset($attr_text) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('colspan'=>'2') ?><?php $attr_colspan='2' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; + + 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_colspan) ?><?php $attr = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr_type='ok' ?><?php $attr_class='ok' ?><?php $attr_value='ok' ?><?php $attr_text='button_ok' ?><?php + if ($attr_type=='ok') + { + $attr_type = 'submit'; +// $attr_class = 'ok'; +// $attr_text = 'BUTTON_OK'; +// $attr_value = 'ok'; + } +?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><?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>&nbsp; +<?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('field'=>'delete') ?><?php $attr_field='delete' ?> +<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 $attr = array() ?> +<!-- $Id$ --> + +<?php if ($showDuration) { ?> +<br/> +<small>&nbsp; +<?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/main/show.tpl.php b/themes/default/pages/html/main/show.tpl.php @@ -9,8 +9,8 @@ <?php unset($attr) ?><?php $attr = array('rows'=>'54,*') ?><?php $attr_rows='54,*' ?><frameset <?php echo !empty($attr_rows) ?' rows="'.$attr_rows.'"':'' ?> <?php echo !empty($attr_columns)?' cols="'.$attr_columns.'"':'' ?> - border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($attr) ?><?php unset($attr_rows) ?><?php $attr = array('file'=>'frame_src_main_menu','name'=>'cms_main_menu') ?><?php $attr_file='frame_src_main_menu' ?><?php $attr_name='cms_main_menu' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> -<?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php $attr = array('file'=>'frame_src_main_main','name'=>'cms_main_main','scrolling'=>'auto') ?><?php $attr_file='frame_src_main_main' ?><?php $attr_name='cms_main_main' ?><?php $attr_scrolling='auto' ?><frame src="<?php echo $$attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> + border="0" frameborder="5" framespacing="0" bordercolor="#000000"><?php unset($attr) ?><?php unset($attr_rows) ?><?php $attr = array('file'=>$frame_src_main_menu,'name'=>'cms_main_menu') ?><?php $attr_file=$frame_src_main_menu ?><?php $attr_name='cms_main_menu' ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> +<?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php $attr = array('file'=>$frame_src_main_main,'name'=>'cms_main_main','scrolling'=>'auto') ?><?php $attr_file=$frame_src_main_main ?><?php $attr_name='cms_main_main' ?><?php $attr_scrolling='auto' ?><frame src="<?php echo $attr_file ?>" name="<?php echo empty($attr_name)?'':$attr_name ?>" marginheight="0" marginwidth="0" scrolling="<?php echo empty($attr_scrolling)?'no':$attr_scrolling ?>"> <?php unset($attr) ?><?php unset($attr_file) ?><?php unset($attr_name) ?><?php unset($attr_scrolling) ?><?php $attr = array() ?></frameset> <?php unset($attr) ?><?php $attr = array() ?> </html><?php unset($attr) ?> \ No newline at end of file diff --git a/themes/default/pages/html/model/listing.tpl.php b/themes/default/pages/html/model/listing.tpl.php @@ -1,8 +1,8 @@ -<?php /* source: ./themes/default/include/html/page.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!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" /> @@ -12,16 +12,26 @@ <?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/window.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('title'=>'','name'=>'GLOBAL_MODELS','icon'=>'group','widths'=>'50%,25%,25%','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='GLOBAL_MODELS' ?><?php $attr_icon='group' ?><?php $attr_widths='50%,25%,25%' ?><?php $attr_width='85%' ?><?php +<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'GLOBAL_MODELS','icon'=>'group','widths'=>'50%,25%,25%','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_MODELS' ?><?php $attr_icon='group' ?><?php $attr_widths='50%,25%,25%' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr_widths)) { $column_widths = explode(',',$attr_widths); unset($attr['widths']); } + if (!empty($attr_rowclasses)) + { + $row_classes = explode(',',$attr_rowclasses); + $row_class_idx = 999; + unset($attr['rowclasses']); + } + if (!empty($attr_columnclasses)) + { + $column_classes = explode(',',$attr_columnclasses); + unset($attr['columnclasses']); + } global $image_dir; echo '<br/><br/><br/><center>'; echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; @@ -36,13 +46,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>&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?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> @@ -68,10 +88,10 @@ <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/list.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?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_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('list'=>'el','extract'=>'1','key'=>'list_key','value'=>'list_value') ?><?php $attr_list='el' ?><?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 ) @@ -85,41 +105,59 @@ } extract($$list_tmp_value); } -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/link.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('title'=>'','target'=>'cms_main','url'=>'url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main' ?><?php $attr_url='url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('title'=>'','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main' ?><?php $attr_url=$url ?><?php $attr_class='' ?><?php if(!empty($attr_url)) - $tmp_url = $$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 /* source: ./themes/default/include/html/image.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('file'=>'icon_model','url'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_file='icon_model' ?><?php $attr_url='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php -if (!empty($attr_elementtype)) { +?><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('file'=>'icon_model','align'=>'left') ?><?php $attr_file='icon_model' ?><?php $attr_align='left' ?><?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 (!empty($attr_type)) { +} 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 (!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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?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 - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?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 (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_file) ?><?php unset($attr_align) ?><?php $attr = array('class'=>'text','var'=>'name') ?><?php $attr_class='text' ?><?php $attr_var='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: @@ -131,43 +169,67 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/link-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?></a><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/link.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('title'=>'','target'=>'cms_main','url'=>'default_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main' ?><?php $attr_url='default_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('title'=>'','target'=>'cms_main','url'=>$default_url,'class'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main' ?><?php $attr_url=$default_url ?><?php $attr_class='' ?><?php if(!empty($attr_url)) - $tmp_url = $$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 /* source: ./themes/default/include/html/image.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('file'=>'icon_model','url'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_file='icon_model' ?><?php $attr_url='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php -if (!empty($attr_elementtype)) { +?><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('file'=>'icon_model','align'=>'left') ?><?php $attr_file='icon_model' ?><?php $attr_align='left' ?><?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 (!empty($attr_type)) { +} 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 (!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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_make_default','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_make_default' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?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 (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_file) ?><?php unset($attr_align) ?><?php $attr = array('class'=>'text','text'=>'GLOBAL_make_default') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_make_default' ?><?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: @@ -179,43 +241,67 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/link-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?></a><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/link.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('title'=>'','target'=>'cms_main','url'=>'select_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main' ?><?php $attr_url='select_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('title'=>'','target'=>$conf['interface']['frame']['top'],'url'=>$select_url,'class'=>'') ?><?php $attr_title='' ?><?php $attr_target=$conf['interface']['frame']['top'] ?><?php $attr_url=$select_url ?><?php $attr_class='' ?><?php if(!empty($attr_url)) - $tmp_url = $$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 /* source: ./themes/default/include/html/image.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('file'=>'icon_model','url'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_file='icon_model' ?><?php $attr_url='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php -if (!empty($attr_elementtype)) { +?><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('file'=>'icon_model','align'=>'left') ?><?php $attr_file='icon_model' ?><?php $attr_align='left' ?><?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 (!empty($attr_type)) { +} 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 (!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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_selected','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_selected' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?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 (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_file) ?><?php unset($attr_align) ?><?php $attr = array('class'=>'text','text'=>'GLOBAL_selected') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_selected' ?><?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: @@ -227,18 +313,29 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/link-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?></a><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +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:47:27 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/list-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php /* source: ./themes/default/include/html/window-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?> </table> +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?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> @@ -252,7 +349,7 @@ if (!empty($attr_elementtype)) { <?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/page-end.inc.php - compile time: Sun, 29 Jan 2006 19:47:27 +0100 */ ?><?php $attr = array() ?> +<?php unset($attr) ?><?php $attr = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> diff --git a/themes/default/pages/html/project/listing.tpl.php b/themes/default/pages/html/project/listing.tpl.php @@ -1,8 +1,8 @@ -<?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!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" /> @@ -12,16 +12,26 @@ <?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'=>'','name'=>'GLOBAL_PROJECTS','icon'=>'project','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='GLOBAL_PROJECTS' ?><?php $attr_icon='project' ?><?php $attr_widths='' ?><?php $attr_width='85%' ?><?php +<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'GLOBAL_PROJECTS','icon'=>'project','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_PROJECTS' ?><?php $attr_icon='project' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr_widths)) { $column_widths = explode(',',$attr_widths); unset($attr['widths']); } + if (!empty($attr_rowclasses)) + { + $row_classes = explode(',',$attr_rowclasses); + $row_class_idx = 999; + unset($attr['rowclasses']); + } + if (!empty($attr_columnclasses)) + { + $column_classes = explode(',',$attr_columnclasses); + unset($attr['columnclasses']); + } global $image_dir; echo '<br/><br/><br/><center>'; echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; @@ -36,7 +46,13 @@ } 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>&nbsp;<?php + } + ?> + </td> </tr> <tr><td class="subaction"> <?php foreach( $windowMenu as $menu ) @@ -72,10 +88,10 @@ <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_name) ?><?php unset($attr_icon) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('list'=>'el','extract'=>'1','key'=>'list_key','value'=>'list_value') ?><?php $attr_list='el' ?><?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 ) @@ -90,40 +106,58 @@ 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() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','target'=>'cms_main','url'=>'url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main' ?><?php $attr_url='url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('title'=>'','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr_title='' ?><?php $attr_target='cms_main' ?><?php $attr_url=$url ?><?php $attr_class='' ?><?php if(!empty($attr_url)) - $tmp_url = $$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('file'=>'icon_project','url'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_file='icon_project' ?><?php $attr_url='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php -if (!empty($attr_elementtype)) { +?><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('file'=>'icon_project','align'=>'left') ?><?php $attr_file='icon_project' ?><?php $attr_align='left' ?><?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 (!empty($attr_type)) { +} 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 (!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 - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?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 (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_file) ?><?php unset($attr_align) ?><?php $attr = array('class'=>'text','value'=>$name) ?><?php $attr_class='text' ?><?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: @@ -135,35 +169,57 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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'=>'','target'=>'_top','url'=>'use_url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_target='_top' ?><?php $attr_url='use_url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('title'=>'','target'=>$conf['interface']['frames']['top'],'url'=>$use_url,'class'=>'') ?><?php $attr_title='' ?><?php $attr_target=$conf['interface']['frames']['top'] ?><?php $attr_url=$use_url ?><?php $attr_class='' ?><?php if(!empty($attr_url)) - $tmp_url = $$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'=>'GLOBAL_SELECT','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_SELECT' ?><?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','value'=>lang('GLOBAL_SELECT')) ?><?php $attr_class='text' ?><?php $attr_value=lang('GLOBAL_SELECT') ?><?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: @@ -175,18 +231,29 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_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_class) ?><?php unset($attr_value) ?><?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/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php @@ -1,8 +1,8 @@ -<?php /* source: ./themes/default/include/html/page.inc.php - compile time: Sun, 29 Jan 2006 21:58:44 +0100 */ ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!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" /> @@ -12,10 +12,9 @@ <?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 21:58:44 +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('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?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,13 +32,24 @@ <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 21:58:45 +0100 */ ?><?php $attr = array('title'=>'','name'=>'GLOBAL_USER','icon'=>'','widths'=>'50%,50%','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='GLOBAL_USER' ?><?php $attr_icon='' ?><?php $attr_widths='50%,50%' ?><?php $attr_width='85%' ?><?php +?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('name'=>'GLOBAL_USER','widths'=>'50%,50%','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_USER' ?><?php $attr_widths='50%,50%' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr_widths)) { $column_widths = explode(',',$attr_widths); unset($attr['widths']); } + if (!empty($attr_rowclasses)) + { + $row_classes = explode(',',$attr_rowclasses); + $row_class_idx = 999; + unset($attr['rowclasses']); + } + if (!empty($attr_columnclasses)) + { + $column_classes = explode(',',$attr_columnclasses); + unset($attr['columnclasses']); + } global $image_dir; echo '<br/><br/><br/><center>'; echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; @@ -54,13 +64,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>&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?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,28 +106,44 @@ <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 21:58:45 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - + <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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 - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_username') ?><?php $attr_class='text' ?><?php $attr_text='user_username' ?><?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: @@ -119,49 +155,81 @@ $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/input.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'name','prefix'=>'','value'=>'','size'=>'20','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='name' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='20' ?><?php $attr_maxlength='256' ?><?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 21:58:45 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'20','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='name' ?><?php $attr_size='20' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_fullname','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_fullname' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_fullname') ?><?php $attr_class='text' ?><?php $attr_text='user_fullname' ?><?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: @@ -173,49 +241,81 @@ $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/input.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'fullname','prefix'=>'','value'=>'','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='fullname' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 21:58:45 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'fullname','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='fullname' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_mail','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_mail' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_mail') ?><?php $attr_class='text' ?><?php $attr_text='user_mail' ?><?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: @@ -227,49 +327,81 @@ $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/input.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'mail','prefix'=>'','value'=>'','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='mail' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 21:58:45 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'mail','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='mail' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:45 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_desc','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_desc' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_desc') ?><?php $attr_class='text' ?><?php $attr_text='user_desc' ?><?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: @@ -281,49 +413,81 @@ $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/input.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'desc','prefix'=>'','value'=>'','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='desc' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'desc','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='desc' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_tel','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_tel' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_tel') ?><?php $attr_class='text' ?><?php $attr_text='user_tel' ?><?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: @@ -335,49 +499,81 @@ $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/input.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'tel','prefix'=>'','value'=>'','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='tel' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'tel','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='tel' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_ldap_dn','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_ldap_dn' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_ldapdn') ?><?php $attr_class='text' ?><?php $attr_text='user_ldapdn' ?><?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: @@ -389,49 +585,81 @@ $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/input.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'ldap_dn','prefix'=>'','value'=>'','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='ldap_dn' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'ldap_dn','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='ldap_dn' ?><?php $attr_size='' ?><?php $attr_maxlength='256' ?><?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 ?>" onxxxMouseOver="this.focus();" /><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_default) ?><?php unset($attr_type) ?><?php unset($attr_name) ?><?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 + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_style','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_style' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_style') ?><?php $attr_class='text' ?><?php $attr_text='user_style' ?><?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: @@ -443,61 +671,93 @@ $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/selectbox.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('list'=>'allstyles','name'=>'style','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='allstyles' ?><?php $attr_name='style' ?><?php $attr_default='' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'allstyles','name'=>'style','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='allstyles' ?><?php $attr_name='style' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" name="<?php echo $attr_name ?>" onchange="<?php echo $attr_onchange ?>" title="<?php echo $attr_title ?>" class="<?php echo $attr_class ?>"<?php if (count($$attr_list)==1) echo ' disabled="disabled"' ?>><?php foreach( $$attr_list as $box_key=>$box_value ) { echo '<option class="'.$attr_class.'" value="'.$box_key.'"'; - if (isset($$attr_name)&&$box_key==$$attr_name || isset($$attr_default)&&$box_key == $$attr_default) + if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />' -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:46 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_admin','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_admin' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'user_admin') ?><?php $attr_class='text' ?><?php $attr_text='user_admin' ?><?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: @@ -509,55 +769,89 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/checkbox.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array('default'=>'false','var'=>'','readonly'=>'false','name'=>'is_admin','prefix'=>'') ?><?php $attr_default='false' ?><?php $attr_var='' ?><?php $attr_readonly='false' ?><?php $attr_name='is_admin' ?><?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/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('default'=>'','readonly'=>'','name'=>'is_admin') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='is_admin' ?><?php + $attr_default = ( $attr_default == true ); + + if ( isset($$attr_name) ) + $checked = $$attr_name == true; +// $checked = isset($$$attr_name)&& $$$attr_name==true; + else + $checked = $attr_default == true; +?><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_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?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; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +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 - global $fx; - if (!isset($attr_class)) $attr_class=''; - if ($attr_class=='fx') $attr['class']=$fx; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'act','colspan'=>'2') ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/button.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +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_class) ?><?php unset($attr_colspan) ?><?php $attr = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr_type='ok' ?><?php $attr_class='ok' ?><?php $attr_value='ok' ?><?php $attr_text='button_ok' ?><?php if ($attr_type=='ok') { $attr_type = 'submit'; - $attr_class = 'ok'; - $attr_text = 'BUTTON_OK'; - $attr_value = 'ok'; +// $attr_class = 'ok'; +// $attr_text = 'BUTTON_OK'; +// $attr_value = 'ok'; } -?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/window-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array() ?> </table> +?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table> </td> </tr> </table> @@ -571,11 +865,16 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu <?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 21:58:47 +0100 */ ?><?php $attr = array() ?></form><?php unset($attr) ?><?php /* source: ./themes/default/include/html/focus.inc.php - compile time: Sun, 29 Jan 2006 21:58:47 +0100 */ ?><?php $attr = array('field'=>'name') ?><?php $attr_field='name' ?><script name="JavaScript" type="text/javascript"><!-- +<?php unset($attr) ?><?php $attr = array() ?></form> + +<?php unset($attr) ?><?php $attr = array('field'=>'name') ?><?php $attr_field='name' ?> +<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 21:58:47 +0100 */ ?><?php $attr = array() ?> +// --> +</script> +<?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> diff --git a/themes/default/pages/html/user/listing.tpl.php b/themes/default/pages/html/user/listing.tpl.php @@ -1,8 +1,8 @@ -<?php /* source: ./themes/default/include/html/page.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!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" /> @@ -12,16 +12,26 @@ <?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/window.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array('title'=>'','name'=>'GLOBAL_USERS','icon'=>'user','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='GLOBAL_USERS' ?><?php $attr_icon='user' ?><?php $attr_widths='' ?><?php $attr_width='85%' ?><?php +<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'GLOBAL_USERS','icon'=>'user','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_USERS' ?><?php $attr_icon='user' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr_widths)) { $column_widths = explode(',',$attr_widths); unset($attr['widths']); } + if (!empty($attr_rowclasses)) + { + $row_classes = explode(',',$attr_rowclasses); + $row_class_idx = 999; + unset($attr['rowclasses']); + } + if (!empty($attr_columnclasses)) + { + $column_classes = explode(',',$attr_columnclasses); + unset($attr['columnclasses']); + } global $image_dir; echo '<br/><br/><br/><center>'; echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; @@ -36,13 +46,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>&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?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> @@ -68,10 +88,10 @@ <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/list.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?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_name) ?><?php unset($attr_icon) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('list'=>'el','extract'=>'1','key'=>'list_key','value'=>'list_value') ?><?php $attr_list='el' ?><?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 ) @@ -85,41 +105,59 @@ } extract($$list_tmp_value); } -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr_class)) + $attr_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?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; +?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/link.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array('title'=>'desc','target'=>'cms_main','url'=>'url','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='desc' ?><?php $attr_target='cms_main' ?><?php $attr_url='url' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('title'=>'desc','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr_title='desc' ?><?php $attr_target='cms_main' ?><?php $attr_url=$url ?><?php $attr_class='' ?><?php if(!empty($attr_url)) - $tmp_url = $$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 /* source: ./themes/default/include/html/image.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array('file'=>'','url'=>'','align'=>'left','type'=>'icon_user','elementtype'=>'') ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_align='left' ?><?php $attr_type='icon_user' ?><?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_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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?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 - 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('align'=>'left','type'=>'user') ?><?php $attr_align='left' ?><?php $attr_type='user' ?><?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 (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('class'=>'text','var'=>'name') ?><?php $attr_class='text' ?><?php $attr_var='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: @@ -131,30 +169,52 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/link-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?></a><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?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; +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'fx') ?><?php $attr_class='fx' ?><?php +// if (empty($attr_class)) +// $attr['class']=$row_class; + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr_class)) + $attr['class']=$column_class; 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'fullname','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='fullname' ?><?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 +?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','value'=>$fullname) ?><?php $attr_class='text' ?><?php $attr_value=$fullname ?><?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: @@ -166,40 +226,62 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/if.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'isAdmin','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='isAdmin' ?><?php $attr_false='' ?><?php +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php $attr = array('true'=>$isAdmin) ?><?php $attr_true=$isAdmin ?><?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) ) @@ -208,8 +290,8 @@ if (!empty($attr_elementtype)) { $exec = empty( $$attr_empty ); } - // Vergleich auf nicht-leer - elseif ( !empty($attr_present) ) + // Vergleich auf Vorhandensein + elseif ( isset($attr_present) ) { if ( !isset($$attr_present) ) $exec = false; @@ -220,22 +302,47 @@ if (!empty($attr_elementtype)) { elseif ( is_numeric($$attr_present) ) $exec = $$attr_present>=0; else - $exec = !empty( $$attr_present ); + $exec = true; } + 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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +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 - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?><?php unset($attr) ?><?php unset($attr_true) ?><?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: @@ -247,20 +354,37 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_ADMIN','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_ADMIN' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_raw) ?><?php $attr = array('class'=>'text','key'=>'USER_ADMIN') ?><?php $attr_class='text' ?><?php $attr_key='USER_ADMIN' ?><?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: @@ -272,20 +396,37 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +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 - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_key) ?><?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: @@ -297,20 +438,32 @@ if (!empty($attr_elementtype)) { $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)?$$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('_','&nbsp;',$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_raw) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/if-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?><?php +?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_raw) ?><?php $attr = array() ?><?php } -?><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/list-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php /* source: ./themes/default/include/html/window-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?> </table> + +?><?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> @@ -324,7 +477,7 @@ if (!empty($attr_elementtype)) { <?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/page-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:52 +0100 */ ?><?php $attr = array() ?> +<?php unset($attr) ?><?php $attr = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?>