commit 5ba018f44d2d37dad22790dec1b7cd7901628ac5
parent d968fd25d56088d77ae8f96f8edf5c3459994044
Author: dankert <devnull@localhost>
Date: Sat, 20 Jan 2007 16:19:26 +0100
Diverse neu erzeugte Seiten, da Vorlagen?nderung.
Diffstat:
9 files changed, 1783 insertions(+), 607 deletions(-)
diff --git a/themes/default/pages/html/index/password.tpl.php b/themes/default/pages/html/index/password.tpl.php
@@ -15,7 +15,7 @@
<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?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'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
if (empty($attr_action))
$attr_action = $actionName;
if (empty($attr_subaction))
@@ -33,7 +33,7 @@
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php
if ( $conf['interface']['url_sessionid'] )
echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
-?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_password','name'=>'login','icon'=>'user','widths'=>'50%,50%','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr_title='GLOBAL_password' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='50%,50%' ?><?php $attr_width='400' ?><?php $attr_rowclasses='fx1,fx2' ?><?php $attr_columnclasses='x,y' ?><?php
+?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_password','name'=>'login','icon'=>'user','widths'=>'50%,50%','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr_title='GLOBAL_password' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='50%,50%' ?><?php $attr_width='400' ?><?php $attr_rowclasses='fx1,fx2' ?><?php $attr_columnclasses='x,y' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -107,7 +107,7 @@
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><?php
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php 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;
@@ -121,7 +121,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'logo','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'logo','colspan'=>'2') ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -136,7 +136,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'password') ?><?php $attr_name='password' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'') ?><?php $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 unset($attr_colspan) ?><?php $attr = array('name'=>'password') ?><?php $attr_name='password' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -150,7 +150,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%') ?><?php $attr_width='50%' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -165,9 +165,15 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_USERNAME','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_USERNAME' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?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:
@@ -179,20 +185,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%') ?><?php $attr_width='50%' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -207,7 +222,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'password_name','prefix'=>'','value'=>'','size'=>'30','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='password_name' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='30' ?><?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_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('class'=>'') ?><?php $attr_class='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'username','value'=>'','size'=>'30','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='username' ?><?php $attr_value='' ?><?php $attr_size='30' ?><?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_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
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -221,7 +236,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -236,9 +251,15 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_DATABASE','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_DATABASE' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'GLOBAL_DATABASE') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_DATABASE' ?><?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:
@@ -250,20 +271,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -278,7 +308,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='dbids' ?><?php $attr_name='dbid' ?><?php $attr_default='actdbid' ?><?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_width) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','class'=>'') ?><?php $attr_list='dbids' ?><?php $attr_name='dbid' ?><?php $attr_default='actdbid' ?><?php $attr_onchange='' ?><?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 )
@@ -290,7 +320,7 @@ if (count($$attr_list)==1) echo ' disabled="disabled"'
}
?></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('class'=>'') ?><?php $attr_class='' ?><?php
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?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;
@@ -304,7 +334,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
+?><tr 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++;
@@ -319,15 +349,15 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu
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=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></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=" <?php echo lang($attr_text) ?> " /><?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() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
</table>
@@ -341,10 +371,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'=>'password_name') ?><?php $attr_field='password_name' ?><script name="JavaScript" type="text/javascript"><!--
+<?php unset($attr) ?><?php $attr = array() ?></form>
+
+<?php unset($attr) ?><?php $attr = array('field'=>'username') ?><?php $attr_field='username' ?>
+<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/passwordcode.tpl.php b/themes/default/pages/html/index/passwordcode.tpl.php
@@ -15,7 +15,7 @@
<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?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'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
if (empty($attr_action))
$attr_action = $actionName;
if (empty($attr_subaction))
@@ -33,7 +33,7 @@
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php
if ( $conf['interface']['url_sessionid'] )
echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
-?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_password','name'=>'login','icon'=>'user','widths'=>'50%,50%','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr_title='GLOBAL_password' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='50%,50%' ?><?php $attr_width='400' ?><?php $attr_rowclasses='fx1,fx2' ?><?php $attr_columnclasses='x,y' ?><?php
+?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_password','name'=>'login','icon'=>'user','widths'=>'50%,50%','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr_title='GLOBAL_password' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='50%,50%' ?><?php $attr_width='400' ?><?php $attr_rowclasses='fx1,fx2' ?><?php $attr_columnclasses='x,y' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -107,7 +107,7 @@
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><?php
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php 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;
@@ -121,7 +121,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'logo','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'logo','colspan'=>'2') ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -136,7 +136,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'password') ?><?php $attr_name='password' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'') ?><?php $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 unset($attr_colspan) ?><?php $attr = array('name'=>'password') ?><?php $attr_name='password' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -150,7 +150,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -165,9 +165,15 @@
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'=>'password_code','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='password_code' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('class'=>'text','text'=>'password_code') ?><?php $attr_class='text' ?><?php $attr_text='password_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:
@@ -179,20 +185,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?php $attr_colspan='' ?><?php
+?></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++;
@@ -207,7 +222,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'code','prefix'=>'','value'=>'','size'=>'30','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='code' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='30' ?><?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_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('class'=>'') ?><?php $attr_class='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'code','size'=>'30','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='code' ?><?php $attr_size='30' ?><?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;
@@ -221,7 +236,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
+?><tr 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++;
@@ -236,15 +251,15 @@
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=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></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=" <?php echo lang($attr_text) ?> " /><?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() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
</table>
@@ -258,10 +273,15 @@
<?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'=>'password_code') ?><?php $attr_field='password_code' ?><script name="JavaScript" type="text/javascript"><!--
+<?php unset($attr) ?><?php $attr = array() ?></form>
+
+<?php unset($attr) ?><?php $attr = array('field'=>'code') ?><?php $attr_field='code' ?>
+<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/register.tpl.php b/themes/default/pages/html/index/register.tpl.php
@@ -15,7 +15,7 @@
<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?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'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
if (empty($attr_action))
$attr_action = $actionName;
if (empty($attr_subaction))
@@ -33,7 +33,7 @@
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php
if ( $conf['interface']['url_sessionid'] )
echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
-?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_REGISTER','name'=>'login','icon'=>'user','widths'=>'','width'=>'400','rowclasses'=>'odd,even','columnclasses'=>'x') ?><?php $attr_title='GLOBAL_REGISTER' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='' ?><?php $attr_width='400' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='x' ?><?php
+?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_REGISTER','name'=>'login','icon'=>'user','width'=>'400','rowclasses'=>'odd,even','columnclasses'=>'x') ?><?php $attr_title='GLOBAL_REGISTER' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_width='400' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='x' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -107,7 +107,7 @@
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><?php
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_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;
@@ -121,7 +121,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'logo','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'logo','colspan'=>'2') ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -136,7 +136,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'register') ?><?php $attr_name='register' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'') ?><?php $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 unset($attr_colspan) ?><?php $attr = array('name'=>'register') ?><?php $attr_name='register' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -150,7 +150,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -165,9 +165,15 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_MAIL','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_MAIL' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?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:
@@ -179,20 +185,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -207,7 +222,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'register_mail','prefix'=>'','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='register_mail' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='25' ?><?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_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('class'=>'') ?><?php $attr_class='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'mail','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='mail' ?><?php $attr_size='25' ?><?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;
@@ -221,7 +236,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
+?><tr 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++;
@@ -236,15 +251,15 @@
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=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></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=" <?php echo lang($attr_text) ?> " /><?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() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
</table>
@@ -258,10 +273,15 @@
<?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'=>'register_mail') ?><?php $attr_field='register_mail' ?><script name="JavaScript" type="text/javascript"><!--
+<?php unset($attr) ?><?php $attr = array() ?></form>
+
+<?php unset($attr) ?><?php $attr = array('field'=>'mail') ?><?php $attr_field='mail' ?>
+<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/registercode.tpl.php b/themes/default/pages/html/index/registercode.tpl.php
@@ -15,7 +15,7 @@
<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?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'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
if (empty($attr_action))
$attr_action = $actionName;
if (empty($attr_subaction))
@@ -33,7 +33,7 @@
<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php
if ( $conf['interface']['url_sessionid'] )
echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n";
-?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_REGISTER','name'=>'login','icon'=>'user','widths'=>'','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr_title='GLOBAL_REGISTER' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='' ?><?php $attr_width='400' ?><?php $attr_rowclasses='fx1,fx2' ?><?php $attr_columnclasses='x,y' ?><?php
+?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_REGISTER','name'=>'login','icon'=>'user','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr_title='GLOBAL_REGISTER' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_width='400' ?><?php $attr_rowclasses='fx1,fx2' ?><?php $attr_columnclasses='x,y' ?><?php
$coloumn_widths=array();
if (!empty($attr_widths))
{
@@ -107,7 +107,7 @@
<tr>
<td>
- <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><?php
+ <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_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;
@@ -121,7 +121,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'logo','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'logo','colspan'=>'2') ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -136,7 +136,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'register') ?><?php $attr_name='register' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('class'=>'') ?><?php $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 unset($attr_colspan) ?><?php $attr = array('name'=>'register') ?><?php $attr_name='register' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?><?php
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -150,7 +150,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -165,9 +165,15 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_REGISTER_CODE','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_REGISTER_CODE' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'USER_REGISTER_CODE') ?><?php $attr_class='text' ?><?php $attr_text='USER_REGISTER_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:
@@ -179,20 +185,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -207,7 +222,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'register_code','prefix'=>'','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='register_code' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='25' ?><?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_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('class'=>'') ?><?php $attr_class='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'code','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='code' ?><?php $attr_size='25' ?><?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;
@@ -221,7 +236,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -236,9 +251,15 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_USERNAME','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_USERNAME' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?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:
@@ -250,20 +271,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -278,7 +308,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','index'=>'','name'=>'register_name','prefix'=>'','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='register_name' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='25' ?><?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_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('class'=>'') ?><?php $attr_class='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'username','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='username' ?><?php $attr_value='' ?><?php $attr_size='25' ?><?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_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
$row_class_idx++;
if ($row_class_idx > count($row_classes))
$row_class_idx=1;
@@ -292,7 +322,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -307,9 +337,15 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'USER_PASSWORD','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_PASSWORD' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'USER_PASSWORD') ?><?php $attr_class='text' ?><?php $attr_text='USER_PASSWORD' ?><?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:
@@ -321,20 +357,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -349,7 +394,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('name'=>'register_password','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr_name='register_password' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='25' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'password','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr_name='password' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='25' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?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;
@@ -363,7 +408,7 @@
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -378,9 +423,15 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_DATABASE','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_DATABASE' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','text'=>'GLOBAL_DATABASE') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_DATABASE' ?><?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:
@@ -392,20 +443,29 @@
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ if ( isset($$attr_text))
+ $tmp_text = lang($$attr_text);
+ else
+ $tmp_text = lang($attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?php $attr_class='fx' ?><?php
// if (empty($attr_class))
// $attr['class']=$row_class;
$column_class_idx++;
@@ -420,7 +480,7 @@
if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr_rowspan) )
$attr['width']=$column_widths[$cell_column_nr-1];
-?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='dbids' ?><?php $attr_name='dbid' ?><?php $attr_default='actdbid' ?><?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_width) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','class'=>'') ?><?php $attr_list='dbids' ?><?php $attr_name='dbid' ?><?php $attr_default='actdbid' ?><?php $attr_onchange='' ?><?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 )
@@ -432,7 +492,7 @@ if (count($$attr_list)==1) echo ' disabled="disabled"'
}
?></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('class'=>'') ?><?php $attr_class='' ?><?php
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?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;
@@ -446,7 +506,7 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu
$column_class_idx = 999;
-?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php
+?><tr 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++;
@@ -461,15 +521,15 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu
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=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></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=" <?php echo lang($attr_text) ?> " /><?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() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
</table>
@@ -483,10 +543,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'=>'register_code') ?><?php $attr_field='register_code' ?><script name="JavaScript" type="text/javascript"><!--
+<?php unset($attr) ?><?php $attr = array() ?></form>
+
+<?php unset($attr) ?><?php $attr = array('field'=>'code') ?><?php $attr_field='code' ?>
+<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
@@ -6,32 +6,24 @@
<link rel="shortcut icon" href="<?php echo $image_dir.'favicon.ico' ?>" />
<meta name="robots" content="noindex,nofollow" />
</head>
-<?php unset($attr) ?><?php $attr = array('rows'=>'20,5,*,5','columns'=>'') ?><?php $attr_rows='20,5,*,5' ?><?php $attr_columns='' ?><frameset
+<?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 unset($attr_columns) ?><?php $attr = array('file'=>'frame_src_title','name'=>'cms_title','scrolling'=>'') ?><?php $attr_file='frame_src_title' ?><?php $attr_name='cms_title' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_background','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_background' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('rows'=>'','columns'=>'5,3,25%,3,5,3,*,3,5') ?><?php $attr_rows='' ?><?php $attr_columns='5,3,25%,3,5,3,*,3,5' ?><frameset
+ 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_rows) ?><?php unset($attr_columns) ?><?php $attr = array('file'=>'frame_src_background','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_background' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('rows'=>'3,54,*,3','columns'=>'') ?><?php $attr_rows='3,54,*,3' ?><?php $attr_columns='' ?><frameset
+ 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 unset($attr_columns) ?><?php $attr = array('file'=>'frame_src_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_tree_title','name'=>'cms_treemenu','scrolling'=>'') ?><?php $attr_file='frame_src_tree_title' ?><?php $attr_name='cms_treemenu' ?><?php $attr_scrolling='' ?><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('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('file'=>'frame_src_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_background','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_background' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_main','name'=>'cms_main','scrolling'=>'') ?><?php $attr_file='frame_src_main' ?><?php $attr_name='cms_main' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_background','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_background' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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_background','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_background' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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 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 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/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php
@@ -15,7 +15,7 @@
<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'index','subaction'=>'login','id'=>'','name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='index' ?><?php $attr_subaction='login' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php
+<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'index','subaction'=>'login','name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='index' ?><?php $attr_subaction='login' ?><?php $attr_name='' ?><?php $attr_target='_top' ?><?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 +33,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'=>'GLOBAL_LOGIN','name'=>'login','icon'=>'user','widths'=>'','width'=>'400') ?><?php $attr_title='GLOBAL_LOGIN' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_widths='' ?><?php $attr_width='400' ?><?php
+?><?php unset($attr) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'GLOBAL_LOGIN','name'=>'login','icon'=>'user','width'=>'400','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_title='GLOBAL_LOGIN' ?><?php $attr_name='login' ?><?php $attr_icon='user' ?><?php $attr_width='400' ?><?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 +65,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> <?php
+ }
+ ?>
+ </td>
</tr>
<tr><td class="subaction">
<?php foreach( $windowMenu as $menu )
@@ -90,29 +107,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'=>'logo','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='logo' ?><?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_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array('present'=>$conf['login']['logo']['file']) ?><?php $attr_present=$conf['login']['logo']['file'] ?><?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,10 +150,10 @@
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -137,10 +165,10 @@
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -152,7 +180,10 @@
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -161,48 +192,154 @@
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('false'=>$this->mustChangePassword) ?><?php $attr_false=$this->mustChangePassword ?><?php
+
+ // Wahr-Vergleich
+// 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 ( 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( isset($attr_contains) )
+ $exec = in_array($$attr_var,explode(',',$attr_contains));
+
+ // Inhalt-Vergleich
+ elseif( isset($attr_var) )
+ $exec = $$attr_var == $attr_value;
+
+ // Vergleich auf leer
+ elseif ( isset($attr_empty) )
+ {
+ if ( !isset($$attr_empty) )
+ $exec = empty($attr_empty);
+ elseif ( is_array($$attr_empty) )
+ $exec = (count($$attr_empty)==0);
+ elseif ( is_bool($$attr_empty) )
+ $exec = true;
+ else
+ $exec = empty( $$attr_empty );
+ }
+
+ // Vergleich auf Vorhandensein
+ elseif ( isset($attr_present) )
+ {
+ if ( !isset($$attr_present) )
+ $exec = !empty($attr_present);
+ elseif ( is_array($$attr_present) )
+ $exec = (count($$attr_present)>0);
+ elseif ( is_bool($$attr_present) )
+ $exec = true;
+ elseif ( is_numeric($$attr_present) )
+ $exec = $$attr_present>=0;
+ else
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( isset($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = !empty($attr_notempty);
+ 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
+ {
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
+ }
+
+ // Ergebnis umdrehen
+ if ( !empty($attr_invert) )
+ $exec = !$exec;
+
+ if ( $exec )
+ {
+?><?php unset($attr) ?><?php unset($attr_false) ?><?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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?php $attr_colspan='2' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $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_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'logo_url','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='logo_url' ?><?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_colspan) ?><?php $attr = array('present'=>$conf['login']['logo']['url']) ?><?php $attr_present=$conf['login']['logo']['url'] ?><?php
// Wahr-Vergleich
- if ( !empty($attr_true) )
- $exec = $$attr_true == true;
+// Html::debug($attr);
+
+ if ( isset($attr_true) )
+ {
+ if (gettype($attr_true) === '' && gettype($attr_true) === '1')
+ $exec = $$attr_true == true;
+ else
+ $exec = $attr_true == true;
+ }
// Falsch-Vergleich
- elseif ( !empty($attr_false) )
- $exec = $$attr_false != true;
-
+ elseif ( isset($attr_false) )
+ {
+ if (gettype($attr_false) === '' && gettype($attr_false) === '1')
+ $exec = $$attr_false == false;
+ else
+ $exec = $attr_false == false;
+ }
// Inhalt-Vergleich mit Wertliste
- elseif( !empty($attr_contains) )
+ elseif( isset($attr_contains) )
$exec = in_array($$attr_var,explode(',',$attr_contains));
// Inhalt-Vergleich
- elseif( !empty($attr_var) )
+ elseif( isset($attr_var) )
$exec = $$attr_var == $attr_value;
// Vergleich auf leer
- elseif ( !empty($attr_empty) )
+ elseif ( isset($attr_empty) )
{
if ( !isset($$attr_empty) )
- $exec = true;
+ $exec = empty($attr_empty);
elseif ( is_array($$attr_empty) )
$exec = (count($$attr_empty)==0);
elseif ( is_bool($$attr_empty) )
@@ -212,10 +349,10 @@
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -227,10 +364,10 @@
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -242,7 +379,10 @@
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -251,12 +391,13 @@
if ( $exec )
{
-?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php unset($attr_invert) ?><?php unset($attr_empty) ?><?php unset($attr_present) ?><?php unset($attr_contains) ?><?php unset($attr_true) ?><?php unset($attr_false) ?><?php $attr = array('title'=>'','config'=>'login/logo_url','target'=>'_top','var'=>'','url'=>'','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_config='login/logo_url' ?><?php $attr_target='_top' ?><?php $attr_var='' ?><?php $attr_url='' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if (!empty($attr_action))
- {
+?><?php unset($attr) ?><?php unset($attr_present) ?><?php $attr = array('title'=>'','target'=>'_top','url'=>$conf['login']['logo']['url'],'class'=>'') ?><?php $attr_title='' ?><?php $attr_target='_top' ?><?php $attr_url=$conf['login']['logo']['url'] ?><?php $attr_class='' ?><?php
+ if(!empty($attr_url))
+ $tmp_url = $attr_url;
+ else
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="<?php echo $conf['login']['logo_url'] ?>" class="" target="_top" title=""><?php $attr = array('config'=>'login/logo','file'=>'','url'=>'','icon'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_config='login/logo' ?><?php $attr_file='' ?><?php $attr_url='' ?><?php $attr_icon='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
-if (!empty($attr_elementtype)) {
+?><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('url'=>$conf['login']['logo']['file'],'align'=>'left') ?><?php $attr_url=$conf['login']['logo']['file'] ?><?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_config)) {
global $conf;
@@ -267,38 +408,59 @@ if (!empty($attr_elementtype)) {
$tmp_url = $c;
?><img src="<?php echo $tmp_url ?>" 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_icon)) {
+} elseif (isset($attr_icon)) {
?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($$attr_url)) {
-?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($attr_file)) {
-?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_config) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?><?php
+} 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_url) ?><?php unset($attr_align) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'logo_url','present'=>'','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='logo_url' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?php unset($attr) ?><?php $attr = array('empty'=>$conf['login']['logo']['url']) ?><?php $attr_empty=$conf['login']['logo']['url'] ?><?php
// Wahr-Vergleich
- if ( !empty($attr_true) )
- $exec = $$attr_true == true;
+// Html::debug($attr);
+
+ if ( isset($attr_true) )
+ {
+ if (gettype($attr_true) === '' && gettype($attr_true) === '1')
+ $exec = $$attr_true == true;
+ else
+ $exec = $attr_true == true;
+ }
// Falsch-Vergleich
- elseif ( !empty($attr_false) )
- $exec = $$attr_false != true;
-
+ elseif ( isset($attr_false) )
+ {
+ if (gettype($attr_false) === '' && gettype($attr_false) === '1')
+ $exec = $$attr_false == false;
+ else
+ $exec = $attr_false == false;
+ }
// Inhalt-Vergleich mit Wertliste
- elseif( !empty($attr_contains) )
+ elseif( isset($attr_contains) )
$exec = in_array($$attr_var,explode(',',$attr_contains));
// Inhalt-Vergleich
- elseif( !empty($attr_var) )
+ elseif( isset($attr_var) )
$exec = $$attr_var == $attr_value;
// Vergleich auf leer
- elseif ( !empty($attr_empty) )
+ elseif ( isset($attr_empty) )
{
if ( !isset($$attr_empty) )
- $exec = true;
+ $exec = empty($attr_empty);
elseif ( is_array($$attr_empty) )
$exec = (count($$attr_empty)==0);
elseif ( is_bool($$attr_empty) )
@@ -308,10 +470,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -323,10 +485,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -338,7 +500,10 @@ elseif (!empty($attr_type)) {
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -347,8 +512,8 @@ elseif (!empty($attr_type)) {
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('config'=>'','file'=>'','url'=>'logo','icon'=>'','align'=>'left','type'=>'','elementtype'=>'') ?><?php $attr_config='' ?><?php $attr_file='' ?><?php $attr_url='logo' ?><?php $attr_icon='' ?><?php $attr_align='left' ?><?php $attr_type='' ?><?php $attr_elementtype='' ?><?php
-if (!empty($attr_elementtype)) {
+?><?php unset($attr) ?><?php unset($attr_empty) ?><?php $attr = array('url'=>$conf['login']['logo']['file'],'align'=>'left') ?><?php $attr_url=$conf['login']['logo']['file'] ?><?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_config)) {
global $conf;
@@ -359,40 +524,83 @@ if (!empty($attr_elementtype)) {
$tmp_url = $c;
?><img src="<?php echo $tmp_url ?>" 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_icon)) {
+} elseif (isset($attr_icon)) {
?><img src="<?php echo $image_dir.'icon_'.$attr_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($$attr_url)) {
-?><img src="<?php echo $$attr_url ?>" border="0" align="<?php echo $attr_align ?>"><?php
-} elseif (!empty($attr_file)) {
-?><img src="<?php echo $image_dir.$$attr_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr_align ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_config) ?><?php unset($attr_file) ?><?php unset($attr_url) ?><?php unset($attr_icon) ?><?php unset($attr_align) ?><?php unset($attr_type) ?><?php unset($attr_elementtype) ?><?php $attr = array() ?><?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_url) ?><?php unset($attr_align) ?><?php $attr = array() ?><?php
}
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
?><?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'=>'motd','contains'=>'','true'=>'','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='motd' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='' ?><?php
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?php unset($attr) ?><?php $attr = array() ?><?php
+ }
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?php unset($attr) ?><?php $attr = array('present'=>$conf['login']['motd']) ?><?php $attr_present=$conf['login']['motd'] ?><?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) )
@@ -402,10 +610,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -417,10 +625,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -432,7 +640,10 @@ elseif (!empty($attr_type)) {
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -441,28 +652,44 @@ elseif (!empty($attr_type)) {
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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'motd','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='motd' ?><?php $attr_colspan='2' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $column_class_idx = 999;
+
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('class'=>'motd','colspan'=>'2') ?><?php $attr_class='motd' ?><?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('title'=>'','class'=>'','var'=>'motd','text'=>'','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='motd' ?><?php $attr_text='' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><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','raw'=>$conf['login']['motd']) ?><?php $attr_class='text' ?><?php $attr_raw=$conf['login']['motd'] ?><?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:
@@ -474,44 +701,71 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_raw) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'nologin','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='nologin' ?><?php $attr_false='' ?><?php
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?php unset($attr) ?><?php $attr = array('true'=>$conf['login']['nologin']) ?><?php $attr_true=$conf['login']['nologin'] ?><?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) )
@@ -521,10 +775,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -536,10 +790,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -551,7 +805,10 @@ elseif (!empty($attr_type)) {
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -560,28 +817,44 @@ elseif (!empty($attr_type)) {
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_true) ?><?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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'help','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='help' ?><?php $attr_colspan='2' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $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_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'LOGIN_NOLOGIN_DESC','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='LOGIN_NOLOGIN_DESC' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><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','key'=>'LOGIN_NOLOGIN_DESC') ?><?php $attr_class='text' ?><?php $attr_key='LOGIN_NOLOGIN_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:
@@ -593,44 +866,71 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'readonly','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='readonly' ?><?php $attr_false='' ?><?php
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?php unset($attr) ?><?php $attr = array('true'=>$conf['security']['readonly']) ?><?php $attr_true=$conf['security']['readonly'] ?><?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) )
@@ -640,10 +940,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -655,10 +955,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -670,7 +970,10 @@ elseif (!empty($attr_type)) {
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -679,28 +982,44 @@ elseif (!empty($attr_type)) {
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_true) ?><?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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'help','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='help' ?><?php $attr_colspan='2' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $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_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_READONLY_DESC','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_READONLY_DESC' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><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','key'=>'GLOBAL_READONLY_DESC') ?><?php $attr_class='text' ?><?php $attr_key='GLOBAL_READONLY_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:
@@ -712,44 +1031,71 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'nopublish','false'=>'') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='nopublish' ?><?php $attr_false='' ?><?php
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?php unset($attr) ?><?php $attr = array('true'=>$conf['security']['nopublish']) ?><?php $attr_true=$conf['security']['nopublish'] ?><?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) )
@@ -759,10 +1105,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -774,10 +1120,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -789,7 +1135,10 @@ elseif (!empty($attr_type)) {
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -798,28 +1147,44 @@ elseif (!empty($attr_type)) {
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_true) ?><?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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'help','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='help' ?><?php $attr_colspan='2' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $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_width) ?><?php unset($attr_style) ?><?php unset($attr_class) ?><?php unset($attr_colspan) ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_NOPUBLISH_DESC','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_NOPUBLISH_DESC' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><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','key'=>'GLOBAL_NOPUBLISH_DESC') ?><?php $attr_class='text' ?><?php $attr_key='GLOBAL_NOPUBLISH_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:
@@ -831,44 +1196,71 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
-?><?php unset($attr) ?><?php $attr = array('var'=>'','value'=>'','invert'=>'','empty'=>'','present'=>'','contains'=>'','true'=>'','false'=>'nologin') ?><?php $attr_var='' ?><?php $attr_value='' ?><?php $attr_invert='' ?><?php $attr_empty='' ?><?php $attr_present='' ?><?php $attr_contains='' ?><?php $attr_true='' ?><?php $attr_false='nologin' ?><?php
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?php unset($attr) ?><?php $attr = array('false'=>$conf['login']['nologin']) ?><?php $attr_false=$conf['login']['nologin'] ?><?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) )
@@ -878,10 +1270,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf Vorhandensein
- elseif ( !empty($attr_present) )
+ elseif ( isset($attr_present) )
{
if ( !isset($$attr_present) )
- $exec = false;
+ $exec = !empty($attr_present);
elseif ( is_array($$attr_present) )
$exec = (count($$attr_present)>0);
elseif ( is_bool($$attr_present) )
@@ -893,10 +1285,10 @@ elseif (!empty($attr_type)) {
}
// Vergleich auf nicht-leer
- elseif ( !empty($attr_notempty) )
+ elseif ( isset($attr_notempty) )
{
if ( !isset($$attr_notempty) )
- $exec = false;
+ $exec = !empty($attr_notempty);
elseif ( is_array($$attr_notempty) )
$exec = (count($$attr_notempty)>0);
elseif ( is_bool($$attr_notempty) )
@@ -908,7 +1300,10 @@ elseif (!empty($attr_type)) {
}
else
{
- die("error in IF");
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
}
// Ergebnis umdrehen
@@ -917,47 +1312,156 @@ elseif (!empty($attr_type)) {
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_false) ?><?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'=>'logo','colspan'=>'2') ?><?php $attr_class='logo' ?><?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('name'=>'login') ?><?php $attr_name='login' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ $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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'logo','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='logo' ?><?php $attr_colspan='2' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $column_class_idx = 999;
+
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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'=>'login') ?><?php $attr_name='login' ?><img src="<?php echo $image_dir.'logo_'.$attr_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr_name.'_text') ?></p><?php unset($attr) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','key'=>'USER_USERNAME') ?><?php $attr_class='text' ?><?php $attr_key='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:
+ //echo $$attr_array[$attr_var].'%';
+ $tmpArray = $$attr_array;
+ if (!empty($attr_var))
+ $tmp_text = $tmpArray[$attr_var];
+ else
+ $tmp_text = lang($tmpArray[$attr_text]);
+ }
+ elseif (!empty($attr_text))
+ $tmp_text = lang($$attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
+ elseif (!empty($attr_var))
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
+ elseif (!empty($attr_raw))
+ $tmp_text = str_replace('_',' ',$attr_raw);
+ 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_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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_class) ?><?php $attr = array('class'=>'','default'=>'','type'=>'text','name'=>'login_name','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_name='login_name' ?><?php $attr_value='' ?><?php $attr_size='25' ?><?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_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
+ $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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $column_class_idx = 999;
+
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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'=>'USER_USERNAME','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_USERNAME' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','key'=>'USER_PASSWORD') ?><?php $attr_class='text' ?><?php $attr_key='USER_PASSWORD' ?><?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:
@@ -969,51 +1473,246 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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'=>'login_name','prefix'=>'','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr_class='' ?><?php $attr_default='' ?><?php $attr_type='text' ?><?php $attr_index='' ?><?php $attr_name='login_name' ?><?php $attr_prefix='' ?><?php $attr_value='' ?><?php $attr_size='25' ?><?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
- 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_width) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'login_password','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr_name='login_password' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='25' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array('true'=>$this->mustChangePassword) ?><?php $attr_true=$this->mustChangePassword ?><?php
+
+ // Wahr-Vergleich
+// 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 ( 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( isset($attr_contains) )
+ $exec = in_array($$attr_var,explode(',',$attr_contains));
+
+ // Inhalt-Vergleich
+ elseif( isset($attr_var) )
+ $exec = $$attr_var == $attr_value;
+
+ // Vergleich auf leer
+ elseif ( isset($attr_empty) )
+ {
+ if ( !isset($$attr_empty) )
+ $exec = empty($attr_empty);
+ elseif ( is_array($$attr_empty) )
+ $exec = (count($$attr_empty)==0);
+ elseif ( is_bool($$attr_empty) )
+ $exec = true;
+ else
+ $exec = empty( $$attr_empty );
+ }
+
+ // Vergleich auf Vorhandensein
+ elseif ( isset($attr_present) )
+ {
+ if ( !isset($$attr_present) )
+ $exec = !empty($attr_present);
+ elseif ( is_array($$attr_present) )
+ $exec = (count($$attr_present)>0);
+ elseif ( is_bool($$attr_present) )
+ $exec = true;
+ elseif ( is_numeric($$attr_present) )
+ $exec = $$attr_present>=0;
+ else
+ $exec = true;
+ }
+
+ // Vergleich auf nicht-leer
+ elseif ( isset($attr_notempty) )
+ {
+ if ( !isset($$attr_notempty) )
+ $exec = !empty($attr_notempty);
+ 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
+ {
+ Html::debug( $attr );
+ echo("error in IF line ".__LINE__);
+ echo("assume: FALSE");
+ $exec = false;
+ }
+
+ // Ergebnis umdrehen
+ if ( !empty($attr_invert) )
+ $exec = !$exec;
+
+ if ( $exec )
+ {
+?><?php unset($attr) ?><?php unset($attr_true) ?><?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('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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_class) ?><?php $attr = array('class'=>'text','key'=>'USER_NEW_PASSWORD') ?><?php $attr_class='text' ?><?php $attr_key='USER_NEW_PASSWORD' ?><?php
+ if(empty($attr_title))
+ if (!empty($attr_key))
+ $attr_title = lang($attr_key).'_HELP';
+ else
+ $attr_title = '';
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?><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))
+ $tmp_text = lang($$attr_text);
+ elseif (!empty($attr_textvar))
+ $tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
+ elseif (!empty($attr_var))
+ $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
+ elseif (!empty($attr_raw))
+ $tmp_text = str_replace('_',' ',$attr_raw);
+ 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_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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'=>'USER_PASSWORD','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='USER_PASSWORD' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'password1','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr_name='password1' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='25' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?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('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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_class) ?><?php $attr = array('class'=>'text','key'=>'USER_NEW_PASSWORD_REPEAT') ?><?php $attr_class='text' ?><?php $attr_key='USER_NEW_PASSWORD_REPEAT' ?><?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:
@@ -1025,51 +1724,90 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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'=>'login_password','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr_name='login_password' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='25' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'password2','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr_name='password2' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='25' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ }
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
+?><?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;
-
-?><tr><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+
+ $column_class_idx = 999;
+
+?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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'=>'GLOBAL_DATABASE','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_DATABASE' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_width) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','key'=>'GLOBAL_DATABASE') ?><?php $attr_class='text' ?><?php $attr_key='GLOBAL_DATABASE' ?><?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:
@@ -1081,30 +1819,41 @@ elseif (!empty($attr_type)) {
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='50%' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php
- global $fx;
- if (!isset($attr_class)) $attr_class='';
- if ($attr_class=='fx') $attr['class']=$fx;
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_key) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'50%','class'=>'fx') ?><?php $attr_width='50%' ?><?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'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='dbids' ?><?php $attr_name='dbid' ?><?php $attr_default='actdbid' ?><?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_width) ?><?php unset($attr_class) ?><?php $attr = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','class'=>'') ?><?php $attr_list='dbids' ?><?php $attr_name='dbid' ?><?php $attr_default='actdbid' ?><?php $attr_onchange='' ?><?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 )
@@ -1116,39 +1865,60 @@ if (count($$attr_list)==1) echo ' disabled="disabled"'
}
?></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('name'=>'screenwidth','default'=>'9999') ?><?php $attr_name='screenwidth' ?><?php $attr_default='9999' ?><input type="hidden" name="<?php echo $attr_name ?>" value="<?php echo isset($$attr_name)?$$attr_name:$attr_default ?>" /><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php $attr = array() ?></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';
-
+?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_class) ?><?php $attr = array('name'=>'screenwidth','default'=>'9999') ?><?php $attr_name='screenwidth' ?><?php $attr_default='9999' ?><input type="hidden" name="<?php echo $attr_name ?>" value="<?php echo isset($$attr_name)?$$attr_name:$attr_default ?>" /><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php $attr = array() ?></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;
-
-?><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;
+
+ $column_class_idx = 999;
+
+?><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=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><script name="javascript1.2" type="text/javascript">
+?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><script name="javascript1.2" type="text/javascript">
<!--
document.forms[0].screenwidth.value=window.innerWidth;
+// -->
</script>
<?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
}
+
+ unset($attr_true);
+ unset($attr_false);
+ unset($attr_notempty);
+ unset($attr_empty);
+ unset($attr_contains);
+ unset($attr_present);
+ unset($attr_invert);
+ unset($attr_value);
+ unset($attr_var);
?><?php unset($attr) ?><?php $attr = array() ?> </table>
</td>
</tr>
@@ -1163,13 +1933,22 @@ document.forms[0].screenwidth.value=window.innerWidth;
<?php $dur = time()-START_TIME;
echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small>
<?php } ?>
-<?php unset($attr) ?><?php $attr = array() ?></form><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array('title'=>'','config'=>'','target'=>'_top','var'=>'','url'=>'http://www.gnu.org/copyleft/gpl.html','class'=>'','action'=>'','subaction'=>'','id'=>'','var1'=>'','value1'=>'') ?><?php $attr_title='' ?><?php $attr_config='' ?><?php $attr_target='_top' ?><?php $attr_var='' ?><?php $attr_url='http://www.gnu.org/copyleft/gpl.html' ?><?php $attr_class='' ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_var1='' ?><?php $attr_value1='' ?><?php
- if (!empty($attr_action))
- {
+<?php unset($attr) ?><?php $attr = array() ?></form>
+
+<?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array('title'=>'','target'=>'_top','url'=>$conf['login']['gpl']['url'],'class'=>'') ?><?php $attr_title='' ?><?php $attr_target='_top' ?><?php $attr_url=$conf['login']['gpl']['url'] ?><?php $attr_class='' ?><?php
+ if(!empty($attr_url))
+ $tmp_url = $attr_url;
+ else
$tmp_url = Html::url($attr_action,$attr_subaction,!empty($$attr_id)?$$attr_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:''));
-?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr_class ?>" target="<?php echo $attr_target ?>" title="<?php echo hasLang($attr_title)?lang($attr_title):lang($$attr_title) ?>"><?php } ?><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_config) ?><?php unset($attr_target) ?><?php unset($attr_var) ?><?php unset($attr_url) ?><?php unset($attr_class) ?><?php unset($attr_action) ?><?php unset($attr_subaction) ?><?php unset($attr_id) ?><?php unset($attr_var1) ?><?php unset($attr_value1) ?><a href="http://www.gnu.org/copyleft/gpl.html" class="" target="_top" title=""><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_GPL','textvar'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_GPL' ?><?php $attr_textvar='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- if(empty($attr_title)) $attr_title = $attr_text;
-?><span class="<?php echo $attr_class ?>"><?php
+?><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_GPL')) ?><?php $attr_class='text' ?><?php $attr_value=lang('GLOBAL_GPL') ?><?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:
@@ -1181,23 +1960,32 @@ document.forms[0].screenwidth.value=window.innerWidth;
$tmp_text = lang($tmpArray[$attr_text]);
}
elseif (!empty($attr_text))
- $tmp_text = lang($attr_text);
+ $tmp_text = lang($$attr_text);
elseif (!empty($attr_textvar))
$tmp_text = lang($$attr_textvar);
+ elseif (!empty($attr_key))
+ $tmp_text = lang($attr_key);
elseif (!empty($attr_var))
$tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present';
elseif (!empty($attr_raw))
$tmp_text = str_replace('_',' ',$attr_raw);
- else echo 'text error';
+ elseif (!empty($attr_value))
+ $tmp_text = $attr_value;
+ else
+ { Html::debug($attr);echo 'text error';
+ }
if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 )
$tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) );
echo $tmp_text;
-?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_textvar) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('field'=>'login_name') ?><?php $attr_field='login_name' ?><script name="JavaScript" type="text/javascript"><!--
+?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php $attr = array() ?></a><?php unset($attr) ?><?php $attr = array('field'=>'login_name') ?><?php $attr_field='login_name' ?>
+<script name="JavaScript" type="text/javascript">
+<!--
document.forms[0].<?php echo $attr_field ?>.focus();
document.forms[0].<?php echo $attr_field ?>.select();
-//--></script>
+// -->
+</script>
<?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?>
<!-- $Id$ -->
diff --git a/themes/default/pages/html/main/show.tpl.php b/themes/default/pages/html/main/show.tpl.php
@@ -6,13 +6,11 @@
<link rel="shortcut icon" href="<?php echo $image_dir.'favicon.ico' ?>" />
<meta name="robots" content="noindex,nofollow" />
</head>
-<?php unset($attr) ?><?php $attr = array('rows'=>'3,54,*,3','columns'=>'') ?><?php $attr_rows='3,54,*,3' ?><?php $attr_columns='' ?><frameset
+<?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 unset($attr_columns) ?><?php $attr = array('file'=>'frame_src_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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('file'=>'frame_src_main_menu','name'=>'cms_main_menu','scrolling'=>'') ?><?php $attr_file='frame_src_main_menu' ?><?php $attr_name='cms_main_menu' ?><?php $attr_scrolling='' ?><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('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('file'=>'frame_src_border','name'=>'','scrolling'=>'') ?><?php $attr_file='frame_src_border' ?><?php $attr_name='' ?><?php $attr_scrolling='' ?><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/profile/pwchange.tpl.php b/themes/default/pages/html/profile/pwchange.tpl.php
@@ -1,4 +1,4 @@
-<?php /* source: ./themes/default/include/html/page.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,10 +12,10 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php /* source: ./themes/default/include/html/form.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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 +33,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:54:37 +0100 */ ?><?php $attr = array('title'=>'','name'=>'user_profile','icon'=>'user','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='user_profile' ?><?php $attr_icon='user' ?><?php $attr_widths='' ?><?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'=>'user_profile','icon'=>'user','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='user_profile' ?><?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.'">';
@@ -54,13 +65,23 @@
}
echo '<span class="title">'.lang($windowTitle).'</span>';
?>
- </th>
+ </td><td class="menu" style="align:right;">
+ <?php if (isset($windowIcons)) foreach( $windowIcons as $icon )
+ {
+ ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php
+ }
+ ?>
+ </td>
</tr>
<tr><td class="subaction">
<?php foreach( $windowMenu as $menu )
{
?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a> <?php
}
+ if ($conf['help']['enabled'] )
+ {
+ ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('GLOBAL_HELP') ?>" class="menu">?</a><?php
+ }
?></td>
</tr>
@@ -86,28 +107,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:54:37 +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_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><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_password','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_password' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php
- 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 $attr = array('class'=>'text','text'=>'user_password') ?><?php $attr_class='text' ?><?php $attr_text='user_password' ?><?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 +156,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('_',' ',$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:54:37 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?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() ?><?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/password.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('name'=>'act_password','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr_name='act_password' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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:54:37 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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 $attr = array('name'=>'act_password','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr_name='act_password' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php
+ $row_class_idx++;
+ if ($row_class_idx > count($row_classes))
+ $row_class_idx=1;
+ $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:54:37 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_new_password','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_new_password' ?><?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 $attr = array('class'=>'text','text'=>'user_new_password') ?><?php $attr_class='text' ?><?php $attr_text='user_new_password' ?><?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 +242,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('_',' ',$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:54:37 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?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() ?><?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/password.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('name'=>'password1','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr_name='password1' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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:54:37 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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 $attr = array('name'=>'password1','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr_name='password1' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?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:54:37 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?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 /* source: ./themes/default/include/html/text.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_new_password_repeat','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_new_password_repeat' ?><?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 $attr = array('class'=>'text','text'=>'user_new_password_repeat') ?><?php $attr_class='text' ?><?php $attr_text='user_new_password_repeat' ?><?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,55 +328,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('_',' ',$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:54:37 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?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() ?><?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/password.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('name'=>'password2','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr_name='password2' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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:54:37 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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 $attr = array('name'=>'password2','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr_name='password2' ?><?php $attr_default='' ?><?php $attr_class='' ?><?php $attr_size='40' ?><?php $attr_maxlength='256' ?><input type="password" 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_name) ?><?php unset($attr_default) ?><?php unset($attr_class) ?><?php unset($attr_size) ?><?php unset($attr_maxlength) ?><?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:54:37 +0100 */ ?><?php $attr = array('width'=>'','style'=>'','class'=>'','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='' ?><?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('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_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:54:37 +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_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=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +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:54:37 +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:54:37 +0100 */ ?><?php $attr = array() ?> </table>
+?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php 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>
@@ -289,11 +416,16 @@
<?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:54:37 +0100 */ ?><?php $attr = array() ?></form><?php unset($attr) ?><?php /* source: ./themes/default/include/html/focus.inc.php - compile time: Sun, 29 Jan 2006 21:54:37 +0100 */ ?><?php $attr = array('field'=>'act_password') ?><?php $attr_field='act_password' ?><script name="JavaScript" type="text/javascript"><!--
+<?php unset($attr) ?><?php $attr = array() ?></form>
+
+<?php unset($attr) ?><?php $attr = array('field'=>'act_password') ?><?php $attr_field='act_password' ?>
+<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:54:37 +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/remove.tpl.php b/themes/default/pages/html/user/remove.tpl.php
@@ -1,4 +1,4 @@
-<?php /* source: ./themes/default/include/html/page.inc.php - compile time: Sun, 29 Jan 2006 21:58:48 +0100 */ ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html>
<!-- $Id$ -->
<head>
@@ -12,10 +12,10 @@
<?php } ?>
</head>
-<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>>
+<body class="<?php echo $attr_class ?>">
-<?php unset($attr) ?><?php unset($attr_class) ?><?php /* source: ./themes/default/include/html/form.inc.php - compile time: Sun, 29 Jan 2006 21:58:48 +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 +33,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:48 +0100 */ ?><?php $attr = array('title'=>'','name'=>'GLOBAL_USER','icon'=>'','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='GLOBAL_USER' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?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','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_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.'">';
@@ -54,13 +65,23 @@
}
echo '<span class="title">'.lang($windowTitle).'</span>';
?>
- </th>
+ </td><td class="menu" style="align:right;">
+ <?php if (isset($windowIcons)) foreach( $windowIcons as $icon )
+ {
+ ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php
+ }
+ ?>
+ </td>
</tr>
<tr><td class="subaction">
<?php foreach( $windowMenu as $menu )
{
?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a> <?php
}
+ if ($conf['help']['enabled'] )
+ {
+ ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('GLOBAL_HELP') ?>" class="menu">?</a><?php
+ }
?></td>
</tr>
@@ -86,28 +107,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:48 +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_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:48 +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:48 +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,30 +156,52 @@
$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('_',' ',$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:48 +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:48 +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/text.inc.php - compile time: Sun, 29 Jan 2006 21:58:48 +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
+?><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:
@@ -154,39 +213,66 @@
$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('_',' ',$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:48 +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:48 +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:48 +0100 */ ?><?php $attr = array() ?><?php
- global $fx;
- if ( $fx =='f1')
- $fx='f2';
- else $fx='f1';
-
+?></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><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 21:58:48 +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:48 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'user_delete','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='user_delete' ?><?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_delete') ?><?php $attr_class='text' ?><?php $attr_text='user_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:
@@ -198,55 +284,90 @@
$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('_',' ',$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:49 +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:49 +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:49 +0100 */ ?><?php $attr = array('default'=>'false','var'=>'','readonly'=>'false','name'=>'delete','prefix'=>'') ?><?php $attr_default='false' ?><?php $attr_var='' ?><?php $attr_readonly='false' ?><?php $attr_name='delete' ?><?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:49 +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:49 +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:49 +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'=>'false','readonly'=>'false','name'=>'confirm') ?><?php $attr_default='false' ?><?php $attr_readonly='false' ?><?php $attr_name='confirm' ?><?php
+ $attr_name = !empty($$attr_name)?$$attr_name:$attr_name;
+ $attr_readonly = ( $attr_readonly == 'true' );
+ $attr_default = ( $attr_default == 'true' );
+ if ( isset($$attr_name) )
+ $checked = isset($$$attr_name)&& $$$attr_name==true;
+ else
+ $checked = $attr_default;
+?><input type="checkbox" name="<?php echo $attr_name ?>" <?php if ($attr_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?php $attr = array() ?></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:49 +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:49 +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=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 21:58:49 +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:49 +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:49 +0100 */ ?><?php $attr = array() ?> </table>
+?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value=" <?php echo lang($attr_text) ?> " /><?php unset($attr) ?><?php unset($attr_type) ?><?php 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>
@@ -260,11 +381,16 @@
<?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:49 +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:49 +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:49 +0100 */ ?><?php $attr = array() ?>
+// -->
+</script>
+<?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?>
<!-- $Id$ -->
<?php if ($showDuration) { ?>
