openrat-cms

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

commit f23ced80b571847586319712a41b14c1e38a12c5
parent c67060823fcf603cca11df7471bcea871bd19579
Author: dankert <devnull@localhost>
Date:   Wed,  6 Jun 2007 21:51:17 +0200

Templates umgewandelt f?r n?chstes Release.

Diffstat:
themes/default/pages/html/element/name.tpl.php | 37++++++++++++++++++++++---------------
themes/default/pages/html/element/properties.tpl.php | 185+++++++++++++++++++++++++++++++++++++++++--------------------------------------
themes/default/pages/html/element/remove.tpl.php | 59+++++++++++++++++++++++++++++++++--------------------------
themes/default/pages/html/element/type.tpl.php | 33++++++++++++++++++++-------------
themes/default/pages/html/file/compress.tpl.php | 485+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
themes/default/pages/html/file/edit.tpl.php | 70+++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------
themes/default/pages/html/file/editvalue.tpl.php | 60+++++++++++++++++++++++++++++++++++++++++-------------------
themes/default/pages/html/file/prop.tpl.php | 33+++++++++++++++++----------------
themes/default/pages/html/file/remove.tpl.php | 466+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
themes/default/pages/html/file/showprop.tpl.php | 127+++++++++++++++++++++++++++++++++++++++++++------------------------------------
themes/default/pages/html/file/size.tpl.php | 248++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------
themes/default/pages/html/folder/create.tpl.php | 5+++--
themes/default/pages/html/folder/createfile.tpl.php | 23++++++++++++-----------
themes/default/pages/html/folder/createfolder.tpl.php | 37++++++++++++++++++++++---------------
themes/default/pages/html/folder/createlink.tpl.php | 37++++++++++++++++++++++---------------
themes/default/pages/html/folder/createpage.tpl.php | 45++++++++++++++++++++++++++-------------------
themes/default/pages/html/folder/edit.tpl.php | 69++++++++++++++++++++++++++++++++++++++-------------------------------
themes/default/pages/html/folder/order.tpl.php | 676+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
themes/default/pages/html/folder/prop.tpl.php | 37+++++++++++++++++++------------------
themes/default/pages/html/folder/pub.tpl.php | 652++++++++++++++++++++++++++++++++++++++++++-------------------------------------
themes/default/pages/html/folder/select.tpl.php | 151+++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
themes/default/pages/html/folder/show.tpl.php | 81++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
themes/default/pages/html/folder/showprop.tpl.php | 74+++++++++++++++++++++++++++++++++++++++++---------------------------------
themes/default/pages/html/group/edit.tpl.php | 25++++++++++++++++---------
themes/default/pages/html/group/remove.tpl.php | 51++++++++++++++++++++++++++++++---------------------
themes/default/pages/html/index/password.tpl.php | 83+++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
themes/default/pages/html/index/passwordcode.tpl.php | 292+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
themes/default/pages/html/index/projectmenu.tpl.php | 224++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
themes/default/pages/html/index/register.tpl.php | 56+++++++++++++++++++++++++++++++++++++++-----------------
themes/default/pages/html/index/registercode.tpl.php | 82+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
themes/default/pages/html/index/showlogin.tpl.php | 181+++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
themes/default/pages/html/language/advanced.tpl.php | 17+++++++++--------
themes/default/pages/html/language/edit.tpl.php | 11++++++-----
themes/default/pages/html/language/listing.tpl.php | 83+++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
themes/default/pages/html/language/remove.tpl.php | 29+++++++++++++++--------------
themes/default/pages/html/link/edit.tpl.php | 85++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
themes/default/pages/html/link/prop.tpl.php | 77+++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------
themes/default/pages/html/link/showprop.tpl.php | 59++++++++++++++++++++++++++++++-----------------------------
themes/default/pages/html/mainmenu/show.tpl.php | 60++++++++++++++++++++++++++++++++++++++++++------------------
themes/default/pages/html/model/edit.tpl.php | 13+++++++------
themes/default/pages/html/model/listing.tpl.php | 77+++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
themes/default/pages/html/model/remove.tpl.php | 31++++++++++++++++---------------
themes/default/pages/html/object/aclform.tpl.php | 638+++++++++++++++++++++++++++++++++++--------------------------------------------
themes/default/pages/html/object/rights.tpl.php | 85+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
themes/default/pages/html/page/changetemplate.tpl.php | 59+++++++++++++++++++++++++++++++++++++++--------------------
themes/default/pages/html/page/changetemplateselectelements.tpl.php | 316++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
themes/default/pages/html/page/el.tpl.php | 103+++++++++++++++++++++++++++++++++++++++++++++++++------------------------------
themes/default/pages/html/page/form.tpl.php | 9++++++++-
themes/default/pages/html/page/prop.tpl.php | 55+++++++++++++++++++++++++++++++------------------------
themes/default/pages/html/page/pub.tpl.php | 35+++++++++++++++++++++--------------
themes/default/pages/html/page/showprop.tpl.php | 118++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
themes/default/pages/html/page/src.tpl.php | 20++++++++++++++------
themes/default/pages/html/pageelement/advanced.tpl.php | 207+++++++++++++++++++++++++++++++++++++++++--------------------------------------
themes/default/pages/html/pageelement/archive.tpl.php | 140++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
themes/default/pages/html/pageelement/edit.tpl.php | 254+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------
themes/default/pages/html/pageelement/link.tpl.php | 259++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
themes/default/pages/html/pageelement/show.tpl.php | 11++++++-----
themes/default/pages/html/profile/edit.tpl.php | 43++++++++++++++++++++++---------------------
themes/default/pages/html/profile/mail.tpl.php | 76++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------
themes/default/pages/html/profile/pwchange.tpl.php | 107+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
themes/default/pages/html/project/add.tpl.php | 39+++++++++++++++++++++++++++------------
themes/default/pages/html/project/edit.tpl.php | 409+++++++++++++++++++++++++++++++++++++++++++------------------------------------
themes/default/pages/html/project/export.tpl.php | 43+++++++++++++++++++++++++------------------
themes/default/pages/html/project/listing.tpl.php | 45+++++++++++++++++++++++++++++++++++----------
themes/default/pages/html/project/maintenance.tpl.php | 35+++++++++++++++++++++--------------
themes/default/pages/html/project/remove.tpl.php | 59+++++++++++++++++++++++++++++++++--------------------------
themes/default/pages/html/search/content.tpl.php | 21+++++++++++----------
themes/default/pages/html/search/prop.tpl.php | 97+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------
themes/default/pages/html/search/result.tpl.php | 96++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
themes/default/pages/html/template/addel.tpl.php | 54++++++++++++++++++++++++++++++++++--------------------
themes/default/pages/html/template/edit.tpl.php | 11++++++-----
themes/default/pages/html/template/el.tpl.php | 46+++++++++++++++++++++++++++++++++-------------
themes/default/pages/html/template/extension.tpl.php | 31+++++++++++++++++++------------
themes/default/pages/html/template/listing.tpl.php | 31++++++++++++++++++++++---------
themes/default/pages/html/template/name.tpl.php | 31+++++++++++++++++++------------
themes/default/pages/html/template/remove.tpl.php | 510++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------
themes/default/pages/html/template/src.tpl.php | 16++++++++--------
themes/default/pages/html/template/srcelement.tpl.php | 24++++++++++++------------
themes/default/pages/html/title/show.tpl.php | 60++++++++++++++++++++++++++++++++++++++++++------------------
themes/default/pages/html/treetitle/show.tpl.php | 50+++++++++++++++++++++++++++++++++++++-------------
themes/default/pages/html/user/addgroup.tpl.php | 55+++++++++++++++++++++++++++++++++++++++----------------
themes/default/pages/html/user/edit.tpl.php | 321+++++++++++++++++++++++++++++++++++++++++++++++--------------------------------
themes/default/pages/html/user/groups.tpl.php | 50+++++++++++++++++++++++++++++++++++---------------
themes/default/pages/html/user/listing.tpl.php | 64++++++++++++++++++++++++++++++++++++++++++----------------------
themes/default/pages/html/user/pw.tpl.php | 157++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------
85 files changed, 6435 insertions(+), 3681 deletions(-)

diff --git a/themes/default/pages/html/element/name.tpl.php b/themes/default/pages/html/element/name.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -257,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DESCRIPTION') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DESCRIPTION' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DESCRIPTION','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DESCRIPTION' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -292,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -314,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -360,13 +368,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/element/properties.tpl.php b/themes/default/pages/html/element/properties.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -245,7 +253,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'ELEMENT_SUBTYPE') ?><?php $attr7_class='text' ?><?php $attr7_text='ELEMENT_SUBTYPE' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'ELEMENT_SUBTYPE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='ELEMENT_SUBTYPE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -280,7 +288,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -302,7 +310,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -413,7 +421,7 @@ if (count($$attr8_list)==1) echo ' disabled="disabled"' $attr8_tmp_list = $$attr8_list; if ( isset($$attr8_name) && isset($attr8_tmp_list[$$attr8_name]) ) $attr8_tmp_default = $$attr8_name; - elseif ( isset($$attr8_default) ) + elseif ( isset($attr8_default) ) $attr8_tmp_default = $attr8_default; else $attr8_tmp_default = ''; @@ -646,7 +654,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_WITH_ICON') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_WITH_ICON' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_WITH_ICON','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_WITH_ICON' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -681,7 +689,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -703,7 +711,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -845,7 +853,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_ALL_LANGUAGES') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_ALL_LANGUAGES' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_ALL_LANGUAGES','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_ALL_LANGUAGES' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -880,7 +888,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -902,7 +910,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1044,7 +1052,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_writable') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_writable' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_writable','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_writable' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1079,7 +1087,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1101,7 +1109,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1243,7 +1251,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'width') ?><?php $attr7_class='text' ?><?php $attr7_text='width' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'width','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='width' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1278,7 +1286,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1300,7 +1308,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1438,7 +1446,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'height') ?><?php $attr7_class='text' ?><?php $attr7_text='height' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'height','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='height' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1473,7 +1481,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1495,7 +1503,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1633,7 +1641,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DATEFORMAT') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DATEFORMAT' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DATEFORMAT','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DATEFORMAT' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1668,7 +1676,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1690,7 +1698,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1711,7 +1719,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -1847,7 +1855,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_FORMAT') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_FORMAT' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_FORMAT','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_FORMAT' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1882,7 +1890,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1904,7 +1912,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1919,14 +1927,14 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('list'=>'formatlist','name'=>'format','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='formatlist' ?><?php $attr7_name='format' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_tmp_disabled = count($$attr7_list)==1; - $attr7_tmp_list = $$attr7_list; +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('list'=>'formatlist','name'=>'format','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='formatlist' ?><?php $attr7_name='format' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; +// Html::debug($attr7_tmp_default); foreach( $attr7_tmp_list as $box_key=>$box_value ) { @@ -2058,7 +2066,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DECIMALS') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DECIMALS' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DECIMALS','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DECIMALS' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -2093,7 +2101,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -2115,7 +2123,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -2253,7 +2261,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DEC_POINT') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DEC_POINT' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DEC_POINT','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DEC_POINT' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -2288,7 +2296,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -2310,7 +2318,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -2448,7 +2456,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_thousand_sep') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_thousand_sep' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_thousand_sep','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_thousand_sep' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -2483,7 +2491,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -2505,7 +2513,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -2643,7 +2651,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_default_text') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_default_text' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_default_text','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_default_text' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -2678,7 +2686,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -2700,7 +2708,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -2838,7 +2846,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_default_longtext') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_default_longtext' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_default_longtext','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_default_longtext' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -2873,7 +2881,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -2895,7 +2903,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -3032,7 +3040,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DYNAMIC_PARAMETERS') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DYNAMIC_PARAMETERS' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DYNAMIC_PARAMETERS','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DYNAMIC_PARAMETERS' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -3067,7 +3075,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -3089,7 +3097,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -3167,7 +3175,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } extract($$attr7_list_tmp_value); } -?><?php unset($attr7) ?><?php unset($attr7_list) ?><?php unset($attr7_extract) ?><?php unset($attr7_key) ?><?php unset($attr7_value) ?><?php $attr8 = array('class'=>'text','var'=>'paramName') ?><?php $attr8_class='text' ?><?php $attr8_var='paramName' ?><?php +?><?php unset($attr7) ?><?php unset($attr7_list) ?><?php unset($attr7_extract) ?><?php unset($attr7_key) ?><?php unset($attr7_value) ?><?php $attr8 = array('class'=>'text','var'=>'paramName','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_var='paramName' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -3202,7 +3210,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -3224,7 +3232,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php $attr8 = array('class'=>'text','raw'=>'_(') ?><?php $attr8_class='text' ?><?php $attr8_raw='_(' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_(' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -3259,7 +3267,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -3281,7 +3289,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_DEFAULT') ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_DEFAULT' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_DEFAULT','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_DEFAULT' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -3316,7 +3324,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -3338,7 +3346,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr8 = array('class'=>'text','raw'=>')_=_') ?><?php $attr8_class='text' ?><?php $attr8_raw=')_=_' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','raw'=>')_=_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw=')_=_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -3373,7 +3381,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -3395,7 +3403,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','var'=>'defaultValue') ?><?php $attr8_class='text' ?><?php $attr8_var='defaultValue' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','var'=>'defaultValue','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_var='defaultValue' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -3430,7 +3438,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -3452,7 +3460,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('present'=>'select_items') ?><?php $attr4_present='select_items' ?><?php @@ -3574,7 +3582,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_select_items') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_select_items' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_select_items','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_select_items' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -3609,7 +3617,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -3631,7 +3639,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -3768,7 +3776,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_LINK') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_LINK' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_LINK','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_LINK' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -3803,7 +3811,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -3825,7 +3833,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -3846,7 +3854,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -3982,7 +3990,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'ELEMENT_NAME') ?><?php $attr7_class='text' ?><?php $attr7_text='ELEMENT_NAME' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'ELEMENT_NAME','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='ELEMENT_NAME' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4017,7 +4025,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4039,7 +4047,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -4060,7 +4068,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -4196,7 +4204,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DEFAULT_FOLDEROBJECT') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DEFAULT_FOLDEROBJECT' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DEFAULT_FOLDEROBJECT','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DEFAULT_FOLDEROBJECT' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4231,7 +4239,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4253,7 +4261,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -4274,7 +4282,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -4410,7 +4418,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DEFAULT_OBJECT') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DEFAULT_OBJECT' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_DEFAULT_OBJECT','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_DEFAULT_OBJECT' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4445,7 +4453,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4467,7 +4475,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -4488,7 +4496,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -4624,7 +4632,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_code') ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_code' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'EL_PROP_code','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='EL_PROP_code' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4659,7 +4667,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4681,7 +4689,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -4730,13 +4738,12 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/element/remove.tpl.php b/themes/default/pages/html/element/remove.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name') ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -262,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -284,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -313,7 +321,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -348,7 +356,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -370,7 +378,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -419,7 +427,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_DELETE_VALUES') ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_DELETE_VALUES' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_DELETE_VALUES','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_DELETE_VALUES' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -454,7 +462,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -476,7 +484,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -527,13 +535,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/element/type.tpl.php b/themes/default/pages/html/element/type.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_TYPE') ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_TYPE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'ELEMENT_TYPE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='ELEMENT_TYPE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -233,7 +241,7 @@ if (count($$attr6_list)==1) echo ' disabled="disabled"' $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -278,13 +286,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/file/compress.tpl.php b/themes/default/pages/html/file/compress.tpl.php @@ -1,63 +1,71 @@ -<?php $attr = array('class'=>'main','title'=>'var') ?><?php $attr_class='main' ?><?php $attr_title='var' ?><?php header('Content-Type: text/html; charset='.lang('CHARSET')) +<?php $attr1 = array('class'=>'main','title'=>$cms_title) ?><?php $attr1_class='main' ?><?php $attr1_title=$cms_title ?><?php header('Content-Type: text/html; charset='.lang('CHARSET')) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> -<!-- $Id$ --> <head> - <title><?php echo $attr_title ?></title> + <title><?php echo $attr1_title ?></title> <meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" /> <meta name="MSSmartTagsPreventParsing" content="true" /> <meta name="robots" content="noindex,nofollow" /> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu ) + { + ?> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" /> +<?php + } +?> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> -<body class="<?php echo $attr_class ?>"> +<body class="<?php echo $attr1_class ?>"> -<?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_title) ?><?php $attr = array('action'=>'file','subaction'=>'docompress','name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='file' ?><?php $attr_subaction='docompress' ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php - if (empty($attr_action)) - $attr_action = $actionName; - if (empty($attr_subaction)) - $attr_subaction = $targetSubActionName; - if (empty($attr_id)) - $attr_id = $this->getRequestId(); +<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('action'=>'file','subaction'=>'docompress','name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_action='file' ?><?php $attr2_subaction='docompress' ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php + if (empty($attr2_action)) + $attr2_action = $actionName; + if (empty($attr2_subaction)) + $attr2_subaction = $targetSubActionName; + if (empty($attr2_id)) + $attr2_id = $this->getRequestId(); -?><form name="<?php echo $attr_name ?>" - target="<?php echo $attr_target ?>" - action="<?php echo Html::url( $attr_action,$attr_subaction,$attr_id ) ?>" - method="<?php echo $attr_method ?>" - enctype="<?php echo $attr_enctype ?>"> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php +?><form name="<?php echo $attr2_name ?>" + target="<?php echo $attr2_target ?>" + action="<?php echo Html::url( $attr2_action,$attr2_subaction,$attr2_id ) ?>" + method="<?php echo $attr2_method ?>" + enctype="<?php echo $attr2_enctype ?>"> +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_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_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('title'=>'asdfdfs','name'=>'asdf','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_title='asdfdfs' ?><?php $attr_name='asdf' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php +?><?php unset($attr2) ?><?php unset($attr2_action) ?><?php unset($attr2_subaction) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('title'=>'asdfdfs','name'=>'asdf','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_title='asdfdfs' ?><?php $attr3_name='asdf' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); - if (!empty($attr_widths)) + if (!empty($attr3_widths)) { - $column_widths = explode(',',$attr_widths); - unset($attr['widths']); + $column_widths = explode(',',$attr3_widths); + unset($attr3['widths']); } - if (!empty($attr_rowclasses)) + if (!empty($attr3_rowclasses)) { - $row_classes = explode(',',$attr_rowclasses); + $row_classes = explode(',',$attr3_rowclasses); $row_class_idx = 999; - unset($attr['rowclasses']); + unset($attr3['rowclasses']); } - if (!empty($attr_columnclasses)) + if (!empty($attr3_columnclasses)) { - $column_classes = explode(',',$attr_columnclasses); - unset($attr['columnclasses']); + $column_classes = explode(',',$attr3_columnclasses); + unset($attr3['columnclasses']); } global $image_dir; echo '<br/><br/><br/><center>'; - echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; + echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">'; echo '<tr><td class="menu">'; - if ( !empty($attr_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">'; - if ( !is_array($path) ) + if ( !empty($attr3_icon) ) + echo '<img src="'.$image_dir.'icon_'.$attr3_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) { @@ -67,18 +75,34 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> - <?php foreach( $windowMenu as $menu ) + + <?php if ( !isset($windowMenu) || !is_array($windowMenu) ) + $windowMenu = array(); + foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -95,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -109,272 +134,336 @@ <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_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array() ?><?php + <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr3) ?><?php unset($attr3_title) ?><?php unset($attr3_name) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4 = 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; + if (empty($attr4_class)) + $attr4_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'type','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='type' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('class'=>'text','text'=>'type') ?><?php $attr_class='text' ?><?php $attr_text='type' ?><?php - if(empty($attr_title)) - if (!empty($attr_key)) - $attr_title = lang($attr_key).'_HELP'; + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); else - $attr_title = ''; + $attr6_title = ''; -?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php - $attr_title = ''; - if (!empty($attr_array)) +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); } - elseif (!empty($attr_text)) - if ( isset($$attr_text)) - $tmp_text = lang($$attr_text); + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); else - $tmp_text = lang($attr_text); - elseif (!empty($attr_textvar)) - $tmp_text = lang($$attr_textvar); - elseif (!empty($attr_key)) - $tmp_text = lang($attr_key); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - elseif (!empty($attr_value)) - $tmp_text = $attr_value; + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; else - { Html::debug($attr);echo 'text error'; + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('var'=>'gz','value'=>'gz') ?><?php $attr_var='gz' ?><?php $attr_value='gz' ?><?php $$attr_var = $attr_value ?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php $attr = array('list'=>'formats','name'=>'format','default'=>'gz','onchange'=>'','title'=>'','class'=>'') ?><?php $attr_list='formats' ?><?php $attr_name='format' ?><?php $attr_default='gz' ?><?php $attr_onchange='' ?><?php $attr_title='' ?><?php $attr_class='' ?><select size="1" id="id<?php echo $attr_name ?>" 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"' +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('var'=>'gz','value'=>'gz') ?><?php $attr6_var='gz' ?><?php $attr6_value='gz' ?><?php + if (!isset($attr6_value)) + unset($$attr6_var); + elseif (isset($attr6_key)) + $$attr6_var = $attr6_value[$attr6_key]; + else + $$attr6_var = $attr6_value; +?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('list'=>'formats','name'=>'format','default'=>'gz','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='formats' ?><?php $attr6_name='format' ?><?php $attr6_default='gz' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr_list as $box_key=>$box_value ) + $attr6_tmp_list = $$attr6_list; + if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) + $attr6_tmp_default = $$attr6_name; + elseif ( isset($attr6_default) ) + $attr6_tmp_default = $attr6_default; + else + $attr6_tmp_default = ''; + + foreach( $attr6_tmp_list as $box_key=>$box_value ) { - echo '<option class="'.$attr_class.'" value="'.$box_key.'"'; - if (isset($$attr_name)&&$box_key==$$attr_name || isset($attr_default)&&$box_key == $attr_default) + echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; + if ($box_key==$attr6_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php -if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" value="'.$box_key.'" />' -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_name) ?><?php unset($attr_default) ?><?php unset($attr_onchange) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = 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; + if (empty($attr4_class)) + $attr4_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('var'=>'field','value'=>'replace') ?><?php $attr_var='field' ?><?php $attr_value='replace' ?><?php $$attr_var = $attr_value ?><?php unset($attr) ?><?php unset($attr_var) ?><?php unset($attr_value) ?><?php $attr = array('name'=>'field','value'=>'1') ?><?php $attr_name='field' ?><?php $attr_value='1' ?><?php -?><input type="radio" name="<?php echo $attr_prefix.$attr_name ?>"<?php if ( $attr_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr_value ?>" <?php if( $attr_value == $$attr_name ) echo 'checked="checked"' ?> /><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_value) ?><?php $attr = array('class'=>'text','text'=>'replace') ?><?php $attr_class='text' ?><?php $attr_text='replace' ?><?php - if(empty($attr_title)) - if (!empty($attr_key)) - $attr_title = lang($attr_key).'_HELP'; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('var'=>'field','value'=>'replace') ?><?php $attr6_var='field' ?><?php $attr6_value='replace' ?><?php + if (!isset($attr6_value)) + unset($$attr6_var); + elseif (isset($attr6_key)) + $$attr6_var = $attr6_value[$attr6_key]; + else + $$attr6_var = $attr6_value; +?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('readonly'=>false,'name'=>'field','value'=>true,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='field' ?><?php $attr6_value=true ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('class'=>'text','text'=>'replace','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='replace' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; + + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); else - $attr_title = ''; + $attr6_title = ''; + +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; -?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php - $attr_title = ''; - if (!empty($attr_array)) + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); } - elseif (!empty($attr_text)) - if ( isset($$attr_text)) - $tmp_text = lang($$attr_text); + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); else - $tmp_text = lang($attr_text); - elseif (!empty($attr_textvar)) - $tmp_text = lang($$attr_textvar); - elseif (!empty($attr_key)) - $tmp_text = lang($attr_key); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - elseif (!empty($attr_value)) - $tmp_text = $attr_value; + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; else - { Html::debug($attr);echo 'text error'; + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?><br/><?php unset($attr) ?><?php $attr = array('name'=>'field','value'=>'') ?><?php $attr_name='field' ?><?php $attr_value='' ?><?php -?><input type="radio" name="<?php echo $attr_prefix.$attr_name ?>"<?php if ( $attr_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr_value ?>" <?php if( $attr_value == $$attr_name ) echo 'checked="checked"' ?> /><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_value) ?><?php $attr = array('class'=>'text','text'=>'createnew') ?><?php $attr_class='text' ?><?php $attr_text='createnew' ?><?php - if(empty($attr_title)) - if (!empty($attr_key)) - $attr_title = lang($attr_key).'_HELP'; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'field','value'=>false,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='field' ?><?php $attr6_value=false ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('class'=>'text','text'=>'createnew','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='createnew' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; + + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); else - $attr_title = ''; + $attr6_title = ''; -?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php - $attr_title = ''; - if (!empty($attr_array)) +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); } - elseif (!empty($attr_text)) - if ( isset($$attr_text)) - $tmp_text = lang($$attr_text); + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); else - $tmp_text = lang($attr_text); - elseif (!empty($attr_textvar)) - $tmp_text = lang($$attr_textvar); - elseif (!empty($attr_key)) - $tmp_text = lang($attr_key); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - elseif (!empty($attr_value)) - $tmp_text = $attr_value; + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; else - { Html::debug($attr);echo 'text error'; + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = 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; + if (empty($attr4_class)) + $attr4_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('colspan'=>'2') ?><?php $attr_colspan='2' ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_colspan) ?><?php $attr = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr_type='ok' ?><?php $attr_class='ok' ?><?php $attr_value='ok' ?><?php $attr_text='button_ok' ?><?php - if ($attr_type=='ok') - { - $attr_type = 'submit'; -// $attr_class = 'ok'; -// $attr_text = 'BUTTON_OK'; -// $attr_value = 'ok'; - } -?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table> +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php + if ($attr6_type=='ok') + $attr6_type = 'submit'; + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> @@ -388,9 +477,9 @@ 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($attr2) ?><?php $attr1 = array() ?></form> -<?php unset($attr) ?><?php $attr = array() ?> +<?php unset($attr1) ?><?php $attr0 = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> @@ -401,4 +490,4 @@ if (count($$attr_list)==1) echo '<input type="hidden" name="'.$attr_name.'" valu <?php } ?> </body> -</html><?php unset($attr) ?>- \ No newline at end of file +</html><?php unset($attr0) ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/file/edit.tpl.php b/themes/default/pages/html/file/edit.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -147,15 +163,43 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'file','class'=>'upload') ?><?php $attr6_name='file' ?><?php $attr6_class='upload' ?><input type="file" name="<?php echo $attr6_name ?>" class="<?php echo $attr6_class ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_class) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'file','class'=>'upload') ?><?php $attr6_name='file' ?><?php $attr6_class='upload' ?><input type="file" name="<?php echo $attr6_name ?>" class="<?php echo $attr6_class ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'act') ?><?php $attr5_class='act' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/file/editvalue.tpl.php b/themes/default/pages/html/file/editvalue.tpl.php @@ -13,15 +13,17 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> <body class="<?php echo $attr1_class ?>"> -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php +<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php if (empty($attr2_action)) $attr2_action = $actionName; if (empty($attr2_subaction)) @@ -39,7 +41,7 @@ <input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($attr2) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -147,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_VALUE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_VALUE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_VALUE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_VALUE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -182,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -195,9 +211,16 @@ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -212,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('name'=>'value','rows'=>'35','cols'=>'60') ?><?php $attr6_name='value' ?><?php $attr6_rows='35' ?><?php $attr6_cols='60' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('name'=>'value','rows'=>'35','cols'=>'60','class'=>'','default'=>'') ?><?php $attr6_name='value' ?><?php $attr6_rows='35' ?><?php $attr6_cols='60' ?><?php $attr6_class='' ?><?php $attr6_default='' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -243,13 +266,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/file/prop.tpl.php b/themes/default/pages/html/file/prop.tpl.php @@ -41,7 +41,7 @@ <input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('icon'=>'folder','widths'=>'50%,50%','width'=>'93%','rowclasses'=>'f1,f2','columnclasses'=>'f1,f2') ?><?php $attr3_icon='folder' ?><?php $attr3_widths='50%,50%' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='f1,f2' ?><?php $attr3_columnclasses='f1,f2' ?><?php +?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('icon'=>'folder','widths'=>'50%,50%','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_icon='folder' ?><?php $attr3_widths='50%,50%' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_name') ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -264,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_filename') ?><?php $attr6_class='text' ?><?php $attr6_text='global_filename' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_filename','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_filename' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -299,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -321,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -366,7 +367,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'file_extension') ?><?php $attr6_class='text' ?><?php $attr6_text='file_extension' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'file_extension','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='file_extension' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -401,7 +402,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -423,7 +424,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -468,7 +469,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_description') ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_description','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -503,7 +504,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -525,7 +526,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -576,7 +577,7 @@ $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/file/remove.tpl.php b/themes/default/pages/html/file/remove.tpl.php @@ -1,63 +1,71 @@ -<?php $attr = array('class'=>'main','title'=>'var') ?><?php $attr_class='main' ?><?php $attr_title='var' ?><?php header('Content-Type: text/html; charset='.lang('CHARSET')) +<?php $attr1 = array('class'=>'main','title'=>$cms_title) ?><?php $attr1_class='main' ?><?php $attr1_title=$cms_title ?><?php header('Content-Type: text/html; charset='.lang('CHARSET')) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> -<!-- $Id$ --> <head> - <title><?php echo $attr_title ?></title> + <title><?php echo $attr1_title ?></title> <meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" /> <meta name="MSSmartTagsPreventParsing" content="true" /> <meta name="robots" content="noindex,nofollow" /> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu ) + { + ?> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" /> +<?php + } +?> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> -<body class="<?php echo $attr_class ?>"> +<body class="<?php echo $attr1_class ?>"> -<?php unset($attr) ?><?php unset($attr_class) ?><?php unset($attr_title) ?><?php $attr = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php - if (empty($attr_action)) - $attr_action = $actionName; - if (empty($attr_subaction)) - $attr_subaction = $targetSubActionName; - if (empty($attr_id)) - $attr_id = $this->getRequestId(); +<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php + if (empty($attr2_action)) + $attr2_action = $actionName; + if (empty($attr2_subaction)) + $attr2_subaction = $targetSubActionName; + if (empty($attr2_id)) + $attr2_id = $this->getRequestId(); -?><form name="<?php echo $attr_name ?>" - target="<?php echo $attr_target ?>" - action="<?php echo Html::url( $attr_action,$attr_subaction,$attr_id ) ?>" - method="<?php echo $attr_method ?>" - enctype="<?php echo $attr_enctype ?>"> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php +?><form name="<?php echo $attr2_name ?>" + target="<?php echo $attr2_target ?>" + action="<?php echo Html::url( $attr2_action,$attr2_subaction,$attr2_id ) ?>" + method="<?php echo $attr2_method ?>" + enctype="<?php echo $attr2_enctype ?>"> +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('name'=>'GLOBAL_GROUPS','icon'=>'group','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr_name='GLOBAL_GROUPS' ?><?php $attr_icon='group' ?><?php $attr_width='93%' ?><?php $attr_rowclasses='odd,even' ?><?php $attr_columnclasses='1,2,3' ?><?php +?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('name'=>'GLOBAL_GROUPS','icon'=>'group','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='GLOBAL_GROUPS' ?><?php $attr3_icon='group' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); - if (!empty($attr_widths)) + if (!empty($attr3_widths)) { - $column_widths = explode(',',$attr_widths); - unset($attr['widths']); + $column_widths = explode(',',$attr3_widths); + unset($attr3['widths']); } - if (!empty($attr_rowclasses)) + if (!empty($attr3_rowclasses)) { - $row_classes = explode(',',$attr_rowclasses); + $row_classes = explode(',',$attr3_rowclasses); $row_class_idx = 999; - unset($attr['rowclasses']); + unset($attr3['rowclasses']); } - if (!empty($attr_columnclasses)) + if (!empty($attr3_columnclasses)) { - $column_classes = explode(',',$attr_columnclasses); - unset($attr['columnclasses']); + $column_classes = explode(',',$attr3_columnclasses); + unset($attr3['columnclasses']); } global $image_dir; echo '<br/><br/><br/><center>'; - echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; + echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">'; echo '<tr><td class="menu">'; - if ( !empty($attr_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">'; - if ( !is_array($path) ) + if ( !empty($attr3_icon) ) + echo '<img src="'.$image_dir.'icon_'.$attr3_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) { @@ -67,18 +75,34 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> - <?php foreach( $windowMenu as $menu ) + + <?php if ( !isset($windowMenu) || !is_array($windowMenu) ) + $windowMenu = array(); + foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -95,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -109,266 +134,307 @@ <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_width) ?><?php unset($attr_rowclasses) ?><?php unset($attr_columnclasses) ?><?php $attr = array() ?><?php + <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr3) ?><?php unset($attr3_name) ?><?php unset($attr3_icon) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4 = 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; + if (empty($attr4_class)) + $attr4_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_NAME' ?><?php - if(empty($attr_title)) - if (!empty($attr_key)) - $attr_title = lang($attr_key).'_HELP'; + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); else - $attr_title = ''; + $attr6_title = ''; -?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php - $attr_title = ''; - if (!empty($attr_array)) +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); } - elseif (!empty($attr_text)) - if ( isset($$attr_text)) - $tmp_text = lang($$attr_text); + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); else - $tmp_text = lang($attr_text); - elseif (!empty($attr_textvar)) - $tmp_text = lang($$attr_textvar); - elseif (!empty($attr_key)) - $tmp_text = lang($attr_key); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - elseif (!empty($attr_value)) - $tmp_text = $attr_value; + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; else - { Html::debug($attr);echo 'text error'; + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('class'=>'text','var'=>'name') ?><?php $attr_class='text' ?><?php $attr_var='name' ?><?php - if(empty($attr_title)) - if (!empty($attr_key)) - $attr_title = lang($attr_key).'_HELP'; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; + + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); else - $attr_title = ''; + $attr6_title = ''; + +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; -?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php - $attr_title = ''; - if (!empty($attr_array)) + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); } - elseif (!empty($attr_text)) - if ( isset($$attr_text)) - $tmp_text = lang($$attr_text); + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); else - $tmp_text = lang($attr_text); - elseif (!empty($attr_textvar)) - $tmp_text = lang($$attr_textvar); - elseif (!empty($attr_key)) - $tmp_text = lang($attr_key); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - elseif (!empty($attr_value)) - $tmp_text = $attr_value; + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; else - { Html::debug($attr);echo 'text error'; + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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 +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = 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; + if (empty($attr4_class)) + $attr4_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr_class='text' ?><?php $attr_text='GLOBAL_DELETE' ?><?php - if(empty($attr_title)) - if (!empty($attr_key)) - $attr_title = lang($attr_key).'_HELP'; + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); else - $attr_title = ''; + $attr6_title = ''; -?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php - $attr_title = ''; - if (!empty($attr_array)) +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); } - elseif (!empty($attr_text)) - if ( isset($$attr_text)) - $tmp_text = lang($$attr_text); + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); else - $tmp_text = lang($attr_text); - elseif (!empty($attr_textvar)) - $tmp_text = lang($$attr_textvar); - elseif (!empty($attr_key)) - $tmp_text = lang($attr_key); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - elseif (!empty($attr_value)) - $tmp_text = $attr_value; + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; else - { Html::debug($attr);echo 'text error'; + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('default'=>'','readonly'=>'','name'=>'delete') ?><?php $attr_default='' ?><?php $attr_readonly='' ?><?php $attr_name='delete' ?><?php - $attr_default = ( $attr_default == true ); - - if ( isset($$attr_name) ) - $checked = $$attr_name == true; -// $checked = isset($$$attr_name)&& $$$attr_name==true; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'delete') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='delete' ?><?php + if ( isset($$attr6_name) ) + $checked = $$attr6_name; else - $checked = $attr_default == true; -?><input type="checkbox" name="<?php echo $attr_name ?>" <?php if ($attr_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr_name); unset($attr_readonly); unset($attr_default); ?><?php unset($attr) ?><?php unset($attr_default) ?><?php unset($attr_readonly) ?><?php unset($attr_name) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php + $checked = $attr6_default; +?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = 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; + if (empty($attr4_class)) + $attr4_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array('colspan'=>'2') ?><?php $attr_colspan='2' ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php unset($attr_colspan) ?><?php $attr = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr_type='ok' ?><?php $attr_class='ok' ?><?php $attr_value='ok' ?><?php $attr_text='button_ok' ?><?php - if ($attr_type=='ok') - { - $attr_type = 'submit'; -// $attr_class = 'ok'; -// $attr_text = 'BUTTON_OK'; -// $attr_value = 'ok'; - } -?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table> +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php + if ($attr6_type=='ok') + $attr6_type = 'submit'; + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> @@ -382,16 +448,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 $attr = array() ?></form> +<?php unset($attr2) ?><?php $attr1 = array() ?></form> -<?php unset($attr) ?><?php $attr = array('field'=>'delete') ?><?php $attr_field='delete' ?> +<?php unset($attr1) ?><?php $attr2 = array('field'=>'delete') ?><?php $attr2_field='delete' ?> <script name="JavaScript" type="text/javascript"> <!-- -document.forms[0].<?php echo $attr_field ?>.focus(); -document.forms[0].<?php echo $attr_field ?>.select(); +document.forms[0].<?php echo $attr2_field ?>.focus(); +document.forms[0].<?php echo $attr2_field ?>.select(); // --> </script> -<?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?> +<?php unset($attr2) ?><?php unset($attr2_field) ?><?php $attr0 = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> @@ -402,4 +468,4 @@ document.forms[0].<?php echo $attr_field ?>.select(); <?php } ?> </body> -</html><?php unset($attr) ?>- \ No newline at end of file +</html><?php unset($attr0) ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/file/showprop.tpl.php b/themes/default/pages/html/file/showprop.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -144,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_name') ?><?php $attr5_class='text' ?><?php $attr5_text='global_name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -179,7 +180,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -201,7 +202,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -216,7 +217,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name') ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -251,7 +252,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -273,7 +274,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -302,7 +303,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_filename') ?><?php $attr5_class='text' ?><?php $attr5_text='global_filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -337,7 +338,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -359,7 +360,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -374,7 +375,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'filename') ?><?php $attr5_class='text' ?><?php $attr5_var='filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -409,7 +410,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -431,7 +432,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -460,7 +461,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'file_extension') ?><?php $attr5_class='text' ?><?php $attr5_text='file_extension' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'file_extension','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='file_extension' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -495,7 +496,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -517,7 +518,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -532,7 +533,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'extension') ?><?php $attr5_class='text' ?><?php $attr5_var='extension' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'extension','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='extension' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -567,7 +568,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -589,7 +590,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -618,7 +619,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_description') ?><?php $attr5_class='text' ?><?php $attr5_text='global_description' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_description','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_description' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -653,7 +654,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -675,7 +676,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -690,7 +691,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'description') ?><?php $attr5_class='text' ?><?php $attr5_var='description' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'description','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='description' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -725,7 +726,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -747,7 +748,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -776,7 +777,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created') ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -811,7 +812,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -833,7 +834,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -904,7 +905,7 @@ echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -939,7 +940,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -961,7 +962,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else @@ -1005,7 +1006,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange') ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1040,7 +1041,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1062,7 +1063,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -1133,7 +1134,7 @@ echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1168,7 +1169,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1190,7 +1191,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else @@ -1234,7 +1235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'FILE_SIZE') ?><?php $attr5_class='text' ?><?php $attr5_text='FILE_SIZE' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'FILE_SIZE','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='FILE_SIZE' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1269,7 +1270,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1291,7 +1292,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -1336,7 +1337,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'FILE_mimetype') ?><?php $attr5_class='text' ?><?php $attr5_text='FILE_mimetype' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'FILE_mimetype','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='FILE_mimetype' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1371,7 +1372,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1393,7 +1394,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -1408,7 +1409,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'mimetype') ?><?php $attr5_class='text' ?><?php $attr5_var='mimetype' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'mimetype','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='mimetype' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1443,7 +1444,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1465,7 +1466,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1494,7 +1495,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'FILE_PAGES') ?><?php $attr5_class='text' ?><?php $attr5_text='FILE_PAGES' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'FILE_PAGES','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='FILE_PAGES' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1529,7 +1530,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1551,7 +1552,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -1586,6 +1587,18 @@ extract($$attr5_list_tmp_value); } ?><?php unset($attr5) ?><?php unset($attr5_list) ?><?php unset($attr5_extract) ?><?php unset($attr5_key) ?><?php unset($attr5_value) ?><?php $attr6 = array('title'=>'','target'=>'cms_main','url'=>'url','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='cms_main' ?><?php $attr6_url='url' ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -1593,7 +1606,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','type'=>'page') ?><?php $attr7_align='left' ?><?php $attr7_type='page' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -1606,7 +1619,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1641,7 +1654,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1663,7 +1676,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('empty'=>'pages') ?><?php $attr5_empty='pages' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('empty'=>'pages') ?><?php $attr5_empty='pages' ?><?php // Wahr-Vergleich // Html::debug($attr5); @@ -1753,7 +1766,7 @@ if (isset($attr7_elementtype)) { if ( $exec ) { -?><?php unset($attr5) ?><?php unset($attr5_empty) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_empty) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1788,7 +1801,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1810,7 +1823,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?> </table> diff --git a/themes/default/pages/html/file/size.tpl.php b/themes/default/pages/html/file/size.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -132,7 +148,36 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('IMAGE_NEW_SIZE')) ?><?php $attr6_title=lang('IMAGE_NEW_SIZE') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -147,7 +192,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'factor') ?><?php $attr6_for='factor' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_' ?><?php echo $attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_SIZE_FACTOR') ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_SIZE_FACTOR' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('for'=>'factor') ?><?php $attr6_for='factor' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_SIZE_FACTOR','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_SIZE_FACTOR' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -182,7 +227,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -195,9 +240,16 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -212,19 +264,34 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('var'=>'factor','value'=>'1') ?><?php $attr6_var='factor' ?><?php $attr6_value='1' ?><?php $$attr6_var = $attr6_value ?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('list'=>'factors','name'=>'factor','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='factors' ?><?php $attr6_name='factor' ?><?php $attr6_default='' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('var'=>'factor','value'=>'1') ?><?php $attr6_var='factor' ?><?php $attr6_value='1' ?><?php + if (!isset($attr6_value)) + unset($$attr6_var); + elseif (isset($attr6_key)) + $$attr6_var = $attr6_value[$attr6_key]; + else + $$attr6_var = $attr6_value; +?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('list'=>'factors','name'=>'factor','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='factors' ?><?php $attr6_name='factor' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr6_list as $box_key=>$box_value ) + $attr6_tmp_list = $$attr6_list; + if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) + $attr6_tmp_default = $$attr6_name; + elseif ( isset($attr6_default) ) + $attr6_tmp_default = $attr6_default; + else + $attr6_tmp_default = ''; + + foreach( $attr6_tmp_list as $box_key=>$box_value ) { echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; - if (isset($$attr6_name)&&$box_key==$$attr6_name || isset($attr6_default)&&$box_key == $attr6_default) + if ($box_key==$attr6_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' -?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -238,7 +305,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -253,7 +320,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'width') ?><?php $attr6_for='width' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_' ?><?php echo $attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_NEW_WIDTH') ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_NEW_WIDTH' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('for'=>'width') ?><?php $attr6_for='width' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_NEW_WIDTH','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_NEW_WIDTH' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -288,7 +355,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -301,9 +368,16 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -318,7 +392,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'width','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='width' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'width','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='width' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -333,7 +407,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -348,7 +422,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'height') ?><?php $attr6_for='height' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_' ?><?php echo $attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_NEW_HEIGHT') ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_NEW_HEIGHT' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('for'=>'height') ?><?php $attr6_for='height' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_NEW_HEIGHT','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_NEW_HEIGHT' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -383,7 +457,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -396,9 +470,16 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -413,7 +494,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'height','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='height' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'height','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='height' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -428,7 +509,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -443,7 +524,36 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'format') ?><?php $attr6_for='format' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_' ?><?php echo $attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_FORMAT') ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_FORMAT' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('for'=>'format') ?><?php $attr6_for='format' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_FORMAT','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_FORMAT' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -478,7 +588,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -491,9 +601,16 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -508,19 +625,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('list'=>'formats','name'=>'format','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='formats' ?><?php $attr6_name='format' ?><?php $attr6_default='' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('list'=>'formats','name'=>'format','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='formats' ?><?php $attr6_name='format' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr6_list as $box_key=>$box_value ) + $attr6_tmp_list = $$attr6_list; + if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) + $attr6_tmp_default = $$attr6_name; + elseif ( isset($attr6_default) ) + $attr6_tmp_default = $attr6_default; + else + $attr6_tmp_default = ''; + + foreach( $attr6_tmp_list as $box_key=>$box_value ) { echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; - if (isset($$attr6_name)&&$box_key==$$attr6_name || isset($attr6_default)&&$box_key == $attr6_default) + if ($box_key==$attr6_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' -?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -534,7 +659,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -549,7 +674,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'jpeglist_compression') ?><?php $attr6_for='jpeglist_compression' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_' ?><?php echo $attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_JPEG_COMPRESSION') ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_JPEG_COMPRESSION' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('for'=>'jpeglist_compression') ?><?php $attr6_for='jpeglist_compression' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'FILE_IMAGE_JPEG_COMPRESSION','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='FILE_IMAGE_JPEG_COMPRESSION' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -584,7 +709,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -597,9 +722,16 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -614,19 +746,34 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('var'=>'jpeg_compression','value'=>'70') ?><?php $attr6_var='jpeg_compression' ?><?php $attr6_value='70' ?><?php $$attr6_var = $attr6_value ?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('list'=>'jpeglist','name'=>'jpeg_compression','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='jpeglist' ?><?php $attr6_name='jpeg_compression' ?><?php $attr6_default='' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('var'=>'jpeg_compression','value'=>'70') ?><?php $attr6_var='jpeg_compression' ?><?php $attr6_value='70' ?><?php + if (!isset($attr6_value)) + unset($$attr6_var); + elseif (isset($attr6_key)) + $$attr6_var = $attr6_value[$attr6_key]; + else + $$attr6_var = $attr6_value; +?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('list'=>'jpeglist','name'=>'jpeg_compression','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='jpeglist' ?><?php $attr6_name='jpeg_compression' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr6_list as $box_key=>$box_value ) + $attr6_tmp_list = $$attr6_list; + if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) + $attr6_tmp_default = $$attr6_name; + elseif ( isset($attr6_default) ) + $attr6_tmp_default = $attr6_default; + else + $attr6_tmp_default = ''; + + foreach( $attr6_tmp_list as $box_key=>$box_value ) { echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; - if (isset($$attr6_name)&&$box_key==$$attr6_name || isset($attr6_default)&&$box_key == $attr6_default) + if ($box_key==$attr6_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' -?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -657,13 +804,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/create.tpl.php b/themes/default/pages/html/folder/create.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> diff --git a/themes/default/pages/html/folder/createfile.tpl.php b/themes/default/pages/html/folder/createfile.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_FILE') ?><?php $attr6_class='text' ?><?php $attr6_text='global_FILE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_FILE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_FILE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -263,7 +264,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='global_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -298,7 +299,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -320,7 +321,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -365,7 +366,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION') ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -400,7 +401,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -422,7 +423,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; diff --git a/themes/default/pages/html/folder/createfolder.tpl.php b/themes/default/pages/html/folder/createfolder.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_FOLDER') ?><?php $attr6_class='text' ?><?php $attr6_text='global_FOLDER' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_FOLDER','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_FOLDER' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -257,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION') ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -292,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -314,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -360,13 +368,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/createlink.tpl.php b/themes/default/pages/html/folder/createlink.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='global_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -257,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION') ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -292,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -314,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -360,13 +368,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/createpage.tpl.php b/themes/default/pages/html/folder/createpage.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_TEMPLATE') ?><?php $attr6_class='text' ?><?php $attr6_text='global_TEMPLATE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_TEMPLATE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_TEMPLATE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -233,7 +241,7 @@ if (count($$attr6_list)==1) echo ' disabled="disabled"' $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -276,7 +284,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='global_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -311,7 +319,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -333,7 +341,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -378,7 +386,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION') ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_DESCRIPTION','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_DESCRIPTION' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -413,7 +421,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -435,7 +443,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -481,13 +489,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/edit.tpl.php b/themes/default/pages/html/folder/edit.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -262,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -284,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('list'=>'objectlist','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='objectlist' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('list'=>'objectlist','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='objectlist' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; $attr4_list_extract = $attr4_extract; @@ -359,7 +367,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -394,7 +402,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -416,7 +424,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -451,7 +459,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -473,7 +481,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('present'=>'folder') ?><?php $attr4_present='folder' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('present'=>'folder') ?><?php $attr4_present='folder' ?><?php // Wahr-Vergleich // Html::debug($attr4); @@ -592,7 +600,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','text'=>lang('folder_select_target_folder')) ?><?php $attr7_class='text' ?><?php $attr7_text=lang('folder_select_target_folder') ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','text'=>lang('folder_select_target_folder'),'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=lang('folder_select_target_folder') ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -627,7 +635,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -649,7 +657,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -684,7 +692,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -706,13 +714,13 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('list'=>'folder','name'=>'targetobjectid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='folder' ?><?php $attr7_name='targetobjectid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><select size="1" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7 = array('list'=>'folder','name'=>'targetobjectid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='folder' ?><?php $attr7_name='targetobjectid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><select size="1" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php if (count($$attr7_list)==1) echo ' disabled="disabled"' ?>><?php $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -976,7 +984,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'commit') ?><?php $attr7_for='commit' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'commit') ?><?php $attr7_for='commit' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1011,7 +1019,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1033,7 +1041,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>lang('FOLDER_SELECT_DELETE_COMMIT')) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('FOLDER_SELECT_DELETE_COMMIT') ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>lang('FOLDER_SELECT_DELETE_COMMIT'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('FOLDER_SELECT_DELETE_COMMIT') ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1068,7 +1076,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1090,7 +1098,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php @@ -1124,13 +1132,12 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/order.tpl.php b/themes/default/pages/html/folder/order.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -77,7 +77,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -94,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -137,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_FOLDER_DESC') ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_FOLDER_DESC' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_FOLDER_DESC','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_FOLDER_DESC' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -172,7 +180,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -194,7 +202,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -208,7 +216,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr3_class ?>"><?php unset($attr3) ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php +?><tr class="<?php echo $attr3_class ?>"><?php unset($attr3) ?><?php $attr4 = array('class'=>'help','colspan'=>'4') ?><?php $attr4_class='help' ?><?php $attr4_colspan='4' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -223,7 +231,19 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYTYPE','target'=>'_self','url'=>$orderbytype_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYTYPE' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbytype_url ?><?php $attr5_class='' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('title'=>'FOLDER_FLIP','target'=>'_self','url'=>$flip_url,'class'=>'') ?><?php $attr5_title='FOLDER_FLIP' ?><?php $attr5_target='_self' ?><?php $attr5_url=$flip_url ?><?php $attr5_class='' ?><?php + $params = array(); + if (!empty($attr5_var1) && isset($attr5_value1)) + $params[$attr5_var1]=$attr5_value1; + if (!empty($attr5_var2) && isset($attr5_value2)) + $params[$attr5_var2]=$attr5_value2; + if (!empty($attr5_var3) && isset($attr5_value3)) + $params[$attr5_var3]=$attr5_value3; + if (!empty($attr5_var4) && isset($attr5_value4)) + $params[$attr5_var4]=$attr5_value4; + if (!empty($attr5_var5) && isset($attr5_value5)) + $params[$attr5_var5]=$attr5_value5; + if(empty($attr5_class)) $attr5_class=''; if(empty($attr5_title)) @@ -231,8 +251,8 @@ if(!empty($attr5_url)) $tmp_url = $attr5_url; else - $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($$attr5_id)?$$attr5_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_TYPE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_TYPE' ?><?php + $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'FOLDER_ORDER','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='FOLDER_ORDER' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -267,7 +287,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -289,64 +309,34 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5 = array('class'=>'text','raw'=>'_/_') ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php - if ( isset($attr5_prefix)&& isset($attr5_key)) - $attr5_key = $attr5_prefix.$attr5_key; - if ( isset($attr5_suffix)&& isset($attr5_key)) - $attr5_key = $attr5_key.$attr5_suffix; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php +// if (empty($attr4_class)) +// $attr4['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($attr4_class)) + $attr4['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) + $attr4['width']=$column_widths[$cell_column_nr-1]; - if(empty($attr5_title)) - if (!empty($attr5_key)) - $attr5_title = lang($attr5_key.'_HELP'); - else - $attr5_title = ''; - -?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php - $attr5_title = ''; - - if (!empty($attr5_array)) - { - //geht nicht: - //echo $$attr5_array[$attr5_var].'%'; - $tmpArray = $$attr5_array; - if (!empty($attr5_var)) - $tmp_text = $tmpArray[$attr5_var]; - else - $tmp_text = lang($tmpArray[$attr5_text]); - } - elseif (!empty($attr5_text)) - if ( isset($$attr5_text)) - $tmp_text = lang($$attr5_text); - else - $tmp_text = lang($attr5_text); - elseif (!empty($attr5_textvar)) - $tmp_text = lang($$attr5_textvar); - elseif (!empty($attr5_key)) - $tmp_text = lang($attr5_key); - elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; - elseif (!empty($attr5_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr5_raw); - elseif (!empty($attr5_value)) - $tmp_text = $attr5_value; - else - { - $tmp_text = '&nbsp;'; - //Html::debug($attr5);echo 'text error'; - } +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYTYPE','target'=>'_self','url'=>$orderbytype_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYTYPE' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbytype_url ?><?php $attr5_class='' ?><?php + $params = array(); + if (!empty($attr5_var1) && isset($attr5_value1)) + $params[$attr5_var1]=$attr5_value1; + if (!empty($attr5_var2) && isset($attr5_value2)) + $params[$attr5_var2]=$attr5_value2; + if (!empty($attr5_var3) && isset($attr5_value3)) + $params[$attr5_var3]=$attr5_value3; + if (!empty($attr5_var4) && isset($attr5_value4)) + $params[$attr5_var4]=$attr5_value4; + if (!empty($attr5_var5) && isset($attr5_value5)) + $params[$attr5_var5]=$attr5_value5; - if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) ); - - if (isset($attr5_accesskey)) - { - $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey)); - if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); - } - - echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYNAME','target'=>'_self','url'=>$orderbyname_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYNAME' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbyname_url ?><?php $attr5_class='' ?><?php if(empty($attr5_class)) $attr5_class=''; if(empty($attr5_title)) @@ -354,8 +344,8 @@ if(!empty($attr5_url)) $tmp_url = $attr5_url; else - $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($$attr5_id)?$$attr5_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php + $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_TYPE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_TYPE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -390,7 +380,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -412,22 +402,76 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php -// if (empty($attr4_class)) -// $attr4['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($attr4_class)) - $attr4['class']=$column_class; - - global $cell_column_nr; - $cell_column_nr++; - if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) - $attr4['width']=$column_widths[$cell_column_nr-1]; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php $attr5_escape=true ?><?php + if ( isset($attr5_prefix)&& isset($attr5_key)) + $attr5_key = $attr5_prefix.$attr5_key; + if ( isset($attr5_suffix)&& isset($attr5_key)) + $attr5_key = $attr5_key.$attr5_suffix; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYLASTCHANGE','target'=>'_self','url'=>$orderbylastchange_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYLASTCHANGE' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbylastchange_url ?><?php $attr5_class='' ?><?php + if(empty($attr5_title)) + if (!empty($attr5_key)) + $attr5_title = lang($attr5_key.'_HELP'); + else + $attr5_title = ''; + +?><span class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php + $attr5_title = ''; + + if (!empty($attr5_array)) + { + //geht nicht: + //echo $$attr5_array[$attr5_var].'%'; + $tmpArray = $$attr5_array; + if (!empty($attr5_var)) + $tmp_text = $tmpArray[$attr5_var]; + else + $tmp_text = lang($tmpArray[$attr5_text]); + } + elseif (!empty($attr5_text)) + if ( isset($$attr5_text)) + $tmp_text = lang($$attr5_text); + else + $tmp_text = lang($attr5_text); + elseif (!empty($attr5_textvar)) + $tmp_text = lang($$attr5_textvar); + elseif (!empty($attr5_key)) + $tmp_text = lang($attr5_key); + elseif (!empty($attr5_var)) + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; + elseif (!empty($attr5_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr5_raw); + elseif (!empty($attr5_value)) + $tmp_text = $attr5_value; + else + { + $tmp_text = '&nbsp;'; + //Html::debug($attr5);echo 'text error'; + } + + if ( !empty($attr5_maxlength) && intval($attr5_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr5_maxlength) ); + + if (isset($attr5_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr5_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + + echo $tmp_text; +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYNAME','target'=>'_self','url'=>$orderbyname_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYNAME' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbyname_url ?><?php $attr5_class='' ?><?php + $params = array(); + if (!empty($attr5_var1) && isset($attr5_value1)) + $params[$attr5_var1]=$attr5_value1; + if (!empty($attr5_var2) && isset($attr5_value2)) + $params[$attr5_var2]=$attr5_value2; + if (!empty($attr5_var3) && isset($attr5_value3)) + $params[$attr5_var3]=$attr5_value3; + if (!empty($attr5_var4) && isset($attr5_value4)) + $params[$attr5_var4]=$attr5_value4; + if (!empty($attr5_var5) && isset($attr5_value5)) + $params[$attr5_var5]=$attr5_value5; + if(empty($attr5_class)) $attr5_class=''; if(empty($attr5_title)) @@ -435,8 +479,8 @@ if(!empty($attr5_url)) $tmp_url = $attr5_url; else - $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($$attr5_id)?$$attr5_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LASTCHANGE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LASTCHANGE' ?><?php + $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -471,7 +515,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -493,7 +537,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'help','colspan'=>'4') ?><?php $attr4_class='help' ?><?php $attr4_colspan='4' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -508,7 +552,19 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('title'=>'FOLDER_FLIP','target'=>'_self','url'=>$flip_url,'class'=>'') ?><?php $attr5_title='FOLDER_FLIP' ?><?php $attr5_target='_self' ?><?php $attr5_url=$flip_url ?><?php $attr5_class='' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('title'=>'FOLDER_ORDERBYLASTCHANGE','target'=>'_self','url'=>$orderbylastchange_url,'class'=>'') ?><?php $attr5_title='FOLDER_ORDERBYLASTCHANGE' ?><?php $attr5_target='_self' ?><?php $attr5_url=$orderbylastchange_url ?><?php $attr5_class='' ?><?php + $params = array(); + if (!empty($attr5_var1) && isset($attr5_value1)) + $params[$attr5_var1]=$attr5_value1; + if (!empty($attr5_var2) && isset($attr5_value2)) + $params[$attr5_var2]=$attr5_value2; + if (!empty($attr5_var3) && isset($attr5_value3)) + $params[$attr5_var3]=$attr5_value3; + if (!empty($attr5_var4) && isset($attr5_value4)) + $params[$attr5_var4]=$attr5_value4; + if (!empty($attr5_var5) && isset($attr5_value5)) + $params[$attr5_var5]=$attr5_value5; + if(empty($attr5_class)) $attr5_class=''; if(empty($attr5_title)) @@ -516,8 +572,8 @@ if(!empty($attr5_url)) $tmp_url = $attr5_url; else - $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($$attr5_id)?$$attr5_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'FOLDER_ORDER') ?><?php $attr6_class='text' ?><?php $attr6_text='FOLDER_ORDER' ?><?php + $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LASTCHANGE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LASTCHANGE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -552,7 +608,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -574,7 +630,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php $attr3_list_tmp_key = $attr3_key; $attr3_list_tmp_value = $attr3_value; $attr3_list_extract = $attr3_extract; @@ -607,163 +663,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('width'=>'40%','class'=>'fx') ?><?php $attr5_width='40%' ?><?php $attr5_class='fx' ?><?php -// if (empty($attr5_class)) -// $attr5['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($attr5_class)) - $attr5['class']=$column_class; - - global $cell_column_nr; - $cell_column_nr++; - if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) - $attr5['width']=$column_widths[$cell_column_nr-1]; - -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6 = array('align'=>'left','type'=>$icon) ?><?php $attr6_align='left' ?><?php $attr6_type=$icon ?><?php -if (isset($attr6_elementtype)) { -?><img src="<?php echo $image_dir.'icon_el_'.$attr6_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php -} elseif (isset($attr6_type)) { -?><img src="<?php echo $image_dir.'icon_'.$attr6_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php -} elseif (isset($attr6_icon)) { -?><img src="<?php echo $image_dir.'icon_'.$attr6_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php -} elseif (isset($attr6_url)) { -?><img src="<?php echo $attr6_url ?>" border="0" align="<?php echo $attr6_align ?>"><?php -} elseif (isset($attr6_fileext)) { -?><img src="<?php echo $image_dir.$attr6_fileext ?>" border="0" align="<?php echo $attr6_align ?>"><?php -} elseif (isset($attr6_file)) { -?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_align) ?><?php unset($attr6_type) ?><?php $attr6 = array('class'=>'text','var'=>'name') ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; - - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); - else - $attr6_title = ''; - -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - - if (!empty($attr6_array)) - { - //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = lang($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); - else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - { - $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; - } - - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - - if (isset($attr6_accesskey)) - { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); - if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); - } - - echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'18%','class'=>'fx') ?><?php $attr5_width='18%' ?><?php $attr5_class='fx' ?><?php -// if (empty($attr5_class)) -// $attr5['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($attr5_class)) - $attr5['class']=$column_class; - - global $cell_column_nr; - $cell_column_nr++; - if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) - $attr5['width']=$column_widths[$cell_column_nr-1]; - -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'date') ?><?php $attr6_class='text' ?><?php $attr6_var='date' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; - - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); - else - $attr6_title = ''; - -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - - if (!empty($attr6_array)) - { - //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = lang($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); - else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - { - $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; - } - - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - - if (isset($attr6_accesskey)) - { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); - if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); - } - - echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -869,6 +769,18 @@ if (isset($attr6_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'GLOBAL_UP','target'=>'_self','url'=>$upurl,'class'=>'') ?><?php $attr7_title='GLOBAL_UP' ?><?php $attr7_target='_self' ?><?php $attr7_url=$upurl ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -876,8 +788,15 @@ if (isset($attr6_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_up') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_up' ?><?php $$attr8_var = $attr8_value ?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_up') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_up' ?><?php + if (!isset($attr8_value)) + unset($$attr8_var); + elseif (isset($attr8_key)) + $$attr8_var = $attr8_value[$attr8_key]; + else + $$attr8_var = $attr8_value; +?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php if (isset($attr8_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr8_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } elseif (isset($attr8_type)) { @@ -982,7 +901,7 @@ if (isset($attr8_elementtype)) { if ( $exec ) { -?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1017,7 +936,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1039,7 +958,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php @@ -1148,6 +1067,18 @@ if (isset($attr8_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'GLOBAL_TOP','target'=>'_self','url'=>$topurl,'class'=>'') ?><?php $attr7_title='GLOBAL_TOP' ?><?php $attr7_target='_self' ?><?php $attr7_url=$topurl ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -1155,8 +1086,15 @@ if (isset($attr8_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_top') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_top' ?><?php $$attr8_var = $attr8_value ?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_top') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_top' ?><?php + if (!isset($attr8_value)) + unset($$attr8_var); + elseif (isset($attr8_key)) + $$attr8_var = $attr8_value[$attr8_key]; + else + $$attr8_var = $attr8_value; +?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php if (isset($attr8_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr8_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } elseif (isset($attr8_type)) { @@ -1261,7 +1199,7 @@ if (isset($attr8_elementtype)) { if ( $exec ) { -?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1296,7 +1234,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1318,7 +1256,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php @@ -1427,6 +1365,18 @@ if (isset($attr8_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'GLOBAL_BOTTOM','target'=>'_self','url'=>$bottomurl,'class'=>'') ?><?php $attr7_title='GLOBAL_BOTTOM' ?><?php $attr7_target='_self' ?><?php $attr7_url=$bottomurl ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -1434,8 +1384,15 @@ if (isset($attr8_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_bottom') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_bottom' ?><?php $$attr8_var = $attr8_value ?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_bottom') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_bottom' ?><?php + if (!isset($attr8_value)) + unset($$attr8_var); + elseif (isset($attr8_key)) + $$attr8_var = $attr8_value[$attr8_key]; + else + $$attr8_var = $attr8_value; +?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php if (isset($attr8_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr8_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } elseif (isset($attr8_type)) { @@ -1540,7 +1497,7 @@ if (isset($attr8_elementtype)) { if ( $exec ) { -?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1575,7 +1532,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1597,7 +1554,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'3%','class'=>'fx') ?><?php $attr5_width='3%' ?><?php $attr5_class='fx' ?><?php @@ -1706,6 +1663,18 @@ if (isset($attr8_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'GLOBAL_DOWN','target'=>'_self','url'=>$downurl,'class'=>'') ?><?php $attr7_title='GLOBAL_DOWN' ?><?php $attr7_target='_self' ?><?php $attr7_url=$downurl ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -1713,8 +1682,15 @@ if (isset($attr8_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_down') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_down' ?><?php $$attr8_var = $attr8_value ?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('var'=>'bild','value'=>'arrow_down') ?><?php $attr8_var='bild' ?><?php $attr8_value='arrow_down' ?><?php + if (!isset($attr8_value)) + unset($$attr8_var); + elseif (isset($attr8_key)) + $$attr8_var = $attr8_value[$attr8_key]; + else + $$attr8_var = $attr8_value; +?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('file'=>$bild,'align'=>'left') ?><?php $attr8_file=$bild ?><?php $attr8_align='left' ?><?php if (isset($attr8_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr8_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } elseif (isset($attr8_type)) { @@ -1819,7 +1795,7 @@ if (isset($attr8_elementtype)) { if ( $exec ) { -?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1854,7 +1830,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1876,10 +1852,166 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } -?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> +?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'40%','class'=>'fx') ?><?php $attr5_width='40%' ?><?php $attr5_class='fx' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6 = array('align'=>'left','type'=>$icon) ?><?php $attr6_align='left' ?><?php $attr6_type=$icon ?><?php +if (isset($attr6_elementtype)) { +?><img src="<?php echo $image_dir.'icon_el_'.$attr6_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php +} elseif (isset($attr6_type)) { +?><img src="<?php echo $image_dir.'icon_'.$attr6_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php +} elseif (isset($attr6_icon)) { +?><img src="<?php echo $image_dir.'icon_'.$attr6_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php +} elseif (isset($attr6_url)) { +?><img src="<?php echo $attr6_url ?>" border="0" align="<?php echo $attr6_align ?>"><?php +} elseif (isset($attr6_fileext)) { +?><img src="<?php echo $image_dir.$attr6_fileext ?>" border="0" align="<?php echo $attr6_align ?>"><?php +} elseif (isset($attr6_file)) { +?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_align) ?><?php unset($attr6_type) ?><?php $attr6 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; + + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); + else + $attr6_title = ''; + +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) + { + //geht nicht: + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; + else + $tmp_text = lang($tmpArray[$attr6_text]); + } + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); + else + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; + else + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; + } + + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + + echo $tmp_text; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'18%','class'=>'fx') ?><?php $attr5_width='18%' ?><?php $attr5_class='fx' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'date','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='date' ?><?php $attr6_escape=true ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; + + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); + else + $attr6_title = ''; + +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) + { + //geht nicht: + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; + else + $tmp_text = lang($tmpArray[$attr6_text]); + } + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); + else + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; + else + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; + } + + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + + echo $tmp_text; +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/prop.tpl.php b/themes/default/pages/html/folder/prop.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -147,7 +148,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_name') ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'name','default'=>'','type'=>'text','name'=>'name','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='name' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -249,7 +250,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -264,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_filename') ?><?php $attr6_class='text' ?><?php $attr6_text='global_filename' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_filename','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_filename' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -299,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -321,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -336,7 +337,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'filename','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='filename' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'filename','default'=>'','type'=>'text','name'=>'filename','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='filename' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='filename' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -351,7 +352,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -366,7 +367,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_description') ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_description','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -401,7 +402,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -423,7 +424,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -438,7 +439,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('name'=>'description','rows'=>'10','cols'=>'40','class'=>'','default'=>'') ?><?php $attr6_name='description' ?><?php $attr6_rows='10' ?><?php $attr6_cols='40' ?><?php $attr6_class='' ?><?php $attr6_default='' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'description','rows'=>'10','cols'=>'40','class'=>'description','default'=>'') ?><?php $attr6_name='description' ?><?php $attr6_rows='10' ?><?php $attr6_cols='40' ?><?php $attr6_class='description' ?><?php $attr6_default='' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -474,7 +475,7 @@ $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -140,7 +148,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('present'=>'pages') ?><?php $attr6_present='pages' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('present'=>'pages') ?><?php $attr6_present='pages' ?><?php // Wahr-Vergleich // Html::debug($attr6); @@ -340,121 +348,121 @@ $checked = $$attr8_name; else $checked = $attr8_default; -?><input type="checkbox" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" <?php if ($attr8_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr8_name); unset($attr8_readonly); unset($attr8_default); ?><?php unset($attr8) ?><?php unset($attr8_default) ?><?php unset($attr8_readonly) ?><?php unset($attr8_name) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php - if ( isset($attr8_prefix)&& isset($attr8_key)) - $attr8_key = $attr8_prefix.$attr8_key; - if ( isset($attr8_suffix)&& isset($attr8_key)) - $attr8_key = $attr8_key.$attr8_suffix; +?><input type="checkbox" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" <?php if ($attr8_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr8_name); unset($attr8_readonly); unset($attr8_default); ?><?php unset($attr8) ?><?php unset($attr8_default) ?><?php unset($attr8_readonly) ?><?php unset($attr8_name) ?><?php $attr8 = array('for'=>'pages') ?><?php $attr8_for='pages' ?><label for="id_<?php echo $attr8_for ?><?php if (!empty($attr8_value)) echo '_'.$attr8_value ?>"><?php unset($attr8) ?><?php unset($attr8_for) ?><?php $attr9 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_raw='_' ?><?php $attr9_escape=true ?><?php + if ( isset($attr9_prefix)&& isset($attr9_key)) + $attr9_key = $attr9_prefix.$attr9_key; + if ( isset($attr9_suffix)&& isset($attr9_key)) + $attr9_key = $attr9_key.$attr9_suffix; - if(empty($attr8_title)) - if (!empty($attr8_key)) - $attr8_title = lang($attr8_key.'_HELP'); + if(empty($attr9_title)) + if (!empty($attr9_key)) + $attr9_title = lang($attr9_key.'_HELP'); else - $attr8_title = ''; + $attr9_title = ''; -?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; +?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php + $attr9_title = ''; - if (!empty($attr8_array)) + if (!empty($attr9_array)) { //geht nicht: - //echo $$attr8_array[$attr8_var].'%'; - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; + //echo $$attr9_array[$attr9_var].'%'; + $tmpArray = $$attr9_array; + if (!empty($attr9_var)) + $tmp_text = $tmpArray[$attr9_var]; else - $tmp_text = lang($tmpArray[$attr8_text]); + $tmp_text = lang($tmpArray[$attr9_text]); } - elseif (!empty($attr8_text)) - if ( isset($$attr8_text)) - $tmp_text = lang($$attr8_text); + elseif (!empty($attr9_text)) + if ( isset($$attr9_text)) + $tmp_text = lang($$attr9_text); else - $tmp_text = lang($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = lang($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = lang($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; + $tmp_text = lang($attr9_text); + elseif (!empty($attr9_textvar)) + $tmp_text = lang($$attr9_textvar); + elseif (!empty($attr9_key)) + $tmp_text = lang($attr9_key); + elseif (!empty($attr9_var)) + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; + elseif (!empty($attr9_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr9_raw); + elseif (!empty($attr9_value)) + $tmp_text = $attr9_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr8);echo 'text error'; + //Html::debug($attr9);echo 'text error'; } - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); + if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) ); - if (isset($attr8_accesskey)) + if (isset($attr9_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr9_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>'global_pages') ?><?php $attr8_class='text' ?><?php $attr8_text='global_pages' ?><?php - if ( isset($attr8_prefix)&& isset($attr8_key)) - $attr8_key = $attr8_prefix.$attr8_key; - if ( isset($attr8_suffix)&& isset($attr8_key)) - $attr8_key = $attr8_key.$attr8_suffix; +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9 = array('class'=>'text','text'=>'global_pages','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='global_pages' ?><?php $attr9_escape=true ?><?php + if ( isset($attr9_prefix)&& isset($attr9_key)) + $attr9_key = $attr9_prefix.$attr9_key; + if ( isset($attr9_suffix)&& isset($attr9_key)) + $attr9_key = $attr9_key.$attr9_suffix; - if(empty($attr8_title)) - if (!empty($attr8_key)) - $attr8_title = lang($attr8_key.'_HELP'); + if(empty($attr9_title)) + if (!empty($attr9_key)) + $attr9_title = lang($attr9_key.'_HELP'); else - $attr8_title = ''; + $attr9_title = ''; -?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; +?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php + $attr9_title = ''; - if (!empty($attr8_array)) + if (!empty($attr9_array)) { //geht nicht: - //echo $$attr8_array[$attr8_var].'%'; - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; + //echo $$attr9_array[$attr9_var].'%'; + $tmpArray = $$attr9_array; + if (!empty($attr9_var)) + $tmp_text = $tmpArray[$attr9_var]; else - $tmp_text = lang($tmpArray[$attr8_text]); + $tmp_text = lang($tmpArray[$attr9_text]); } - elseif (!empty($attr8_text)) - if ( isset($$attr8_text)) - $tmp_text = lang($$attr8_text); + elseif (!empty($attr9_text)) + if ( isset($$attr9_text)) + $tmp_text = lang($$attr9_text); else - $tmp_text = lang($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = lang($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = lang($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; + $tmp_text = lang($attr9_text); + elseif (!empty($attr9_textvar)) + $tmp_text = lang($$attr9_textvar); + elseif (!empty($attr9_key)) + $tmp_text = lang($attr9_key); + elseif (!empty($attr9_var)) + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; + elseif (!empty($attr9_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr9_raw); + elseif (!empty($attr9_value)) + $tmp_text = $attr9_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr8);echo 'text error'; + //Html::debug($attr9);echo 'text error'; } - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); + if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) ); - if (isset($attr8_accesskey)) + if (isset($attr9_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr9_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?><?php @@ -645,121 +653,121 @@ $checked = $$attr8_name; else $checked = $attr8_default; -?><input type="checkbox" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" <?php if ($attr8_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr8_name); unset($attr8_readonly); unset($attr8_default); ?><?php unset($attr8) ?><?php unset($attr8_default) ?><?php unset($attr8_readonly) ?><?php unset($attr8_name) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php - if ( isset($attr8_prefix)&& isset($attr8_key)) - $attr8_key = $attr8_prefix.$attr8_key; - if ( isset($attr8_suffix)&& isset($attr8_key)) - $attr8_key = $attr8_key.$attr8_suffix; +?><input type="checkbox" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" <?php if ($attr8_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr8_name); unset($attr8_readonly); unset($attr8_default); ?><?php unset($attr8) ?><?php unset($attr8_default) ?><?php unset($attr8_readonly) ?><?php unset($attr8_name) ?><?php $attr8 = array('for'=>'files') ?><?php $attr8_for='files' ?><label for="id_<?php echo $attr8_for ?><?php if (!empty($attr8_value)) echo '_'.$attr8_value ?>"><?php unset($attr8) ?><?php unset($attr8_for) ?><?php $attr9 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_raw='_' ?><?php $attr9_escape=true ?><?php + if ( isset($attr9_prefix)&& isset($attr9_key)) + $attr9_key = $attr9_prefix.$attr9_key; + if ( isset($attr9_suffix)&& isset($attr9_key)) + $attr9_key = $attr9_key.$attr9_suffix; - if(empty($attr8_title)) - if (!empty($attr8_key)) - $attr8_title = lang($attr8_key.'_HELP'); + if(empty($attr9_title)) + if (!empty($attr9_key)) + $attr9_title = lang($attr9_key.'_HELP'); else - $attr8_title = ''; + $attr9_title = ''; -?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; +?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php + $attr9_title = ''; - if (!empty($attr8_array)) + if (!empty($attr9_array)) { //geht nicht: - //echo $$attr8_array[$attr8_var].'%'; - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; + //echo $$attr9_array[$attr9_var].'%'; + $tmpArray = $$attr9_array; + if (!empty($attr9_var)) + $tmp_text = $tmpArray[$attr9_var]; else - $tmp_text = lang($tmpArray[$attr8_text]); + $tmp_text = lang($tmpArray[$attr9_text]); } - elseif (!empty($attr8_text)) - if ( isset($$attr8_text)) - $tmp_text = lang($$attr8_text); + elseif (!empty($attr9_text)) + if ( isset($$attr9_text)) + $tmp_text = lang($$attr9_text); else - $tmp_text = lang($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = lang($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = lang($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; + $tmp_text = lang($attr9_text); + elseif (!empty($attr9_textvar)) + $tmp_text = lang($$attr9_textvar); + elseif (!empty($attr9_key)) + $tmp_text = lang($attr9_key); + elseif (!empty($attr9_var)) + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; + elseif (!empty($attr9_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr9_raw); + elseif (!empty($attr9_value)) + $tmp_text = $attr9_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr8);echo 'text error'; + //Html::debug($attr9);echo 'text error'; } - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); + if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) ); - if (isset($attr8_accesskey)) + if (isset($attr9_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr9_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>'global_files') ?><?php $attr8_class='text' ?><?php $attr8_text='global_files' ?><?php - if ( isset($attr8_prefix)&& isset($attr8_key)) - $attr8_key = $attr8_prefix.$attr8_key; - if ( isset($attr8_suffix)&& isset($attr8_key)) - $attr8_key = $attr8_key.$attr8_suffix; +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_raw) ?><?php unset($attr9_escape) ?><?php $attr9 = array('class'=>'text','text'=>'global_files','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text='global_files' ?><?php $attr9_escape=true ?><?php + if ( isset($attr9_prefix)&& isset($attr9_key)) + $attr9_key = $attr9_prefix.$attr9_key; + if ( isset($attr9_suffix)&& isset($attr9_key)) + $attr9_key = $attr9_key.$attr9_suffix; - if(empty($attr8_title)) - if (!empty($attr8_key)) - $attr8_title = lang($attr8_key.'_HELP'); + if(empty($attr9_title)) + if (!empty($attr9_key)) + $attr9_title = lang($attr9_key.'_HELP'); else - $attr8_title = ''; + $attr9_title = ''; -?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; +?><span class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php + $attr9_title = ''; - if (!empty($attr8_array)) + if (!empty($attr9_array)) { //geht nicht: - //echo $$attr8_array[$attr8_var].'%'; - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; + //echo $$attr9_array[$attr9_var].'%'; + $tmpArray = $$attr9_array; + if (!empty($attr9_var)) + $tmp_text = $tmpArray[$attr9_var]; else - $tmp_text = lang($tmpArray[$attr8_text]); + $tmp_text = lang($tmpArray[$attr9_text]); } - elseif (!empty($attr8_text)) - if ( isset($$attr8_text)) - $tmp_text = lang($$attr8_text); + elseif (!empty($attr9_text)) + if ( isset($$attr9_text)) + $tmp_text = lang($$attr9_text); else - $tmp_text = lang($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = lang($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = lang($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; + $tmp_text = lang($attr9_text); + elseif (!empty($attr9_textvar)) + $tmp_text = lang($$attr9_textvar); + elseif (!empty($attr9_key)) + $tmp_text = lang($attr9_key); + elseif (!empty($attr9_var)) + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; + elseif (!empty($attr9_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr9_raw); + elseif (!empty($attr9_value)) + $tmp_text = $attr9_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr8);echo 'text error'; + //Html::debug($attr9);echo 'text error'; } - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); + if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) ); - if (isset($attr8_accesskey)) + if (isset($attr9_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr9_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7 = array() ?></label><?php unset($attr7) ?><?php $attr8 = array() ?><br/><?php unset($attr8) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?><?php @@ -779,7 +787,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -794,7 +802,36 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('present'=>'subdirs') ?><?php $attr6_present='subdirs' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('present'=>'subdirs') ?><?php $attr6_present='subdirs' ?><?php // Wahr-Vergleich // Html::debug($attr6); @@ -889,121 +926,121 @@ $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'subdirs') ?><?php $attr7_for='subdirs' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php + if ( isset($attr8_prefix)&& isset($attr8_key)) + $attr8_key = $attr8_prefix.$attr8_key; + if ( isset($attr8_suffix)&& isset($attr8_key)) + $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); + if(empty($attr8_title)) + if (!empty($attr8_key)) + $attr8_title = lang($attr8_key.'_HELP'); else - $attr7_title = ''; + $attr8_title = ''; -?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; +?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php + $attr8_title = ''; - if (!empty($attr7_array)) + if (!empty($attr8_array)) { //geht nicht: - //echo $$attr7_array[$attr7_var].'%'; - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; + //echo $$attr8_array[$attr8_var].'%'; + $tmpArray = $$attr8_array; + if (!empty($attr8_var)) + $tmp_text = $tmpArray[$attr8_var]; else - $tmp_text = lang($tmpArray[$attr7_text]); + $tmp_text = lang($tmpArray[$attr8_text]); } - elseif (!empty($attr7_text)) - if ( isset($$attr7_text)) - $tmp_text = lang($$attr7_text); + elseif (!empty($attr8_text)) + if ( isset($$attr8_text)) + $tmp_text = lang($$attr8_text); else - $tmp_text = lang($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = lang($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = lang($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; + $tmp_text = lang($attr8_text); + elseif (!empty($attr8_textvar)) + $tmp_text = lang($$attr8_textvar); + elseif (!empty($attr8_key)) + $tmp_text = lang($attr8_key); + elseif (!empty($attr8_var)) + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; + elseif (!empty($attr8_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr8_raw); + elseif (!empty($attr8_value)) + $tmp_text = $attr8_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr7);echo 'text error'; + //Html::debug($attr8);echo 'text error'; } - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr7_accesskey)) + if (isset($attr8_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_PUBLISH_WITH_SUBDIRS') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_PUBLISH_WITH_SUBDIRS' ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_PUBLISH_WITH_SUBDIRS','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_PUBLISH_WITH_SUBDIRS' ?><?php $attr8_escape=true ?><?php + if ( isset($attr8_prefix)&& isset($attr8_key)) + $attr8_key = $attr8_prefix.$attr8_key; + if ( isset($attr8_suffix)&& isset($attr8_key)) + $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); + if(empty($attr8_title)) + if (!empty($attr8_key)) + $attr8_title = lang($attr8_key.'_HELP'); else - $attr7_title = ''; + $attr8_title = ''; -?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; +?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php + $attr8_title = ''; - if (!empty($attr7_array)) + if (!empty($attr8_array)) { //geht nicht: - //echo $$attr7_array[$attr7_var].'%'; - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; + //echo $$attr8_array[$attr8_var].'%'; + $tmpArray = $$attr8_array; + if (!empty($attr8_var)) + $tmp_text = $tmpArray[$attr8_var]; else - $tmp_text = lang($tmpArray[$attr7_text]); + $tmp_text = lang($tmpArray[$attr8_text]); } - elseif (!empty($attr7_text)) - if ( isset($$attr7_text)) - $tmp_text = lang($$attr7_text); + elseif (!empty($attr8_text)) + if ( isset($$attr8_text)) + $tmp_text = lang($$attr8_text); else - $tmp_text = lang($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = lang($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = lang($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; + $tmp_text = lang($attr8_text); + elseif (!empty($attr8_textvar)) + $tmp_text = lang($$attr8_textvar); + elseif (!empty($attr8_key)) + $tmp_text = lang($attr8_key); + elseif (!empty($attr8_var)) + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; + elseif (!empty($attr8_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr8_raw); + elseif (!empty($attr8_value)) + $tmp_text = $attr8_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr7);echo 'text error'; + //Html::debug($attr8);echo 'text error'; } - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr7_accesskey)) + if (isset($attr8_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array('present'=>'clean') ?><?php $attr6_present='clean' ?><?php @@ -1101,121 +1138,121 @@ $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'clean') ?><?php $attr7_for='clean' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php + if ( isset($attr8_prefix)&& isset($attr8_key)) + $attr8_key = $attr8_prefix.$attr8_key; + if ( isset($attr8_suffix)&& isset($attr8_key)) + $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); + if(empty($attr8_title)) + if (!empty($attr8_key)) + $attr8_title = lang($attr8_key.'_HELP'); else - $attr7_title = ''; + $attr8_title = ''; -?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; +?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php + $attr8_title = ''; - if (!empty($attr7_array)) + if (!empty($attr8_array)) { //geht nicht: - //echo $$attr7_array[$attr7_var].'%'; - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; + //echo $$attr8_array[$attr8_var].'%'; + $tmpArray = $$attr8_array; + if (!empty($attr8_var)) + $tmp_text = $tmpArray[$attr8_var]; else - $tmp_text = lang($tmpArray[$attr7_text]); + $tmp_text = lang($tmpArray[$attr8_text]); } - elseif (!empty($attr7_text)) - if ( isset($$attr7_text)) - $tmp_text = lang($$attr7_text); + elseif (!empty($attr8_text)) + if ( isset($$attr8_text)) + $tmp_text = lang($$attr8_text); else - $tmp_text = lang($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = lang($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = lang($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; + $tmp_text = lang($attr8_text); + elseif (!empty($attr8_textvar)) + $tmp_text = lang($$attr8_textvar); + elseif (!empty($attr8_key)) + $tmp_text = lang($attr8_key); + elseif (!empty($attr8_var)) + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; + elseif (!empty($attr8_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr8_raw); + elseif (!empty($attr8_value)) + $tmp_text = $attr8_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr7);echo 'text error'; + //Html::debug($attr8);echo 'text error'; } - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr7_accesskey)) + if (isset($attr8_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('class'=>'text','text'=>'global_CLEAN_AFTER_PUBLISH') ?><?php $attr7_class='text' ?><?php $attr7_text='global_CLEAN_AFTER_PUBLISH' ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>'global_CLEAN_AFTER_PUBLISH','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='global_CLEAN_AFTER_PUBLISH' ?><?php $attr8_escape=true ?><?php + if ( isset($attr8_prefix)&& isset($attr8_key)) + $attr8_key = $attr8_prefix.$attr8_key; + if ( isset($attr8_suffix)&& isset($attr8_key)) + $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); + if(empty($attr8_title)) + if (!empty($attr8_key)) + $attr8_title = lang($attr8_key.'_HELP'); else - $attr7_title = ''; + $attr8_title = ''; -?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; +?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php + $attr8_title = ''; - if (!empty($attr7_array)) + if (!empty($attr8_array)) { //geht nicht: - //echo $$attr7_array[$attr7_var].'%'; - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; + //echo $$attr8_array[$attr8_var].'%'; + $tmpArray = $$attr8_array; + if (!empty($attr8_var)) + $tmp_text = $tmpArray[$attr8_var]; else - $tmp_text = lang($tmpArray[$attr7_text]); + $tmp_text = lang($tmpArray[$attr8_text]); } - elseif (!empty($attr7_text)) - if ( isset($$attr7_text)) - $tmp_text = lang($$attr7_text); + elseif (!empty($attr8_text)) + if ( isset($$attr8_text)) + $tmp_text = lang($$attr8_text); else - $tmp_text = lang($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = lang($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = lang($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; + $tmp_text = lang($attr8_text); + elseif (!empty($attr8_textvar)) + $tmp_text = lang($$attr8_textvar); + elseif (!empty($attr8_key)) + $tmp_text = lang($attr8_key); + elseif (!empty($attr8_var)) + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; + elseif (!empty($attr8_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr8_raw); + elseif (!empty($attr8_value)) + $tmp_text = $attr8_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr7);echo 'text error'; + //Html::debug($attr8);echo 'text error'; } - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr7_accesskey)) + if (isset($attr8_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php @@ -1247,7 +1284,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_MUCH_TIME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_MUCH_TIME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_MUCH_TIME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_MUCH_TIME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1282,7 +1319,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1304,7 +1341,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1335,13 +1372,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/folder/select.tpl.php b/themes/default/pages/html/folder/select.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_TYPE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_TYPE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_TYPE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_TYPE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -262,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -284,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr6 = array('class'=>'text','raw'=>'_/_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_/_' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_/_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -319,7 +327,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -341,7 +349,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -376,7 +384,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -398,7 +406,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='object' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='object' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; $attr4_list_extract = $attr4_extract; @@ -634,7 +642,7 @@ if ( $exec ) { -?><?php unset($attr7) ?><?php unset($attr7_false) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?><?php unset($attr7) ?><?php unset($attr7_false) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -669,7 +677,7 @@ elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -691,7 +699,7 @@ } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php @@ -721,7 +729,7 @@ if (isset($attr8_elementtype)) { } elseif (isset($attr8_fileext)) { ?><img src="<?php echo $image_dir.$attr8_fileext ?>" border="0" align="<?php echo $attr8_align ?>"><?php } elseif (isset($attr8_file)) { -?><img src="<?php echo $image_dir.$attr8_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } ?><?php unset($attr8) ?><?php unset($attr8_align) ?><?php unset($attr8_type) ?><?php $attr8 = array('class'=>'text','var'=>'name') ?><?php $attr8_class='text' ?><?php $attr8_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr8_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } ?><?php unset($attr8) ?><?php unset($attr8_align) ?><?php unset($attr8_type) ?><?php $attr8 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_var='name' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -756,7 +764,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -778,7 +786,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -813,7 +821,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -835,7 +843,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -876,7 +884,7 @@ if (isset($attr6_elementtype)) { } elseif (isset($attr6_fileext)) { ?><img src="<?php echo $image_dir.$attr6_fileext ?>" border="0" align="<?php echo $attr6_align ?>"><?php } elseif (isset($attr6_file)) { -?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_align) ?><?php unset($attr6_fileext) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_align) ?><?php unset($attr6_fileext) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -911,7 +919,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -933,7 +941,19 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:mark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:mark();' ?><?php $attr6_class='' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:mark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:mark();' ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -941,8 +961,8 @@ if (isset($attr6_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>lang('FOLDER_MARK_ALL')) ?><?php $attr7_class='text' ?><?php $attr7_text=lang('FOLDER_MARK_ALL') ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>'FOLDER_MARK_ALL','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='FOLDER_MARK_ALL' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -977,7 +997,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -999,7 +1019,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'_|_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'_|_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1034,7 +1054,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1056,7 +1076,19 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:unmark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:unmark();' ?><?php $attr6_class='' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:unmark();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:unmark();' ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -1064,8 +1096,8 @@ if (isset($attr6_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>lang('FOLDER_UNMARK_ALL')) ?><?php $attr7_class='text' ?><?php $attr7_text=lang('FOLDER_UNMARK_ALL') ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>'FOLDER_UNMARK_ALL','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='FOLDER_UNMARK_ALL' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1100,7 +1132,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1122,7 +1154,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'_|_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'_|_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_|_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1157,7 +1189,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1179,7 +1211,19 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:flip();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:flip();' ?><?php $attr6_class='' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'javascript:flip();','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='javascript:flip();' ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -1187,8 +1231,8 @@ if (isset($attr6_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>lang('FOLDER_FLIP_MARK')) ?><?php $attr7_class='text' ?><?php $attr7_text=lang('FOLDER_FLIP_MARK') ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>'FOLDER_FLIP_MARK','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='FOLDER_FLIP_MARK' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1223,7 +1267,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1245,7 +1289,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1293,7 +1337,7 @@ if (isset($attr6_elementtype)) { } extract($$attr6_list_tmp_value); } -?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_extract) ?><?php unset($attr6_key) ?><?php unset($attr6_value) ?><?php $attr7 = array('readonly'=>false,'name'=>'type','value'=>$type,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr7_readonly=false ?><?php $attr7_name='type' ?><?php $attr7_value=$type ?><?php $attr7_default=false ?><?php $attr7_prefix='' ?><?php $attr7_suffix='' ?><?php $attr7_class='' ?><?php $attr7_onchange='' ?><input type="radio" id="id_<?php echo $attr7_name.'_'.$attr7_value ?>" name="<?php echo $attr7_prefix.$attr7_name ?>"<?php if ( $attr7_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr7_value ?>" <?php if($attr7_value==$attr7_default) echo 'checked="checked"' ?> /><?php unset($attr7) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php unset($attr7_value) ?><?php unset($attr7_default) ?><?php unset($attr7_prefix) ?><?php unset($attr7_suffix) ?><?php unset($attr7_class) ?><?php unset($attr7_onchange) ?><?php $attr7 = array('for'=>'type','value'=>$type) ?><?php $attr7_for='type' ?><?php $attr7_value=$type ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php unset($attr7_value) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_extract) ?><?php unset($attr6_key) ?><?php unset($attr6_value) ?><?php $attr7 = array('readonly'=>false,'name'=>'type','value'=>$type,'default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr7_readonly=false ?><?php $attr7_name='type' ?><?php $attr7_value=$type ?><?php $attr7_default=false ?><?php $attr7_prefix='' ?><?php $attr7_suffix='' ?><?php $attr7_class='' ?><?php $attr7_onchange='' ?><input type="radio" id="id_<?php echo $attr7_name.'_'.$attr7_value ?>" name="<?php echo $attr7_prefix.$attr7_name ?>"<?php if ( $attr7_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr7_value ?>" <?php if($attr7_value==$attr7_default) echo 'checked="checked"' ?> /><?php unset($attr7) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php unset($attr7_value) ?><?php unset($attr7_default) ?><?php unset($attr7_prefix) ?><?php unset($attr7_suffix) ?><?php unset($attr7_class) ?><?php unset($attr7_onchange) ?><?php $attr7 = array('for'=>'type','value'=>$type) ?><?php $attr7_for='type' ?><?php $attr7_value=$type ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php unset($attr7_value) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1328,7 +1372,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1350,7 +1394,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','key'=>$type,'prefix'=>'FOLDER_SELECT_') ?><?php $attr8_class='text' ?><?php $attr8_key=$type ?><?php $attr8_prefix='FOLDER_SELECT_' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','key'=>$type,'prefix'=>'FOLDER_SELECT_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$type ?><?php $attr8_prefix='FOLDER_SELECT_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1385,7 +1429,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1407,7 +1451,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_prefix) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr7 = array() ?><br/><?php unset($attr7) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1438,13 +1482,12 @@ if (isset($attr6_elementtype)) { ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_next') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_next' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('empty'=>'object') ?><?php $attr4_empty='object' ?><?php + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('empty'=>'object') ?><?php $attr4_empty='object' ?><?php // Wahr-Vergleich // Html::debug($attr4); @@ -1563,7 +1606,7 @@ if (isset($attr6_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_NOT_FOUND' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_NOT_FOUND' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1598,7 +1641,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1620,7 +1663,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr2 = array() ?> </table> diff --git a/themes/default/pages/html/folder/show.tpl.php b/themes/default/pages/html/folder/show.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -144,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_FOLDER_DESC') ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_FOLDER_DESC' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_FOLDER_DESC','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_FOLDER_DESC' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -179,7 +180,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -201,7 +202,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('present'=>'up_url') ?><?php $attr3_present='up_url' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('present'=>'up_url') ?><?php $attr3_present='up_url' ?><?php // Wahr-Vergleich // Html::debug($attr3); @@ -321,6 +322,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>'','target'=>'cms_main','url'=>$up_url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$up_url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -328,7 +341,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','type'=>'folder') ?><?php $attr7_align='left' ?><?php $attr7_type='folder' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -341,7 +354,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','raw'=>'_...') ?><?php $attr7_class='text' ?><?php $attr7_raw='_...' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','raw'=>'_...','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_...' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -376,7 +389,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -398,7 +411,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array() ?><?php @@ -430,7 +443,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_TYPE') ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_TYPE' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_TYPE','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_TYPE' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -465,7 +478,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -487,7 +500,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr5 = array('class'=>'text','raw'=>'_/_') ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr5 = array('class'=>'text','raw'=>'_/_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_/_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -522,7 +535,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -544,7 +557,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_NAME' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_NAME' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -579,7 +592,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -601,7 +614,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'help') ?><?php $attr4_class='help' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -616,7 +629,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_LASTCHANGE') ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_LASTCHANGE' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_LASTCHANGE','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_LASTCHANGE' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -651,7 +664,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -673,7 +686,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('list'=>'object','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='object' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php $attr3_list_tmp_key = $attr3_key; $attr3_list_tmp_value = $attr3_value; $attr3_list_extract = $attr3_extract; @@ -722,6 +735,18 @@ if (isset($attr7_elementtype)) { $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'desc','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr6_title='desc' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -729,7 +754,7 @@ if (isset($attr7_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','type'=>$icon) ?><?php $attr7_align='left' ?><?php $attr7_type=$icon ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -742,7 +767,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','text'=>$name) ?><?php $attr7_class='text' ?><?php $attr7_text=$name ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -777,7 +802,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -799,7 +824,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -834,7 +859,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -856,7 +881,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -1046,7 +1071,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1081,7 +1106,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1103,7 +1128,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> diff --git a/themes/default/pages/html/folder/showprop.tpl.php b/themes/default/pages/html/folder/showprop.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -77,7 +77,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -94,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -137,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_name') ?><?php $attr5_class='text' ?><?php $attr5_text='global_name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -172,7 +180,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -194,7 +202,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -209,7 +217,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name') ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -244,7 +252,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -266,7 +274,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -295,7 +303,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_filename') ?><?php $attr5_class='text' ?><?php $attr5_text='global_filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -330,7 +338,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -352,7 +360,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -367,7 +375,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'filename') ?><?php $attr5_class='text' ?><?php $attr5_var='filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -402,7 +410,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -424,7 +432,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -453,7 +461,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_description') ?><?php $attr5_class='text' ?><?php $attr5_text='global_description' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_description','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_description' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -488,7 +496,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -510,7 +518,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -525,7 +533,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'description') ?><?php $attr5_class='text' ?><?php $attr5_var='description' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'description','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='description' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -560,7 +568,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -582,7 +590,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -611,7 +619,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created') ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -646,7 +654,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -668,7 +676,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -739,7 +747,7 @@ echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -774,7 +782,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -796,7 +804,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>$create_user) ?><?php $attr5_user=$create_user ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>$create_user) ?><?php $attr5_user=$create_user ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else @@ -840,7 +848,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange') ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -875,7 +883,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -897,7 +905,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -968,7 +976,7 @@ echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1003,7 +1011,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1025,7 +1033,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>$lastchange_user) ?><?php $attr5_user=$lastchange_user ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>$lastchange_user) ?><?php $attr5_user=$lastchange_user ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else diff --git a/themes/default/pages/html/group/edit.tpl.php b/themes/default/pages/html/group/edit.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -259,13 +267,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/group/remove.tpl.php b/themes/default/pages/html/group/remove.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -110,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -206,7 +216,7 @@ { $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos-1,0)).'<span class="accesskey">'.strtoupper($attr6_accesskey).'</span>'.substr($tmp_text,$pos+1); + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; @@ -278,7 +288,7 @@ { $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos-1,0)).'<span class="accesskey">'.strtoupper($attr6_accesskey).'</span>'.substr($tmp_text,$pos+1); + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; @@ -364,7 +374,7 @@ { $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos-1,0)).'<span class="accesskey">'.strtoupper($attr6_accesskey).'</span>'.substr($tmp_text,$pos+1); + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; @@ -470,7 +480,7 @@ { $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos-1,0)).'<span class="accesskey">'.strtoupper($attr6_accesskey).'</span>'.substr($tmp_text,$pos+1); + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; @@ -505,13 +515,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/index/password.tpl.php b/themes/default/pages/html/index/password.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -176,7 +192,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php $attr7 = array('class'=>'text','text'=>'USER_USERNAME') ?><?php $attr7_class='text' ?><?php $attr7_text='USER_USERNAME' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php $attr7 = array('class'=>'text','text'=>'USER_USERNAME','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='USER_USERNAME' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -211,7 +227,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -224,9 +240,16 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%') ?><?php $attr6_width='50%' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%') ?><?php $attr6_width='50%' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -271,7 +294,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_DATABASE') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_DATABASE' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_DATABASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_DATABASE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -306,7 +329,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -319,9 +342,16 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -339,10 +369,18 @@ ?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='dbids' ?><?php $attr7_name='dbid' ?><?php $attr7_default='actdbid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><select size="1" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php if (count($$attr7_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr7_list as $box_key=>$box_value ) + $attr7_tmp_list = $$attr7_list; + if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) + $attr7_tmp_default = $$attr7_name; + elseif ( isset($attr7_default) ) + $attr7_tmp_default = $attr7_default; + else + $attr7_tmp_default = ''; + + foreach( $attr7_tmp_list as $box_key=>$box_value ) { echo '<option class="'.$attr7_class.'" value="'.$box_key.'"'; - if (isset($$attr7_name)&&$box_key==$$attr7_name || isset($attr7_default)&&$box_key == $attr7_default) + if ($box_key==$attr7_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } @@ -377,15 +415,14 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_ok' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_next') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_next' ?><?php if ($attr7_type=='ok') - { $attr7_type = 'submit'; -// $attr7_class = 'ok'; -// $attr7_text = 'BUTTON_OK'; -// $attr7_value = 'ok'; - } -?><input type="<?php echo $attr7_type ?>" name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr7_src)) + $attr7_type = 'image'; + else + $attr7_src = ''; +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/index/passwordcode.tpl.php b/themes/default/pages/html/index/passwordcode.tpl.php @@ -1,62 +1,72 @@ -<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<?php $attr1 = array('class'=>'main','title'=>$cms_title) ?><?php $attr1_class='main' ?><?php $attr1_title=$cms_title ?><?php header('Content-Type: text/html; charset='.lang('CHARSET')) +?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> -<!-- $Id$ --> <head> - <title><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title><?php echo $attr1_title ?></title> + <meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" /> <meta name="MSSmartTagsPreventParsing" content="true" /> <meta name="robots" content="noindex,nofollow" /> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu ) + { + ?> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" /> +<?php + } +?> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> -<body class="<?php echo $attr_class ?>"> - +<body class="<?php echo $attr1_class ?>"> -<?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)) - $attr_subaction = $targetSubActionName; - if (empty($attr_id)) - $attr_id = $this->getRequestId(); +<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_top' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php + if (empty($attr2_action)) + $attr2_action = $actionName; + if (empty($attr2_subaction)) + $attr2_subaction = $targetSubActionName; + if (empty($attr2_id)) + $attr2_id = $this->getRequestId(); -?><form name="<?php echo $attr_name ?>" - target="<?php echo $attr_target ?>" - action="<?php echo Html::url( $attr_action,$attr_subaction,$attr_id ) ?>" - method="<?php echo $attr_method ?>" - enctype="<?php echo $attr_enctype ?>"> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php +?><form name="<?php echo $attr2_name ?>" + target="<?php echo $attr2_target ?>" + action="<?php echo Html::url( $attr2_action,$attr2_subaction,$attr2_id ) ?>" + method="<?php echo $attr2_method ?>" + enctype="<?php echo $attr2_enctype ?>"> +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($attr) ?><?php unset($attr_name) ?><?php unset($attr_target) ?><?php unset($attr_method) ?><?php unset($attr_enctype) ?><?php $attr = array('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($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('name'=>'password','icon'=>'user','widths'=>'50%,50%','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='password' ?><?php $attr3_icon='user' ?><?php $attr3_widths='50%,50%' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); - if (!empty($attr_widths)) + if (!empty($attr3_widths)) { - $column_widths = explode(',',$attr_widths); - unset($attr['widths']); + $column_widths = explode(',',$attr3_widths); + unset($attr3['widths']); } - if (!empty($attr_rowclasses)) + if (!empty($attr3_rowclasses)) { - $row_classes = explode(',',$attr_rowclasses); + $row_classes = explode(',',$attr3_rowclasses); $row_class_idx = 999; - unset($attr['rowclasses']); + unset($attr3['rowclasses']); } - if (!empty($attr_columnclasses)) + if (!empty($attr3_columnclasses)) { - $column_classes = explode(',',$attr_columnclasses); - unset($attr['columnclasses']); + $column_classes = explode(',',$attr3_columnclasses); + unset($attr3['columnclasses']); } global $image_dir; echo '<br/><br/><br/><center>'; - echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; + echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">'; echo '<tr><td class="menu">'; - if ( !empty($attr_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !empty($attr3_icon) ) + echo '<img src="'.$image_dir.'icon_'.$attr3_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !isset($path) || is_array($path) ) + $path = array(); foreach( $path as $pathElement) { extract($pathElement); @@ -65,18 +75,34 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> - <?php foreach( $windowMenu as $menu ) + + <?php if ( !isset($windowMenu) || !is_array($windowMenu) ) + $windowMenu = array(); + foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -93,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -107,159 +134,174 @@ <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() ?><?php + <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr3) ?><?php unset($attr3_name) ?><?php unset($attr3_icon) ?><?php unset($attr3_widths) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4 = 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; + if (empty($attr4_class)) + $attr4_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; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'logo','colspan'=>'2') ?><?php $attr5_class='logo' ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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; + if (empty($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['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'=>'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 +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('name'=>'password') ?><?php $attr6_name='password' ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6) ?><?php unset($attr6_name) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; $row_class=$row_classes[$row_class_idx-1]; - if (empty($attr_class)) - $attr_class=$row_class; + if (empty($attr5_class)) + $attr5_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $attr_class ?>"><?php unset($attr) ?><?php $attr = array() ?><?php -// if (empty($attr_class)) -// $attr['class']=$row_class; +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array() ?><?php +// if (empty($attr6_class)) +// $attr6['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; + if (empty($attr6_class)) + $attr6['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) + $attr6['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'mail_code','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='mail_code' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; -?><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'; + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr_class ?>" title="<?php echo $attr_title ?>"><?php - $attr_title = ''; - if (!empty($attr_array)) +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; + + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr_text)) - if ( isset($$attr_text)) - $tmp_text = lang($$attr_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr_text); - elseif (!empty($attr_textvar)) - $tmp_text = lang($$attr_textvar); - elseif (!empty($attr_key)) - $tmp_text = lang($attr_key); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - elseif (!empty($attr_value)) - $tmp_text = $attr_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else - { Html::debug($attr);echo 'text error'; + { + $tmp_text = '&nbsp;'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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; +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php +// if (empty($attr6_class)) +// $attr6['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; + if (empty($attr6_class)) + $attr6['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) + $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr) ?><?php $attr = array('class'=>'','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 +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'code','size'=>'30','maxlength'=>'256','onchange'=>'') ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='code' ?><?php $attr7_size='30' ?><?php $attr7_maxlength='256' ?><?php $attr7_onchange='' ?><?php if(!isset($attr7_default)) $attr7_default=''; +?><input id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_default) ?><?php unset($attr7_type) ?><?php unset($attr7_name) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_onchange) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; $row_class=$row_classes[$row_class_idx-1]; - if (empty($attr_class)) - $attr_class=$row_class; + if (empty($attr5_class)) + $attr5_class=$row_class; global $cell_column_nr; $cell_column_nr=0; $column_class_idx = 999; -?><tr class="<?php echo $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; +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array('class'=>'act','colspan'=>'2') ?><?php $attr6_class='act' ?><?php $attr6_colspan='2' ?><?php +// if (empty($attr6_class)) +// $attr6['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; + if (empty($attr6_class)) + $attr6['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) + $attr6['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('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr_type='ok' ?><?php $attr_class='ok' ?><?php $attr_value='ok' ?><?php $attr_text='button_ok' ?><?php - if ($attr_type=='ok') - { - $attr_type = 'submit'; -// $attr_class = 'ok'; -// $attr_text = 'BUTTON_OK'; -// $attr_value = 'ok'; - } -?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php unset($attr_class) ?><?php unset($attr_value) ?><?php unset($attr_text) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table> +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_ok' ?><?php + if ($attr7_type=='ok') + $attr7_type = 'submit'; + if (isset($attr7_src)) + $attr7_type = 'image'; + else + $attr7_src = ''; +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> @@ -273,16 +315,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 $attr = array() ?></form> +<?php unset($attr2) ?><?php $attr1 = array() ?></form> -<?php unset($attr) ?><?php $attr = array('field'=>'code') ?><?php $attr_field='code' ?> +<?php unset($attr1) ?><?php $attr2 = array('field'=>'code') ?><?php $attr2_field='code' ?> <script name="JavaScript" type="text/javascript"> <!-- -document.forms[0].<?php echo $attr_field ?>.focus(); -document.forms[0].<?php echo $attr_field ?>.select(); +document.forms[0].<?php echo $attr2_field ?>.focus(); +document.forms[0].<?php echo $attr2_field ?>.select(); // --> </script> -<?php unset($attr) ?><?php unset($attr_field) ?><?php $attr = array() ?> +<?php unset($attr2) ?><?php unset($attr2_field) ?><?php $attr0 = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> @@ -293,4 +335,4 @@ document.forms[0].<?php echo $attr_field ?>.select(); <?php } ?> </body> -</html><?php unset($attr) ?>- \ No newline at end of file +</html><?php unset($attr0) ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/index/projectmenu.tpl.php b/themes/default/pages/html/index/projectmenu.tpl.php @@ -23,7 +23,7 @@ <body class="<?php echo $attr1_class ?>"> -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('title'=>'GLOBAL_PROJECTS','name'=>'login','icon'=>'project','width'=>'400','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr2_title='GLOBAL_PROJECTS' ?><?php $attr2_name='login' ?><?php $attr2_icon='project' ?><?php $attr2_width='400' ?><?php $attr2_rowclasses='odd,even' ?><?php $attr2_columnclasses='1,2,3' ?><?php +<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('title'=>'GLOBAL_PROJECTS','name'=>'login','icon'=>'project','width'=>'600','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr2_title='GLOBAL_PROJECTS' ?><?php $attr2_name='login' ?><?php $attr2_icon='project' ?><?php $attr2_width='600' ?><?php $attr2_rowclasses='odd,even' ?><?php $attr2_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -144,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('name'=>'projectmenu') ?><?php $attr5_name='projectmenu' ?><img src="<?php echo $image_dir.'logo_'.$attr5_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr5_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr5_name.'_text') ?></p><?php unset($attr5) ?><?php unset($attr5_name) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='el' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('name'=>'projectmenu') ?><?php $attr5_name='projectmenu' ?><img src="<?php echo $image_dir.'logo_'.$attr5_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr5_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr5_name.'_text') ?></p><?php unset($attr5) ?><?php unset($attr5_name) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array('list'=>'projects','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='projects' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php $attr3_list_tmp_key = $attr3_key; $attr3_list_tmp_value = $attr3_value; $attr3_list_extract = $attr3_extract; @@ -177,6 +178,35 @@ $column_class_idx = 999; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'3') ?><?php $attr5_colspan='3' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>$name) ?><?php $attr6_title=$name ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + ?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; @@ -193,6 +223,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('title'=>lang('TREE_CHOOSE_PROJECT'),'target'=>'_self','url'=>$url,'class'=>'') ?><?php $attr6_title=lang('TREE_CHOOSE_PROJECT') ?><?php $attr6_target='_self' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -200,7 +242,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('var'=>'project','value'=>'project') ?><?php $attr7_var='project' ?><?php $attr7_value='project' ?><?php if (!isset($attr7_value)) unset($$attr7_var); @@ -220,7 +262,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -255,7 +297,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -277,7 +319,173 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('action'=>'index','subaction'=>'project','id'=>$id,'name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr6_action='index' ?><?php $attr6_subaction='project' ?><?php $attr6_id=$id ?><?php $attr6_name='' ?><?php $attr6_target='_self' ?><?php $attr6_method='post' ?><?php $attr6_enctype='application/x-www-form-urlencoded' ?><?php + if (empty($attr6_action)) + $attr6_action = $actionName; + if (empty($attr6_subaction)) + $attr6_subaction = $targetSubActionName; + if (empty($attr6_id)) + $attr6_id = $this->getRequestId(); + +?><form name="<?php echo $attr6_name ?>" + target="<?php echo $attr6_target ?>" + action="<?php echo Html::url( $attr6_action,$attr6_subaction,$attr6_id ) ?>" + method="<?php echo $attr6_method ?>" + enctype="<?php echo $attr6_enctype ?>"> +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr6_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr6_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr6_id ?>" /><?php + if ( $conf['interface']['url_sessionid'] ) + echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; +?><?php unset($attr6) ?><?php unset($attr6_action) ?><?php unset($attr6_subaction) ?><?php unset($attr6_id) ?><?php unset($attr6_name) ?><?php unset($attr6_target) ?><?php unset($attr6_method) ?><?php unset($attr6_enctype) ?><?php $attr7 = array('width'=>'100%','space'=>'0px','padding'=>'0px','widths'=>'150px,150px','rowclasses'=>'odd,even') ?><?php $attr7_width='100%' ?><?php $attr7_space='0px' ?><?php $attr7_padding='0px' ?><?php $attr7_widths='150px,150px' ?><?php $attr7_rowclasses='odd,even' ?><?php + $coloumn_widths=array(); + $row_classes = array(''); + $column_classes= array(''); + + if(empty($attr7_class)) + $attr7_class=''; + + if (!empty($attr7_widths)) + { + $column_widths = explode(',',$attr7_widths); + unset($attr7['widths']); + } + if (!empty($attr7_classes)) + { + $row_classes = explode(',',$attr7_rowclasses); + $row_class_idx = 999; + unset($attr7['rowclasses']); + } + if (!empty($attr7_rowclasses)) + { + $row_classes = explode(',',$attr7_rowclasses); + $row_class_idx = 999; + unset($attr7['rowclasses']); + } + if (!empty($attr7_columnclasses)) + { + $column_classes = explode(',',$attr7_columnclasses); + unset($attr7['columnclasses']); + } + +?><table class="<?php echo $attr7_class ?>" cellspacing="<?php echo $attr7_space ?>" width="<?php echo $attr7_width ?>" cellpadding="<?php echo $attr7_padding ?>"><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_space) ?><?php unset($attr7_padding) ?><?php unset($attr7_widths) ?><?php unset($attr7_rowclasses) ?><?php $attr8 = 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($attr8_class)) + $attr8_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr8_class ?>"><?php unset($attr8) ?><?php $attr9 = array() ?><?php +// if (empty($attr9_class)) +// $attr9['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($attr9_class)) + $attr9['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr9_rowspan) ) + $attr9['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr9 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr9) ?><?php $attr10 = array('list'=>'models','name'=>'modelid','default'=>$defaultmodelid,'onchange'=>'','title'=>'','class'=>'') ?><?php $attr10_list='models' ?><?php $attr10_name='modelid' ?><?php $attr10_default=$defaultmodelid ?><?php $attr10_onchange='' ?><?php $attr10_title='' ?><?php $attr10_class='' ?><?php $attr10_tmp_list = $$attr10_list; + if ( isset($$attr10_name) && isset($attr10_tmp_list[$$attr10_name]) ) + $attr10_tmp_default = $$attr10_name; + elseif ( isset($attr10_default) ) + $attr10_tmp_default = $attr10_default; + else + $attr10_tmp_default = ''; +// Html::debug($attr10_tmp_default); + + foreach( $attr10_tmp_list as $box_key=>$box_value ) + { + $id = 'id_'.$attr10_name.'_'.$box_key; + echo '<input id="'.$id.'" name="'.$attr10_name.'" type="radio" class="'.$attr10_class.'" value="'.$box_key.'"'; + if ($box_key==$attr10_tmp_default) + echo ' checked="checked"'; + echo '>&nbsp;<label for="'.$id.'">'.$box_value.'</label><br>'; + } +?><?php unset($attr10) ?><?php unset($attr10_list) ?><?php unset($attr10_name) ?><?php unset($attr10_default) ?><?php unset($attr10_onchange) ?><?php unset($attr10_title) ?><?php unset($attr10_class) ?><?php $attr8 = array() ?></td><?php unset($attr8) ?><?php $attr9 = array() ?><?php +// if (empty($attr9_class)) +// $attr9['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($attr9_class)) + $attr9['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr9_rowspan) ) + $attr9['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr9 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr9) ?><?php $attr10 = array('list'=>'languages','name'=>'languageid','default'=>$defaultlanguageid,'onchange'=>'','title'=>'','class'=>'') ?><?php $attr10_list='languages' ?><?php $attr10_name='languageid' ?><?php $attr10_default=$defaultlanguageid ?><?php $attr10_onchange='' ?><?php $attr10_title='' ?><?php $attr10_class='' ?><?php $attr10_tmp_list = $$attr10_list; + if ( isset($$attr10_name) && isset($attr10_tmp_list[$$attr10_name]) ) + $attr10_tmp_default = $$attr10_name; + elseif ( isset($attr10_default) ) + $attr10_tmp_default = $attr10_default; + else + $attr10_tmp_default = ''; +// Html::debug($attr10_tmp_default); + + foreach( $attr10_tmp_list as $box_key=>$box_value ) + { + $id = 'id_'.$attr10_name.'_'.$box_key; + echo '<input id="'.$id.'" name="'.$attr10_name.'" type="radio" class="'.$attr10_class.'" value="'.$box_key.'"'; + if ($box_key==$attr10_tmp_default) + echo ' checked="checked"'; + echo '>&nbsp;<label for="'.$id.'">'.$box_value.'</label><br>'; + } +?><?php unset($attr10) ?><?php unset($attr10_list) ?><?php unset($attr10_name) ?><?php unset($attr10_default) ?><?php unset($attr10_onchange) ?><?php unset($attr10_title) ?><?php unset($attr10_class) ?><?php $attr8 = array() ?></td><?php unset($attr8) ?><?php $attr9 = array() ?><?php +// if (empty($attr9_class)) +// $attr9['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($attr9_class)) + $attr9['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr9_rowspan) ) + $attr9['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr9 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr9) ?><?php $attr10 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr10_type='ok' ?><?php $attr10_class='ok' ?><?php $attr10_value='ok' ?><?php $attr10_text='button_ok' ?><?php + if ($attr10_type=='ok') + $attr10_type = 'submit'; + if (isset($attr10_src)) + $attr10_type = 'image'; + else + $attr10_src = ''; +?><input type="<?php echo $attr10_type ?>"<?php if(isset($attr10_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr10_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr10_value ?>" class="<?php echo $attr10_class ?>" title="<?php echo lang($attr10_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr10_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr10_src) ?><?php unset($attr10) ?><?php unset($attr10_type) ?><?php unset($attr10_class) ?><?php unset($attr10_value) ?><?php unset($attr10_text) ?><?php $attr8 = array() ?></td><?php unset($attr8) ?><?php $attr7 = array() ?></tr><?php unset($attr7) ?><?php $attr6 = array() ?></table><?php unset($attr6) ?><?php $attr5 = array() ?></form> + +<?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/index/register.tpl.php b/themes/default/pages/html/index/register.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -176,7 +192,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'USER_MAIL') ?><?php $attr7_class='text' ?><?php $attr7_text='USER_MAIL' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'USER_MAIL','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='USER_MAIL' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -211,7 +227,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -224,9 +240,16 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -271,15 +294,14 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_ok' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_next') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_next' ?><?php if ($attr7_type=='ok') - { $attr7_type = 'submit'; -// $attr7_class = 'ok'; -// $attr7_text = 'BUTTON_OK'; -// $attr7_value = 'ok'; - } -?><input type="<?php echo $attr7_type ?>" name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr7_src)) + $attr7_type = 'image'; + else + $attr7_src = ''; +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/index/registercode.tpl.php b/themes/default/pages/html/index/registercode.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -224,7 +239,14 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; ?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) @@ -319,7 +341,14 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; ?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) @@ -414,7 +443,14 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; ?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) @@ -508,7 +544,14 @@ if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; ?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) @@ -528,10 +571,18 @@ ?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='dbids' ?><?php $attr7_name='dbid' ?><?php $attr7_default='actdbid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><select size="1" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php if (count($$attr7_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr7_list as $box_key=>$box_value ) + $attr7_tmp_list = $$attr7_list; + if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) + $attr7_tmp_default = $$attr7_name; + elseif ( isset($attr7_default) ) + $attr7_tmp_default = $attr7_default; + else + $attr7_tmp_default = ''; + + foreach( $attr7_tmp_list as $box_key=>$box_value ) { echo '<option class="'.$attr7_class.'" value="'.$box_key.'"'; - if (isset($$attr7_name)&&$box_key==$$attr7_name || isset($attr7_default)&&$box_key == $attr7_default) + if ($box_key==$attr7_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } @@ -568,13 +619,12 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va ?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_ok' ?><?php if ($attr7_type=='ok') - { $attr7_type = 'submit'; -// $attr7_class = 'ok'; -// $attr7_text = 'BUTTON_OK'; -// $attr7_value = 'ok'; - } -?><input type="<?php echo $attr7_type ?>" name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr7_src)) + $attr7_type = 'image'; + else + $attr7_src = ''; +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -433,6 +434,18 @@ if ( $exec ) { ?><?php unset($attr8) ?><?php unset($attr8_present) ?><?php $attr9 = array('title'=>'','target'=>'_top','url'=>$conf['login']['logo']['url'],'class'=>'') ?><?php $attr9_title='' ?><?php $attr9_target='_top' ?><?php $attr9_url=$conf['login']['logo']['url'] ?><?php $attr9_class='' ?><?php + $params = array(); + if (!empty($attr9_var1) && isset($attr9_value1)) + $params[$attr9_var1]=$attr9_value1; + if (!empty($attr9_var2) && isset($attr9_value2)) + $params[$attr9_var2]=$attr9_value2; + if (!empty($attr9_var3) && isset($attr9_value3)) + $params[$attr9_var3]=$attr9_value3; + if (!empty($attr9_var4) && isset($attr9_value4)) + $params[$attr9_var4]=$attr9_value4; + if (!empty($attr9_var5) && isset($attr9_value5)) + $params[$attr9_var5]=$attr9_value5; + if(empty($attr9_class)) $attr9_class=''; if(empty($attr9_title)) @@ -440,7 +453,7 @@ if(!empty($attr9_url)) $tmp_url = $attr9_url; else - $tmp_url = Html::url($attr9_action,$attr9_subaction,!empty($$attr9_id)?$$attr9_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr9_action,$attr9_subaction,!empty($attr9_id)?$attr9_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr9_class ?>" target="<?php echo $attr9_target ?>"<?php if (isset($attr9_accesskey)) echo ' accesskey="'.$attr9_accesskey.'"' ?> title="<?php echo $attr9_title ?>"><?php unset($attr9) ?><?php unset($attr9_title) ?><?php unset($attr9_target) ?><?php unset($attr9_url) ?><?php unset($attr9_class) ?><?php $attr10 = array('url'=>$conf['login']['logo']['file'],'align'=>'left') ?><?php $attr10_url=$conf['login']['logo']['file'] ?><?php $attr10_align='left' ?><?php if (isset($attr10_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr10_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr10_align ?>"><?php @@ -686,7 +699,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','raw'=>$conf['login']['motd']) ?><?php $attr7_class='text' ?><?php $attr7_raw=$conf['login']['motd'] ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','raw'=>$conf['login']['motd'],'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw=$conf['login']['motd'] ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -721,7 +734,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -743,7 +756,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('true'=>$conf['login']['nologin']) ?><?php $attr4_true=$conf['login']['nologin'] ?><?php @@ -865,7 +878,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','key'=>'LOGIN_NOLOGIN_DESC') ?><?php $attr7_class='text' ?><?php $attr7_key='LOGIN_NOLOGIN_DESC' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','key'=>'LOGIN_NOLOGIN_DESC','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='LOGIN_NOLOGIN_DESC' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -900,7 +913,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -922,7 +935,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('true'=>$conf['security']['readonly']) ?><?php $attr4_true=$conf['security']['readonly'] ?><?php @@ -1044,7 +1057,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','key'=>'GLOBAL_READONLY_DESC') ?><?php $attr7_class='text' ?><?php $attr7_key='GLOBAL_READONLY_DESC' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','key'=>'GLOBAL_READONLY_DESC','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='GLOBAL_READONLY_DESC' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1079,7 +1092,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1101,7 +1114,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('true'=>$conf['security']['nopublish']) ?><?php $attr4_true=$conf['security']['nopublish'] ?><?php @@ -1223,7 +1236,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','key'=>'GLOBAL_NOPUBLISH_DESC') ?><?php $attr7_class='text' ?><?php $attr7_key='GLOBAL_NOPUBLISH_DESC' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','key'=>'GLOBAL_NOPUBLISH_DESC','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='GLOBAL_NOPUBLISH_DESC' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1258,7 +1271,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1280,7 +1293,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('false'=>$conf['login']['nologin']) ?><?php $attr4_false=$conf['login']['nologin'] ?><?php @@ -1416,7 +1429,7 @@ if (isset($attr9_elementtype)) { $column_class_idx = 999; -?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1431,7 +1444,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>'USER_USERNAME') ?><?php $attr7_class='text' ?><?php $attr7_key='USER_USERNAME' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','key'=>'USER_USERNAME','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='USER_USERNAME' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1466,7 +1479,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1488,7 +1501,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1503,7 +1516,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('not'=>true,'present'=>'force_username') ?><?php $attr7_not=true ?><?php $attr7_present='force_username' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('not'=>true,'present'=>'force_username') ?><?php $attr7_not=true ?><?php $attr7_present='force_username' ?><?php // Wahr-Vergleich // Html::debug($attr7); @@ -1593,7 +1606,7 @@ if (isset($attr9_elementtype)) { if ( $exec ) { -?><?php unset($attr7) ?><?php unset($attr7_not) ?><?php unset($attr7_present) ?><?php $attr8 = array('class'=>'','default'=>'','type'=>'text','name'=>'login_name','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'') ?><?php $attr8_class='' ?><?php $attr8_default='' ?><?php $attr8_type='text' ?><?php $attr8_name='login_name' ?><?php $attr8_value='' ?><?php $attr8_size='25' ?><?php $attr8_maxlength='256' ?><?php $attr8_onchange='' ?><?php if(!isset($attr8_default)) $attr8_default=''; +?><?php unset($attr7) ?><?php unset($attr7_not) ?><?php unset($attr7_present) ?><?php $attr8 = array('class'=>'name','default'=>'','type'=>'text','name'=>'login_name','value'=>'','size'=>'20','maxlength'=>'256','onchange'=>'') ?><?php $attr8_class='name' ?><?php $attr8_default='' ?><?php $attr8_type='text' ?><?php $attr8_name='login_name' ?><?php $attr8_value='' ?><?php $attr8_size='20' ?><?php $attr8_maxlength='256' ?><?php $attr8_onchange='' ?><?php if(!isset($attr8_default)) $attr8_default=''; ?><input id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" type="<?php echo $attr8_type ?>" size="<?php echo $attr8_size ?>" maxlength="<?php echo $attr8_maxlength ?>" class="<?php echo $attr8_class ?>" value="<?php echo isset($$attr8_name)?$$attr8_name:$attr8_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_default) ?><?php unset($attr8_type) ?><?php unset($attr8_name) ?><?php unset($attr8_value) ?><?php unset($attr8_size) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_onchange) ?><?php $attr6 = array() ?><?php } @@ -1601,7 +1614,7 @@ if (isset($attr9_elementtype)) { if ( !$last_exec ) { ?><?php unset($attr7) ?><?php $attr8 = array('class'=>'','default'=>'','type'=>'hidden','name'=>'login_name','value'=>$force_username,'size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr8_class='' ?><?php $attr8_default='' ?><?php $attr8_type='hidden' ?><?php $attr8_name='login_name' ?><?php $attr8_value=$force_username ?><?php $attr8_size='40' ?><?php $attr8_maxlength='256' ?><?php $attr8_onchange='' ?><?php if(!isset($attr8_default)) $attr8_default=''; -?><input id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" type="<?php echo $attr8_type ?>" size="<?php echo $attr8_size ?>" maxlength="<?php echo $attr8_maxlength ?>" class="<?php echo $attr8_class ?>" value="<?php echo isset($$attr8_name)?$$attr8_name:$attr8_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_default) ?><?php unset($attr8_type) ?><?php unset($attr8_name) ?><?php unset($attr8_value) ?><?php unset($attr8_size) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_onchange) ?><?php $attr8 = array('class'=>'text','value'=>$force_username) ?><?php $attr8_class='text' ?><?php $attr8_value=$force_username ?><?php +?><input id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" type="<?php echo $attr8_type ?>" size="<?php echo $attr8_size ?>" maxlength="<?php echo $attr8_maxlength ?>" class="<?php echo $attr8_class ?>" value="<?php echo isset($$attr8_name)?$$attr8_name:$attr8_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_default) ?><?php unset($attr8_type) ?><?php unset($attr8_name) ?><?php unset($attr8_value) ?><?php unset($attr8_size) ?><?php unset($attr8_maxlength) ?><?php unset($attr8_onchange) ?><?php $attr8 = array('class'=>'text','value'=>$force_username,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_value=$force_username ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1636,7 +1649,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1658,7 +1671,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_value) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_value) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5 = array() ?><?php $row_class_idx++; @@ -1674,7 +1687,7 @@ if (isset($attr9_elementtype)) { $column_class_idx = 999; -?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1689,7 +1702,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>'USER_PASSWORD') ?><?php $attr7_class='text' ?><?php $attr7_key='USER_PASSWORD' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','key'=>'USER_PASSWORD','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='USER_PASSWORD' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1724,7 +1737,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1746,7 +1759,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1761,7 +1774,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('name'=>'login_password','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr7_name='login_password' ?><?php $attr7_default='' ?><?php $attr7_class='' ?><?php $attr7_size='25' ?><?php $attr7_maxlength='256' ?><input type="password" name="<?php echo $attr7_name ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" /><?php unset($attr7) ?><?php unset($attr7_name) ?><?php unset($attr7_default) ?><?php unset($attr7_class) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5 = array('true'=>$this->mustChangePassword) ?><?php $attr5_true=$this->mustChangePassword ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('name'=>'login_password','default'=>'','class'=>'name','size'=>'20','maxlength'=>'256') ?><?php $attr7_name='login_password' ?><?php $attr7_default='' ?><?php $attr7_class='name' ?><?php $attr7_size='20' ?><?php $attr7_maxlength='256' ?><input type="password" name="<?php echo $attr7_name ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" /><?php unset($attr7) ?><?php unset($attr7_name) ?><?php unset($attr7_default) ?><?php unset($attr7_class) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr5 = array('true'=>$this->mustChangePassword) ?><?php $attr5_true=$this->mustChangePassword ?><?php // Wahr-Vergleich // Html::debug($attr5); @@ -1865,7 +1878,36 @@ if (isset($attr9_elementtype)) { $column_class_idx = 999; -?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array('width'=>'50%','class'=>'fx') ?><?php $attr7_width='50%' ?><?php $attr7_class='fx' ?><?php +?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array('colspan'=>'2') ?><?php $attr7_colspan='2' ?><?php +// if (empty($attr7_class)) +// $attr7['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($attr7_class)) + $attr7['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) + $attr7['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('title'=>lang('USER_NEW_PASSWORD')) ?><?php $attr8_title=lang('USER_NEW_PASSWORD') ?><fieldset><legend><?php echo $attr8_title ?></legend><?php unset($attr8) ?><?php unset($attr8_title) ?><?php $attr7 = array() ?></fieldset><?php unset($attr7) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6 = 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($attr6_class)) + $attr6_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array() ?><?php // if (empty($attr7_class)) // $attr7['class']=$row_class; $column_class_idx++; @@ -1880,7 +1922,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','key'=>'USER_NEW_PASSWORD') ?><?php $attr8_class='text' ?><?php $attr8_key='USER_NEW_PASSWORD' ?><?php +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','key'=>'USER_NEW_PASSWORD','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key='USER_NEW_PASSWORD' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1915,7 +1957,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1937,7 +1979,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('width'=>'50%','class'=>'fx') ?><?php $attr7_width='50%' ?><?php $attr7_class='fx' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array() ?><?php // if (empty($attr7_class)) // $attr7['class']=$row_class; $column_class_idx++; @@ -1952,7 +1994,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8 = array('name'=>'password1','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr8_name='password1' ?><?php $attr8_default='' ?><?php $attr8_class='' ?><?php $attr8_size='25' ?><?php $attr8_maxlength='256' ?><input type="password" name="<?php echo $attr8_name ?>" size="<?php echo $attr8_size ?>" maxlength="<?php echo $attr8_maxlength ?>" class="<?php echo $attr8_class ?>" value="<?php echo isset($$attr8_name)?$$attr8_name:$attr8_default ?>" /><?php unset($attr8) ?><?php unset($attr8_name) ?><?php unset($attr8_default) ?><?php unset($attr8_class) ?><?php unset($attr8_size) ?><?php unset($attr8_maxlength) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6 = array() ?><?php +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php $attr8 = array('name'=>'password1','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr8_name='password1' ?><?php $attr8_default='' ?><?php $attr8_class='' ?><?php $attr8_size='25' ?><?php $attr8_maxlength='256' ?><input type="password" name="<?php echo $attr8_name ?>" size="<?php echo $attr8_size ?>" maxlength="<?php echo $attr8_maxlength ?>" class="<?php echo $attr8_class ?>" value="<?php echo isset($$attr8_name)?$$attr8_name:$attr8_default ?>" /><?php unset($attr8) ?><?php unset($attr8_name) ?><?php unset($attr8_default) ?><?php unset($attr8_class) ?><?php unset($attr8_size) ?><?php unset($attr8_maxlength) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1966,7 +2008,7 @@ if (isset($attr9_elementtype)) { $column_class_idx = 999; -?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array('width'=>'50%','class'=>'fx') ?><?php $attr7_width='50%' ?><?php $attr7_class='fx' ?><?php +?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array() ?><?php // if (empty($attr7_class)) // $attr7['class']=$row_class; $column_class_idx++; @@ -1981,7 +2023,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','key'=>'USER_NEW_PASSWORD_REPEAT') ?><?php $attr8_class='text' ?><?php $attr8_key='USER_NEW_PASSWORD_REPEAT' ?><?php +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','key'=>'USER_NEW_PASSWORD_REPEAT','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key='USER_NEW_PASSWORD_REPEAT' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -2016,7 +2058,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -2038,7 +2080,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('width'=>'50%','class'=>'fx') ?><?php $attr7_width='50%' ?><?php $attr7_class='fx' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array() ?><?php // if (empty($attr7_class)) // $attr7['class']=$row_class; $column_class_idx++; @@ -2053,7 +2095,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_width) ?><?php unset($attr7_class) ?><?php $attr8 = array('name'=>'password2','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr8_name='password2' ?><?php $attr8_default='' ?><?php $attr8_class='' ?><?php $attr8_size='25' ?><?php $attr8_maxlength='256' ?><input type="password" name="<?php echo $attr8_name ?>" size="<?php echo $attr8_size ?>" maxlength="<?php echo $attr8_maxlength ?>" class="<?php echo $attr8_class ?>" value="<?php echo isset($$attr8_name)?$$attr8_name:$attr8_default ?>" /><?php unset($attr8) ?><?php unset($attr8_name) ?><?php unset($attr8_default) ?><?php unset($attr8_class) ?><?php unset($attr8_size) ?><?php unset($attr8_maxlength) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php $attr8 = array('name'=>'password2','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr8_name='password2' ?><?php $attr8_default='' ?><?php $attr8_class='' ?><?php $attr8_size='25' ?><?php $attr8_maxlength='256' ?><input type="password" name="<?php echo $attr8_name ?>" size="<?php echo $attr8_size ?>" maxlength="<?php echo $attr8_maxlength ?>" class="<?php echo $attr8_class ?>" value="<?php echo isset($$attr8_name)?$$attr8_name:$attr8_default ?>" /><?php unset($attr8) ?><?php unset($attr8_name) ?><?php unset($attr8_default) ?><?php unset($attr8_class) ?><?php unset($attr8_size) ?><?php unset($attr8_maxlength) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array() ?><?php @@ -2070,7 +2112,36 @@ if (isset($attr9_elementtype)) { $column_class_idx = 999; -?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = 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($attr6_class)) + $attr6_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array('colspan'=>'2') ?><?php $attr7_colspan='2' ?><?php +// if (empty($attr7_class)) +// $attr7['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($attr7_class)) + $attr7['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) + $attr7['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('title'=>lang('DATABASE')) ?><?php $attr8_title=lang('DATABASE') ?><fieldset><legend><?php echo $attr8_title ?></legend><?php unset($attr8) ?><?php unset($attr8_title) ?><?php $attr7 = array() ?></fieldset><?php unset($attr7) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -2085,7 +2156,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>'GLOBAL_DATABASE') ?><?php $attr7_class='text' ?><?php $attr7_key='GLOBAL_DATABASE' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','key'=>'DATABASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='DATABASE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -2120,7 +2191,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -2142,7 +2213,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -2157,7 +2228,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php unset($attr6_class) ?><?php $attr7 = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='dbids' ?><?php $attr7_name='dbid' ?><?php $attr7_default='actdbid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><select size="1" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr7_list='dbids' ?><?php $attr7_name='dbid' ?><?php $attr7_default='actdbid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><select size="1" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php if (count($$attr7_list)==1) echo ' disabled="disabled"' ?>><?php $attr7_tmp_list = $$attr7_list; @@ -2213,7 +2284,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va $attr7_type = 'image'; else $attr7_src = ''; -?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><script name="javascript1.2" type="text/javascript"> +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><script name="javascript1.2" type="text/javascript"> <!-- document.forms[0].screenwidth.value=window.innerWidth; // --> @@ -2238,6 +2309,18 @@ document.forms[0].screenwidth.value=window.innerWidth; <?php unset($attr2) ?><?php $attr1 = array() ?></form> <?php unset($attr1) ?><?php $attr2 = array() ?><br/><?php unset($attr2) ?><?php $attr2 = array() ?><br/><?php unset($attr2) ?><?php $attr2 = array('title'=>'','target'=>'_top','url'=>$conf['login']['gpl']['url'],'class'=>'') ?><?php $attr2_title='' ?><?php $attr2_target='_top' ?><?php $attr2_url=$conf['login']['gpl']['url'] ?><?php $attr2_class='' ?><?php + $params = array(); + if (!empty($attr2_var1) && isset($attr2_value1)) + $params[$attr2_var1]=$attr2_value1; + if (!empty($attr2_var2) && isset($attr2_value2)) + $params[$attr2_var2]=$attr2_value2; + if (!empty($attr2_var3) && isset($attr2_value3)) + $params[$attr2_var3]=$attr2_value3; + if (!empty($attr2_var4) && isset($attr2_value4)) + $params[$attr2_var4]=$attr2_value4; + if (!empty($attr2_var5) && isset($attr2_value5)) + $params[$attr2_var5]=$attr2_value5; + if(empty($attr2_class)) $attr2_class=''; if(empty($attr2_title)) @@ -2245,8 +2328,8 @@ document.forms[0].screenwidth.value=window.innerWidth; if(!empty($attr2_url)) $tmp_url = $attr2_url; else - $tmp_url = Html::url($attr2_action,$attr2_subaction,!empty($$attr2_id)?$$attr2_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr2_class ?>" target="<?php echo $attr2_target ?>"<?php if (isset($attr2_accesskey)) echo ' accesskey="'.$attr2_accesskey.'"' ?> title="<?php echo $attr2_title ?>"><?php unset($attr2) ?><?php unset($attr2_title) ?><?php unset($attr2_target) ?><?php unset($attr2_url) ?><?php unset($attr2_class) ?><?php $attr3 = array('class'=>'text','value'=>lang('GLOBAL_GPL')) ?><?php $attr3_class='text' ?><?php $attr3_value=lang('GLOBAL_GPL') ?><?php + $tmp_url = Html::url($attr2_action,$attr2_subaction,!empty($attr2_id)?$attr2_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr2_class ?>" target="<?php echo $attr2_target ?>"<?php if (isset($attr2_accesskey)) echo ' accesskey="'.$attr2_accesskey.'"' ?> title="<?php echo $attr2_title ?>"><?php unset($attr2) ?><?php unset($attr2_title) ?><?php unset($attr2_target) ?><?php unset($attr2_url) ?><?php unset($attr2_class) ?><?php $attr3 = array('class'=>'text','value'=>lang('GLOBAL_GPL'),'escape'=>true) ?><?php $attr3_class='text' ?><?php $attr3_value=lang('GLOBAL_GPL') ?><?php $attr3_escape=true ?><?php if ( isset($attr3_prefix)&& isset($attr3_key)) $attr3_key = $attr3_prefix.$attr3_key; if ( isset($attr3_suffix)&& isset($attr3_key)) @@ -2281,7 +2364,7 @@ document.forms[0].screenwidth.value=window.innerWidth; elseif (!empty($attr3_key)) $tmp_text = lang($attr3_key); elseif (!empty($attr3_var)) - $tmp_text = isset($$attr3_var)?htmlentities($$attr3_var):'error: variable '.$attr3_var.' not present'; + $tmp_text = isset($$attr3_var)?($attr3_escape?htmlentities($$attr3_var):$$attr3_var):'?'.$attr3_var.'?'; elseif (!empty($attr3_raw)) $tmp_text = str_replace('_','&nbsp;',$attr3_raw); elseif (!empty($attr3_value)) @@ -2303,7 +2386,7 @@ document.forms[0].screenwidth.value=window.innerWidth; } echo $tmp_text; -?></span><?php unset($attr3) ?><?php unset($attr3_class) ?><?php unset($attr3_value) ?><?php $attr1 = array() ?></a><?php unset($attr1) ?><?php $attr2 = array('present'=>'force_username') ?><?php $attr2_present='force_username' ?><?php +?></span><?php unset($attr3) ?><?php unset($attr3_class) ?><?php unset($attr3_value) ?><?php unset($attr3_escape) ?><?php $attr1 = array() ?></a><?php unset($attr1) ?><?php $attr2 = array('present'=>'force_username') ?><?php $attr2_present='force_username' ?><?php // Wahr-Vergleich // Html::debug($attr2); diff --git a/themes/default/pages/html/language/advanced.tpl.php b/themes/default/pages/html/language/advanced.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -264,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'LANGUAGE_ISOCODE') ?><?php $attr6_class='text' ?><?php $attr6_text='LANGUAGE_ISOCODE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'LANGUAGE_ISOCODE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='LANGUAGE_ISOCODE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -299,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -321,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; diff --git a/themes/default/pages/html/language/edit.tpl.php b/themes/default/pages/html/language/edit.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LANGUAGE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LANGUAGE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LANGUAGE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LANGUAGE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; diff --git a/themes/default/pages/html/language/listing.tpl.php b/themes/default/pages/html/language/listing.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -164,6 +165,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -171,7 +184,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('file'=>'icon_language','align'=>'left') ?><?php $attr7_file='icon_language' ?><?php $attr7_align='left' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -184,7 +197,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -219,7 +232,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -241,7 +254,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -256,7 +269,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'isocode') ?><?php $attr6_class='text' ?><?php $attr6_var='isocode' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'isocode','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='isocode' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -291,7 +304,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -313,7 +326,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -419,6 +432,18 @@ if (isset($attr7_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'','target'=>'cms_main_main','url'=>$default_url,'class'=>'') ?><?php $attr7_title='' ?><?php $attr7_target='cms_main_main' ?><?php $attr7_url=$default_url ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -426,8 +451,8 @@ if (isset($attr7_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_make_default') ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_make_default' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_make_default','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_make_default' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -462,7 +487,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -484,13 +509,13 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array() ?><?php if ( !$last_exec ) { -?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_is_default') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_is_default' ?><?php +?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_is_default','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_is_default' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -525,7 +550,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -547,7 +572,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) @@ -655,6 +680,18 @@ if (isset($attr7_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'','target'=>$conf['interface']['frames']['top'],'url'=>$select_url,'class'=>'') ?><?php $attr7_title='' ?><?php $attr7_target=$conf['interface']['frames']['top'] ?><?php $attr7_url=$select_url ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -662,8 +699,8 @@ if (isset($attr7_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_select') ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_select' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_select','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_select' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -698,7 +735,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -720,13 +757,13 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array() ?><?php if ( !$last_exec ) { -?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_selected') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_selected' ?><?php +?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_selected','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_selected' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -761,7 +798,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -783,7 +820,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('var'=>'select_url') ?><?php $attr4_var='select_url' ?><?php if (!isset($attr4_value)) diff --git a/themes/default/pages/html/language/remove.tpl.php b/themes/default/pages/html/language/remove.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>$name) ?><?php $attr6_class='text' ?><?php $attr6_text=$name ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>$name,'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=$name ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -269,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -291,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -320,7 +321,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -355,7 +356,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -377,7 +378,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -426,7 +427,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GROUP_DELETE_DESC') ?><?php $attr6_class='text' ?><?php $attr6_text='GROUP_DELETE_DESC' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GROUP_DELETE_DESC','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GROUP_DELETE_DESC' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -461,7 +462,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -483,7 +484,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; diff --git a/themes/default/pages/html/link/edit.tpl.php b/themes/default/pages/html/link/edit.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +178,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'link_url') ?><?php $attr6_class='text' ?><?php $attr6_text='link_url' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'link_url','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='link_url' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +213,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -210,9 +226,16 @@ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -272,7 +295,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'link_target') ?><?php $attr6_class='text' ?><?php $attr6_text='link_target' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'link_target','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='link_target' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -307,7 +330,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -320,9 +343,16 @@ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -337,19 +367,27 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('list'=>'objects','name'=>'targetobjectid','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='objects' ?><?php $attr6_name='targetobjectid' ?><?php $attr6_default='' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('list'=>'objects','name'=>'targetobjectid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='objects' ?><?php $attr6_name='targetobjectid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr6_list as $box_key=>$box_value ) + $attr6_tmp_list = $$attr6_list; + if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) + $attr6_tmp_default = $$attr6_name; + elseif ( isset($attr6_default) ) + $attr6_tmp_default = $attr6_default; + else + $attr6_tmp_default = ''; + + foreach( $attr6_tmp_list as $box_key=>$box_value ) { echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; - if (isset($$attr6_name)&&$box_key==$$attr6_name || isset($attr6_default)&&$box_key == $attr6_default) + if ($box_key==$attr6_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' -?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -380,13 +418,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/link/prop.tpl.php b/themes/default/pages/html/link/prop.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -132,7 +148,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -147,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_name') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -182,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -195,9 +211,16 @@ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -212,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'name','default'=>'','type'=>'text','name'=>'name','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='name' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -227,7 +250,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -242,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_description') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_description' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_description','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_description' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -277,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -290,9 +313,16 @@ if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -307,7 +337,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('name'=>'description','rows'=>'10','cols'=>'40','class'=>'','default'=>'') ?><?php $attr6_name='description' ?><?php $attr6_rows='10' ?><?php $attr6_cols='40' ?><?php $attr6_class='' ?><?php $attr6_default='' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'description','rows'=>'10','cols'=>'40','class'=>'description','default'=>'') ?><?php $attr6_name='description' ?><?php $attr6_rows='10' ?><?php $attr6_cols='40' ?><?php $attr6_class='description' ?><?php $attr6_default='' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -338,13 +368,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/link/showprop.tpl.php b/themes/default/pages/html/link/showprop.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -144,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_name') ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -179,7 +180,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -201,7 +202,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -216,7 +217,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name') ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -251,7 +252,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -273,7 +274,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -302,7 +303,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_description') ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_description' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'GLOBAL_description','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='GLOBAL_description' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -337,7 +338,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -359,7 +360,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -374,7 +375,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'desc') ?><?php $attr5_class='text' ?><?php $attr5_var='desc' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'desc','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='desc' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -409,7 +410,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -431,7 +432,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -460,7 +461,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','raw'=>'_') ?><?php $attr5_class='text' ?><?php $attr5_raw='_' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -495,7 +496,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -517,7 +518,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -546,7 +547,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created') ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -581,7 +582,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -603,7 +604,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -674,7 +675,7 @@ echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -709,7 +710,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -731,7 +732,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else @@ -775,7 +776,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange') ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -810,7 +811,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -832,7 +833,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -903,7 +904,7 @@ echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -938,7 +939,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -960,7 +961,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php @@ -115,6 +115,18 @@ if (isset($attr5_elementtype)) { extract($$attr5_list_tmp_value); } ?><?php unset($attr5) ?><?php unset($attr5_list) ?><?php unset($attr5_extract) ?><?php unset($attr5_key) ?><?php unset($attr5_value) ?><?php $attr6 = array('title'=>$title,'target'=>'cms_main','url'=>$url,'class'=>'path') ?><?php $attr6_title=$title ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='path' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -122,8 +134,8 @@ if (isset($attr5_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','maxlength'=>'20','value'=>$name) ?><?php $attr7_class='text' ?><?php $attr7_maxlength='20' ?><?php $attr7_value=$name ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','maxlength'=>'20','value'=>$name,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_maxlength='20' ?><?php $attr7_value=$name ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -158,7 +170,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -180,12 +192,12 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_value) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('type'=>'filesep') ?><?php $attr6_type='filesep' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_value) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('type'=>'filesep') ?><?php $attr6_type='filesep' ?><?php if ($attr6_type=='filesep') echo '&nbsp;<strong>&raquo;</strong>&nbsp;'; else echo "char error"; -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('title'=>$text,'class'=>'title','text'=>$text) ?><?php $attr5_title=$text ?><?php $attr5_class='title' ?><?php $attr5_text=$text ?><?php +?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('title'=>$text,'class'=>'title','text'=>$text,'escape'=>true) ?><?php $attr5_title=$text ?><?php $attr5_class='title' ?><?php $attr5_text=$text ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -220,7 +232,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -242,7 +254,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('style'=>'text-align:right;','class'=>'menu') ?><?php $attr4_style='text-align:right;' ?><?php $attr4_class='menu' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('style'=>'text-align:right;','class'=>'menu') ?><?php $attr4_style='text-align:right;' ?><?php $attr4_class='menu' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -373,7 +385,7 @@ if (isset($attr5_elementtype)) { $attr7_type = 'image'; else $attr7_src = ''; -?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></form> @@ -517,6 +529,18 @@ if (isset($attr5_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_not) ?><?php unset($attr6_empty) ?><?php $attr7 = array('title'=>$title,'target'=>'cms_main_main','url'=>$url,'class'=>'menu','accesskey'=>$key) ?><?php $attr7_title=$title ?><?php $attr7_target='cms_main_main' ?><?php $attr7_url=$url ?><?php $attr7_class='menu' ?><?php $attr7_accesskey=$key ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -524,8 +548,8 @@ if (isset($attr5_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php unset($attr7_accesskey) ?><?php $attr8 = array('class'=>'text','var'=>'text','accesskey'=>$key) ?><?php $attr8_class='text' ?><?php $attr8_var='text' ?><?php $attr8_accesskey=$key ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php unset($attr7_accesskey) ?><?php $attr8 = array('class'=>'text','var'=>'text','accesskey'=>$key,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_var='text' ?><?php $attr8_accesskey=$key ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -560,7 +584,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -582,7 +606,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_accesskey) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_var) ?><?php unset($attr8_accesskey) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array('empty'=>'url') ?><?php $attr6_empty='url' ?><?php @@ -675,7 +699,7 @@ if (isset($attr5_elementtype)) { if ( $exec ) { -?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'menu_disabled','var'=>'text') ?><?php $attr7_class='menu_disabled' ?><?php $attr7_var='text' ?><?php +?><?php unset($attr6) ?><?php unset($attr6_empty) ?><?php $attr7 = array('class'=>'menu_disabled','var'=>'text','escape'=>true) ?><?php $attr7_class='menu_disabled' ?><?php $attr7_var='text' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -710,7 +734,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -732,10 +756,10 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } -?><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'__') ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php +?><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -770,7 +794,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -792,7 +816,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><!-- +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><!-- //<?php // if ( hasLang('MENU_'.$act.'_KEY' ) ) // { diff --git a/themes/default/pages/html/model/edit.tpl.php b/themes/default/pages/html/model/edit.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -271,7 +272,7 @@ $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/model/listing.tpl.php b/themes/default/pages/html/model/listing.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -164,6 +165,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -171,7 +184,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('file'=>'icon_model','align'=>'left') ?><?php $attr7_file='icon_model' ?><?php $attr7_align='left' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -184,7 +197,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -219,7 +232,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -241,7 +254,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -347,6 +360,18 @@ if (isset($attr7_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'','target'=>'cms_main','url'=>$default_url,'class'=>'') ?><?php $attr7_title='' ?><?php $attr7_target='cms_main' ?><?php $attr7_url=$default_url ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -354,8 +379,8 @@ if (isset($attr7_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_make_default') ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_make_default' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_make_default','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_make_default' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -390,7 +415,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -412,13 +437,13 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array() ?><?php if ( !$last_exec ) { -?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_is_default') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_is_default' ?><?php +?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_is_default','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_is_default' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -453,7 +478,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -475,7 +500,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) @@ -583,6 +608,18 @@ if (isset($attr7_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'','target'=>$conf['interface']['frames']['top'],'url'=>$select_url,'class'=>'') ?><?php $attr7_title='' ?><?php $attr7_target=$conf['interface']['frames']['top'] ?><?php $attr7_url=$select_url ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -590,8 +627,8 @@ if (isset($attr7_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_select') ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_select' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_select','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_select' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -626,7 +663,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -648,13 +685,13 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array() ?><?php if ( !$last_exec ) { -?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_selected') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_selected' ?><?php +?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_selected','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_selected' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -689,7 +726,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -711,7 +748,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('var'=>'select_url') ?><?php $attr4_var='select_url' ?><?php if (!isset($attr4_value)) diff --git a/themes/default/pages/html/model/remove.tpl.php b/themes/default/pages/html/model/remove.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>$name) ?><?php $attr6_class='text' ?><?php $attr6_text=$name ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>$name,'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=$name ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -269,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -291,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -320,7 +321,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -355,7 +356,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -377,7 +378,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -426,7 +427,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GROUP_DELETE_DESC') ?><?php $attr6_class='text' ?><?php $attr6_text='GROUP_DELETE_DESC' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GROUP_DELETE_DESC','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GROUP_DELETE_DESC' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -461,7 +462,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -483,7 +484,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -519,7 +520,7 @@ $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/object/aclform.tpl.php b/themes/default/pages/html/object/aclform.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -147,6 +148,35 @@ $column_class_idx = 999; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'3') ?><?php $attr5_colspan='3' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('users')) ?><?php $attr6_title=lang('users') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + ?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; @@ -162,64 +192,64 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_ALL') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_ALL' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'type','value'=>'all') ?><?php $attr6_for='type' ?><?php $attr6_value='all' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_ALL','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_ALL' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr6_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; - if (!empty($attr6_array)) + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr6_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - if (isset($attr6_accesskey)) + if (isset($attr7_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -249,7 +279,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -284,7 +314,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -306,7 +336,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -335,64 +365,64 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_USER') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_USER' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'type','value'=>'user') ?><?php $attr6_for='type' ?><?php $attr6_value='user' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_USER','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_USER' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr6_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; - if (!empty($attr6_array)) + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr6_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - if (isset($attr6_accesskey)) + if (isset($attr7_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -428,7 +458,7 @@ if (count($$attr6_list)==1) echo ' disabled="disabled"' $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -561,64 +591,64 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_GROUP') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_GROUP' ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('for'=>'type','value'=>'group') ?><?php $attr7_for='type' ?><?php $attr7_value='group' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php unset($attr7_value) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_GROUP','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_GROUP' ?><?php $attr8_escape=true ?><?php + if ( isset($attr8_prefix)&& isset($attr8_key)) + $attr8_key = $attr8_prefix.$attr8_key; + if ( isset($attr8_suffix)&& isset($attr8_key)) + $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); + if(empty($attr8_title)) + if (!empty($attr8_key)) + $attr8_title = lang($attr8_key.'_HELP'); else - $attr7_title = ''; + $attr8_title = ''; -?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; +?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php + $attr8_title = ''; - if (!empty($attr7_array)) + if (!empty($attr8_array)) { //geht nicht: - //echo $$attr7_array[$attr7_var].'%'; - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; + //echo $$attr8_array[$attr8_var].'%'; + $tmpArray = $$attr8_array; + if (!empty($attr8_var)) + $tmp_text = $tmpArray[$attr8_var]; else - $tmp_text = lang($tmpArray[$attr7_text]); + $tmp_text = lang($tmpArray[$attr8_text]); } - elseif (!empty($attr7_text)) - if ( isset($$attr7_text)) - $tmp_text = lang($$attr7_text); + elseif (!empty($attr8_text)) + if ( isset($$attr8_text)) + $tmp_text = lang($$attr8_text); else - $tmp_text = lang($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = lang($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = lang($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; + $tmp_text = lang($attr8_text); + elseif (!empty($attr8_textvar)) + $tmp_text = lang($$attr8_textvar); + elseif (!empty($attr8_key)) + $tmp_text = lang($attr8_key); + elseif (!empty($attr8_var)) + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; + elseif (!empty($attr8_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr8_raw); + elseif (!empty($attr8_value)) + $tmp_text = $attr8_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr7);echo 'text error'; + //Html::debug($attr8);echo 'text error'; } - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr7_accesskey)) + if (isset($attr8_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -654,7 +684,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -685,7 +715,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'help','colspan'=>'3') ?><?php $attr5_class='help' ?><?php $attr5_colspan='3' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'3') ?><?php $attr5_colspan='3' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -700,64 +730,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; - - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); - else - $attr6_title = ''; - -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - - if (!empty($attr6_array)) - { - //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = lang($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); - else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - { - $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; - } - - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - - if (isset($attr6_accesskey)) - { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); - if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); - } - - echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('language')) ?><?php $attr6_title=lang('language') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -786,64 +759,64 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LANGUAGE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LANGUAGE' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('for'=>'languageid') ?><?php $attr6_for='languageid' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_LANGUAGE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_LANGUAGE' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr6_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; - if (!empty($attr6_array)) + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr6_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - if (isset($attr6_accesskey)) + if (isset($attr7_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -858,7 +831,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -893,7 +866,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -915,7 +888,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -936,7 +909,7 @@ if (count($$attr6_list)==1) echo ' disabled="disabled"' $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -964,7 +937,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'help','colspan'=>'3') ?><?php $attr5_class='help' ?><?php $attr5_colspan='3' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'3') ?><?php $attr5_colspan='3' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -979,64 +952,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; - - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); - else - $attr6_title = ''; - -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - - if (!empty($attr6_array)) - { - //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = lang($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); - else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - { - $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; - } - - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); - - if (isset($attr6_accesskey)) - { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); - if ( $pos !== false ) - $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); - } - - echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('list'=>'show','extract'=>false,'key'=>'k','value'=>'t') ?><?php $attr4_list='show' ?><?php $attr4_extract=false ?><?php $attr4_key='k' ?><?php $attr4_value='t' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('acl')) ?><?php $attr6_title=lang('acl') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('list'=>'show','extract'=>false,'key'=>'k','value'=>'t') ?><?php $attr4_list='show' ?><?php $attr4_extract=false ?><?php $attr4_key='k' ?><?php $attr4_value='t' ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; $attr4_list_extract = $attr4_extract; @@ -1084,64 +1000,64 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','key'=>$t,'prefix'=>'acl_') ?><?php $attr7_class='text' ?><?php $attr7_key=$t ?><?php $attr7_prefix='acl_' ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('for'=>$t) ?><?php $attr7_for=$t ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','key'=>$t,'prefix'=>'acl_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$t ?><?php $attr8_prefix='acl_' ?><?php $attr8_escape=true ?><?php + if ( isset($attr8_prefix)&& isset($attr8_key)) + $attr8_key = $attr8_prefix.$attr8_key; + if ( isset($attr8_suffix)&& isset($attr8_key)) + $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); + if(empty($attr8_title)) + if (!empty($attr8_key)) + $attr8_title = lang($attr8_key.'_HELP'); else - $attr7_title = ''; + $attr8_title = ''; -?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; +?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php + $attr8_title = ''; - if (!empty($attr7_array)) + if (!empty($attr8_array)) { //geht nicht: - //echo $$attr7_array[$attr7_var].'%'; - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; + //echo $$attr8_array[$attr8_var].'%'; + $tmpArray = $$attr8_array; + if (!empty($attr8_var)) + $tmp_text = $tmpArray[$attr8_var]; else - $tmp_text = lang($tmpArray[$attr7_text]); + $tmp_text = lang($tmpArray[$attr8_text]); } - elseif (!empty($attr7_text)) - if ( isset($$attr7_text)) - $tmp_text = lang($$attr7_text); + elseif (!empty($attr8_text)) + if ( isset($$attr8_text)) + $tmp_text = lang($$attr8_text); else - $tmp_text = lang($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = lang($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = lang($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; + $tmp_text = lang($attr8_text); + elseif (!empty($attr8_textvar)) + $tmp_text = lang($$attr8_textvar); + elseif (!empty($attr8_key)) + $tmp_text = lang($attr8_key); + elseif (!empty($attr8_var)) + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; + elseif (!empty($attr8_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr8_raw); + elseif (!empty($attr8_value)) + $tmp_text = $attr8_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr7);echo 'text error'; + //Html::debug($attr8);echo 'text error'; } - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr7_accesskey)) + if (isset($attr8_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_prefix) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'20px') ?><?php $attr6_width='20px' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('width'=>'20px') ?><?php $attr6_width='20px' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1156,64 +1072,64 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php $attr7 = array('class'=>'text','key'=>$t,'suffix'=>'_abbrev','prefix'=>'acl_') ?><?php $attr7_class='text' ?><?php $attr7_key=$t ?><?php $attr7_suffix='_abbrev' ?><?php $attr7_prefix='acl_' ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_width) ?><?php $attr7 = array('for'=>$t) ?><?php $attr7_for=$t ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','key'=>$t,'suffix'=>'_abbrev','prefix'=>'acl_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key=$t ?><?php $attr8_suffix='_abbrev' ?><?php $attr8_prefix='acl_' ?><?php $attr8_escape=true ?><?php + if ( isset($attr8_prefix)&& isset($attr8_key)) + $attr8_key = $attr8_prefix.$attr8_key; + if ( isset($attr8_suffix)&& isset($attr8_key)) + $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); + if(empty($attr8_title)) + if (!empty($attr8_key)) + $attr8_title = lang($attr8_key.'_HELP'); else - $attr7_title = ''; + $attr8_title = ''; -?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; +?><span class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php + $attr8_title = ''; - if (!empty($attr7_array)) + if (!empty($attr8_array)) { //geht nicht: - //echo $$attr7_array[$attr7_var].'%'; - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; + //echo $$attr8_array[$attr8_var].'%'; + $tmpArray = $$attr8_array; + if (!empty($attr8_var)) + $tmp_text = $tmpArray[$attr8_var]; else - $tmp_text = lang($tmpArray[$attr7_text]); + $tmp_text = lang($tmpArray[$attr8_text]); } - elseif (!empty($attr7_text)) - if ( isset($$attr7_text)) - $tmp_text = lang($$attr7_text); + elseif (!empty($attr8_text)) + if ( isset($$attr8_text)) + $tmp_text = lang($$attr8_text); else - $tmp_text = lang($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = lang($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = lang($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; + $tmp_text = lang($attr8_text); + elseif (!empty($attr8_textvar)) + $tmp_text = lang($$attr8_textvar); + elseif (!empty($attr8_key)) + $tmp_text = lang($attr8_key); + elseif (!empty($attr8_var)) + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; + elseif (!empty($attr8_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr8_raw); + elseif (!empty($attr8_value)) + $tmp_text = $attr8_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr7);echo 'text error'; + //Html::debug($attr8);echo 'text error'; } - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr7_accesskey)) + if (isset($attr8_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr8_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_suffix) ?><?php unset($attr7_prefix) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_suffix) ?><?php unset($attr8_prefix) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1318,7 +1234,14 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( $exec ) { -?><?php unset($attr7) ?><?php unset($attr7_equals) ?><?php unset($attr7_value) ?><?php $attr8 = array('var'=>$t,'value'=>true) ?><?php $attr8_var=$t ?><?php $attr8_value=true ?><?php $$attr8_var = $attr8_value ?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('default'=>false,'readonly'=>true,'name'=>$t) ?><?php $attr8_default=false ?><?php $attr8_readonly=true ?><?php $attr8_name=$t ?><?php +?><?php unset($attr7) ?><?php unset($attr7_equals) ?><?php unset($attr7_value) ?><?php $attr8 = array('var'=>$t,'value'=>true) ?><?php $attr8_var=$t ?><?php $attr8_value=true ?><?php + if (!isset($attr8_value)) + unset($$attr8_var); + elseif (isset($attr8_key)) + $$attr8_var = $attr8_value[$attr8_key]; + else + $$attr8_var = $attr8_value; +?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('default'=>false,'readonly'=>true,'name'=>$t) ?><?php $attr8_default=false ?><?php $attr8_readonly=true ?><?php $attr8_name=$t ?><?php if ( isset($$attr8_name) ) $checked = $$attr8_name; else @@ -1329,7 +1252,14 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><?php unset($attr6) ?><?php $attr7 = array() ?><?php if ( !$last_exec ) { -?><?php unset($attr7) ?><?php $attr8 = array('var'=>$t,'value'=>false) ?><?php $attr8_var=$t ?><?php $attr8_value=false ?><?php $$attr8_var = $attr8_value ?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('default'=>false,'readonly'=>false,'name'=>$t) ?><?php $attr8_default=false ?><?php $attr8_readonly=false ?><?php $attr8_name=$t ?><?php +?><?php unset($attr7) ?><?php $attr8 = array('var'=>$t,'value'=>false) ?><?php $attr8_var=$t ?><?php $attr8_value=false ?><?php + if (!isset($attr8_value)) + unset($$attr8_var); + elseif (isset($attr8_key)) + $$attr8_var = $attr8_value[$attr8_key]; + else + $$attr8_var = $attr8_value; +?><?php unset($attr8) ?><?php unset($attr8_var) ?><?php unset($attr8_value) ?><?php $attr8 = array('default'=>false,'readonly'=>false,'name'=>$t) ?><?php $attr8_default=false ?><?php $attr8_readonly=false ?><?php $attr8_name=$t ?><?php if ( isset($$attr8_name) ) $checked = $$attr8_name; else @@ -1372,7 +1302,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/object/rights.tpl.php b/themes/default/pages/html/object/rights.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -269,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -291,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('not'=>true,'empty'=>'acls') ?><?php $attr3_not=true ?><?php $attr3_empty='acls' ?><?php @@ -413,7 +414,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -448,7 +449,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -470,7 +471,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -485,7 +486,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LANGUAGE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LANGUAGE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_LANGUAGE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_LANGUAGE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -520,7 +521,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -542,7 +543,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php $attr5_list_tmp_key = $attr5_key; $attr5_list_tmp_value = $attr5_value; $attr5_list_extract = $attr5_extract; @@ -576,7 +577,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>$t,'suffix'=>'_abbrev','prefix'=>'acl_') ?><?php $attr7_class='text' ?><?php $attr7_key=$t ?><?php $attr7_suffix='_abbrev' ?><?php $attr7_prefix='acl_' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','key'=>$t,'suffix'=>'_abbrev','prefix'=>'acl_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key=$t ?><?php $attr7_suffix='_abbrev' ?><?php $attr7_prefix='acl_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -611,7 +612,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -633,7 +634,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_suffix) ?><?php unset($attr7_prefix) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_suffix) ?><?php unset($attr7_prefix) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -648,7 +649,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_delete') ?><?php $attr6_class='text' ?><?php $attr6_text='global_delete' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_delete','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_delete' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -683,7 +684,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -705,7 +706,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('list'=>'acls','extract'=>true,'key'=>'aclid','value'=>'acl') ?><?php $attr3_list='acls' ?><?php $attr3_extract=true ?><?php $attr3_key='aclid' ?><?php $attr3_value='acl' ?><?php @@ -858,7 +859,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','text'=>$username) ?><?php $attr7_class='text' ?><?php $attr7_text=$username ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','text'=>$username,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$username ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -893,7 +894,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -915,7 +916,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array('present'=>'groupname') ?><?php $attr6_present='groupname' ?><?php @@ -1020,7 +1021,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','text'=>$groupname) ?><?php $attr7_class='text' ?><?php $attr7_text=$groupname ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','text'=>$groupname,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$groupname ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1055,7 +1056,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1077,7 +1078,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array('not'=>true,'present'=>'username') ?><?php $attr6_not=true ?><?php $attr6_present='username' ?><?php @@ -1272,7 +1273,7 @@ if (isset($attr8_elementtype)) { } elseif (isset($attr8_fileext)) { ?><img src="<?php echo $image_dir.$attr8_fileext ?>" border="0" align="<?php echo $attr8_align ?>"><?php } elseif (isset($attr8_file)) { -?><img src="<?php echo $image_dir.$attr8_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } ?><?php unset($attr8) ?><?php unset($attr8_align) ?><?php unset($attr8_type) ?><?php $attr8 = array('class'=>'text','key'=>'global_all') ?><?php $attr8_class='text' ?><?php $attr8_key='global_all' ?><?php +?><img src="<?php echo $image_dir.$attr8_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr8_align ?>"><?php } ?><?php unset($attr8) ?><?php unset($attr8_align) ?><?php unset($attr8_type) ?><?php $attr8 = array('class'=>'text','key'=>'global_all','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key='global_all' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1307,7 +1308,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1329,7 +1330,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?><?php @@ -1350,7 +1351,7 @@ if (isset($attr8_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','var'=>'languagename') ?><?php $attr6_class='text' ?><?php $attr6_var='languagename' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','var'=>'languagename','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='languagename' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1385,7 +1386,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1407,7 +1408,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('list'=>'show','extract'=>false,'key'=>'list_key','value'=>'t') ?><?php $attr5_list='show' ?><?php $attr5_extract=false ?><?php $attr5_key='list_key' ?><?php $attr5_value='t' ?><?php $attr5_list_tmp_key = $attr5_key; $attr5_list_tmp_value = $attr5_value; $attr5_list_extract = $attr5_extract; @@ -1552,6 +1553,18 @@ if (isset($attr8_elementtype)) { if ( $exec ) { ?><?php unset($attr6) ?><?php unset($attr6_present) ?><?php $attr7 = array('title'=>'','target'=>'_self','url'=>$delete_url,'class'=>'') ?><?php $attr7_title='' ?><?php $attr7_target='_self' ?><?php $attr7_url=$delete_url ?><?php $attr7_class='' ?><?php + $params = array(); + if (!empty($attr7_var1) && isset($attr7_value1)) + $params[$attr7_var1]=$attr7_value1; + if (!empty($attr7_var2) && isset($attr7_value2)) + $params[$attr7_var2]=$attr7_value2; + if (!empty($attr7_var3) && isset($attr7_value3)) + $params[$attr7_var3]=$attr7_value3; + if (!empty($attr7_var4) && isset($attr7_value4)) + $params[$attr7_var4]=$attr7_value4; + if (!empty($attr7_var5) && isset($attr7_value5)) + $params[$attr7_var5]=$attr7_value5; + if(empty($attr7_class)) $attr7_class=''; if(empty($attr7_title)) @@ -1559,8 +1572,8 @@ if (isset($attr8_elementtype)) { if(!empty($attr7_url)) $tmp_url = $attr7_url; else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($$attr7_id)?$$attr7_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','key'=>'GLOBAL_DELETE') ?><?php $attr8_class='text' ?><?php $attr8_key='GLOBAL_DELETE' ?><?php + $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo $attr7_title ?>"><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_target) ?><?php unset($attr7_url) ?><?php unset($attr7_class) ?><?php $attr8 = array('class'=>'text','key'=>'GLOBAL_DELETE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_key='GLOBAL_DELETE' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1595,7 +1608,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1617,13 +1630,13 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_key) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></a><?php unset($attr6) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array() ?><?php if ( !$last_exec ) { -?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','key'=>'ACL_INHERITED') ?><?php $attr7_class='text' ?><?php $attr7_key='ACL_INHERITED' ?><?php +?><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','key'=>'ACL_INHERITED','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='ACL_INHERITED' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1658,7 +1671,7 @@ if (isset($attr8_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1680,7 +1693,7 @@ if (isset($attr8_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> diff --git a/themes/default/pages/html/page/changetemplate.tpl.php b/themes/default/pages/html/page/changetemplate.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'page_template_old') ?><?php $attr6_class='text' ?><?php $attr6_text='page_template_old' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'page_template_old','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='page_template_old' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -228,6 +236,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'template_url','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='template_url' ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -235,7 +255,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','type'=>'template') ?><?php $attr7_align='left' ?><?php $attr7_type='template' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -248,7 +268,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'template_name') ?><?php $attr7_class='text' ?><?php $attr7_var='template_name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'template_name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='template_name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -283,7 +303,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -305,7 +325,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -334,7 +354,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'page_template_new') ?><?php $attr6_class='text' ?><?php $attr6_text='page_template_new' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'page_template_new','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='page_template_new' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -369,7 +389,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -391,7 +411,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -412,7 +432,7 @@ if (count($$attr6_list)==1) echo ' disabled="disabled"' $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -457,13 +477,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/page/changetemplateselectelements.tpl.php b/themes/default/pages/html/page/changetemplateselectelements.tpl.php @@ -1,51 +1,72 @@ -<?php $attr = array('class'=>'main') ?><?php $attr_class='main' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<?php $attr1 = array('class'=>'main','title'=>$cms_title) ?><?php $attr1_class='main' ?><?php $attr1_title=$cms_title ?><?php header('Content-Type: text/html; charset='.lang('CHARSET')) +?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> -<!-- $Id$ --> <head> - <title><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title><?php echo $attr1_title ?></title> + <meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" /> <meta name="MSSmartTagsPreventParsing" content="true" /> <meta name="robots" content="noindex,nofollow" /> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu ) + { + ?> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" /> +<?php + } +?> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> -<body class="<?php echo $attr_class ?>"> - +<body class="<?php echo $attr1_class ?>"> -<?php unset($attr) ?><?php unset($attr_class) ?><?php $attr = array('action'=>'','subaction'=>'','id'=>'','name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr_action='' ?><?php $attr_subaction='' ?><?php $attr_id='' ?><?php $attr_name='' ?><?php $attr_target='_self' ?><?php $attr_method='post' ?><?php $attr_enctype='application/x-www-form-urlencoded' ?><?php - if (empty($attr_action)) - $attr_action = $actionName; - if (empty($attr_subaction)) - $attr_subaction = $targetSubActionName; - if (empty($attr_id)) - $attr_id = $this->getRequestId(); +<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php + if (empty($attr2_action)) + $attr2_action = $actionName; + if (empty($attr2_subaction)) + $attr2_subaction = $targetSubActionName; + if (empty($attr2_id)) + $attr2_id = $this->getRequestId(); -?><form name="<?php echo $attr_name ?>" - target="<?php echo $attr_target ?>" - action="<?php echo Html::url( $attr_action,$attr_subaction,$attr_id ) ?>" - method="<?php echo $attr_method ?>" - enctype="<?php echo $attr_enctype ?>"> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php +?><form name="<?php echo $attr2_name ?>" + target="<?php echo $attr2_target ?>" + action="<?php echo Html::url( $attr2_action,$attr2_subaction,$attr2_id ) ?>" + method="<?php echo $attr2_method ?>" + enctype="<?php echo $attr2_enctype ?>"> +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_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('name'=>'newTemplateId','default'=>'newTemplateId') ?><?php $attr_name='newTemplateId' ?><?php $attr_default='newTemplateId' ?><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('title'=>'','name'=>'','icon'=>'','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='' ?><?php $attr_icon='' ?><?php $attr_widths='' ?><?php $attr_width='85%' ?><?php +?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('name'=>'newTemplateId','default'=>'newTemplateId') ?><?php $attr3_name='newTemplateId' ?><?php $attr3_default='newTemplateId' ?><input type="hidden" name="<?php echo $attr3_name ?>" value="<?php echo isset($$attr3_name)?$$attr3_name:$attr3_default ?>" /><?php unset($attr3) ?><?php unset($attr3_name) ?><?php unset($attr3_default) ?><?php $attr3 = array('width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); - if (!empty($attr_widths)) + if (!empty($attr3_widths)) + { + $column_widths = explode(',',$attr3_widths); + unset($attr3['widths']); + } + if (!empty($attr3_rowclasses)) { - $column_widths = explode(',',$attr_widths); - unset($attr['widths']); + $row_classes = explode(',',$attr3_rowclasses); + $row_class_idx = 999; + unset($attr3['rowclasses']); + } + if (!empty($attr3_columnclasses)) + { + $column_classes = explode(',',$attr3_columnclasses); + unset($attr3['columnclasses']); } global $image_dir; echo '<br/><br/><br/><center>'; - echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; + echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">'; echo '<tr><td class="menu">'; - if ( !empty($attr_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !empty($attr3_icon) ) + echo '<img src="'.$image_dir.'icon_'.$attr3_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !isset($path) || is_array($path) ) + $path = array(); foreach( $path as $pathElement) { extract($pathElement); @@ -54,12 +75,34 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </th> + </td><!--<td class="menu" style="align:right;"> + <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) + { + ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php + } + ?> + </td>--> </tr> <tr><td class="subaction"> - <?php foreach( $windowMenu as $menu ) + + <?php if ( !isset($windowMenu) || !is_array($windowMenu) ) + $windowMenu = array(); + foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -76,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -90,106 +134,164 @@ <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_name) ?><?php unset($attr_icon) ?><?php unset($attr_widths) ?><?php unset($attr_width) ?><?php $attr = array('list'=>'oldTemplateElements','extract'=>'false','key'=>'oldId','value'=>'oldName') ?><?php $attr_list='oldTemplateElements' ?><?php $attr_extract='false' ?><?php $attr_key='oldId' ?><?php $attr_value='oldName' ?><?php - $list_tmp_key = $attr_key; - $list_tmp_value = $attr_value; - $list_extract = ($attr_extract=='true'); + <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr3) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4 = array('list'=>'oldTemplateElements','extract'=>false,'key'=>'oldId','value'=>'oldName') ?><?php $attr4_list='oldTemplateElements' ?><?php $attr4_extract=false ?><?php $attr4_key='oldId' ?><?php $attr4_value='oldName' ?><?php + $attr4_list_tmp_key = $attr4_key; + $attr4_list_tmp_value = $attr4_value; + $attr4_list_extract = $attr4_extract; + if ( !isset($$attr4_list) || !is_array($$attr4_list) ) + $$attr4_list = array(); - foreach( $$attr_list as $$list_tmp_key => $$list_tmp_value ) + foreach( $$attr4_list as $$attr4_list_tmp_key => $$attr4_list_tmp_value ) { - if ( $list_extract ) + if ( $attr4_list_extract ) { - if ( !is_array($$list_tmp_value) ) + if ( !is_array($$attr4_list_tmp_value) ) { - print_r($$list_tmp_value); - die( 'not an array at key: '.$$list_tmp_key ); + print_r($$attr4_list_tmp_value); + die( 'not an array at key: '.$$attr4_list_tmp_key ); } - extract($$list_tmp_value); + extract($$attr4_list_tmp_value); } -?><?php unset($attr) ?><?php unset($attr_list) ?><?php unset($attr_extract) ?><?php unset($attr_key) ?><?php unset($attr_value) ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?><?php unset($attr4) ?><?php unset($attr4_list) ?><?php unset($attr4_extract) ?><?php unset($attr4_key) ?><?php unset($attr4_value) ?><?php $attr5 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr5_class)) + $attr5_class=$row_class; + global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php - global $fx; - if (!isset($attr_class)) $attr_class=''; - if ($attr_class=='fx') $attr['class']=$fx; +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +// if (empty($attr6_class)) +// $attr6['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($attr6_class)) + $attr6['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) + $attr6['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'=>'oldName','text'=>'','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='oldName' ?><?php $attr_text='' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php - if (!empty($attr_array)) +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','var'=>'oldName','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='oldName' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; + + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); + else + $attr7_title = ''; + +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; + + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr7_text]); + } + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); + else + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; + else + { + $tmp_text = '&nbsp;'; + //Html::debug($attr7);echo 'text error'; } - elseif (!empty($attr_text)) - $tmp_text = lang($attr_text); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?htmlentities($$attr_var):'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - else echo 'text error'; - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + + if (isset($attr7_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></span><?php unset($attr) ?><?php unset($attr_title) ?><?php unset($attr_class) ?><?php unset($attr_var) ?><?php unset($attr_text) ?><?php unset($attr_raw) ?><?php unset($attr_maxlength) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'fx','colspan'=>'') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='fx' ?><?php $attr_colspan='' ?><?php - global $fx; - if (!isset($attr_class)) $attr_class=''; - if ($attr_class=='fx') $attr['class']=$fx; +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +// if (empty($attr6_class)) +// $attr6['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($attr6_class)) + $attr6['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) + $attr6['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $listName = 'newTemplateElementsOf'.$oldId; echo Html::selectBox('from'.$oldId,$$listName) ?> +<?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; -?><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 $listName = 'newTemplateElementsOf'.$oldId; echo Html::selectBox('from'.$oldId,$$listName) ?> -<?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?><?php } ?><?php unset($attr) ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - global $cell_column_nr; $cell_column_nr=0; + + $column_class_idx = 999; -?><tr><?php unset($attr) ?><?php $attr = array('width'=>'','style'=>'','class'=>'act','colspan'=>'2') ?><?php $attr_width='' ?><?php $attr_style='' ?><?php $attr_class='act' ?><?php $attr_colspan='2' ?><?php - global $fx; - if (!isset($attr_class)) $attr_class=''; - if ($attr_class=='fx') $attr['class']=$fx; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['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 - if ($attr_type=='ok') - { - $attr_type = 'submit'; - $attr_class = 'ok'; - $attr_text = 'BUTTON_OK'; - $attr_value = 'ok'; - } -?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php $attr = array() ?></td><?php unset($attr) ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php $attr = array() ?> </table> +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php + if ($attr6_type=='ok') + $attr6_type = 'submit'; + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> @@ -203,7 +305,9 @@ <?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() ?> +<?php unset($attr2) ?><?php $attr1 = array() ?></form> + +<?php unset($attr1) ?><?php $attr0 = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> @@ -214,4 +318,4 @@ <?php } ?> </body> -</html><?php unset($attr) ?>- \ No newline at end of file +</html><?php unset($attr0) ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/page/el.tpl.php b/themes/default/pages/html/page/el.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'PAGE_ELEMENT_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='PAGE_ELEMENT_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'PAGE_ELEMENT_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='PAGE_ELEMENT_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -269,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -291,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -306,7 +307,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'PAGE_ELEMENT_VALUE') ?><?php $attr6_class='text' ?><?php $attr6_text='PAGE_ELEMENT_VALUE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'PAGE_ELEMENT_VALUE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='PAGE_ELEMENT_VALUE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -341,7 +342,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -363,7 +364,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -378,7 +379,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_ARCHIVE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_ARCHIVE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_ARCHIVE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_ARCHIVE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -413,7 +414,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -435,7 +436,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('empty'=>'el') ?><?php $attr3_empty='el' ?><?php @@ -557,7 +558,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NOT_FOUND' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -592,7 +593,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -614,7 +615,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='el' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php @@ -666,6 +667,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'desc','target'=>'_self','url'=>$url,'class'=>'') ?><?php $attr6_title='desc' ?><?php $attr6_target='_self' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -673,7 +686,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','elementtype'=>$type) ?><?php $attr7_align='left' ?><?php $attr7_elementtype=$type ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -686,7 +699,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_elementtype) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_elementtype) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -721,7 +734,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -743,7 +756,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -758,7 +771,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'value') ?><?php $attr6_class='text' ?><?php $attr6_var='value' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'value','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='value' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -793,7 +806,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -815,7 +828,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -850,7 +863,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -872,7 +885,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -888,6 +901,18 @@ if (isset($attr7_elementtype)) { $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>$archive_url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url=$archive_url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -895,8 +920,8 @@ if (isset($attr7_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_ARCHIVE') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_ARCHIVE' ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_ARCHIVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_ARCHIVE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -931,7 +956,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -953,7 +978,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'_(') ?><?php $attr6_class='text' ?><?php $attr6_raw='_(' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_(' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -988,7 +1013,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1010,7 +1035,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr6 = array('class'=>'text','text'=>$archive_count) ?><?php $attr6_class='text' ?><?php $attr6_text=$archive_count ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6 = array('class'=>'text','text'=>$archive_count,'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=$archive_count ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1045,7 +1070,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1067,7 +1092,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr6 = array('class'=>'text','raw'=>')') ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -1102,7 +1127,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1124,7 +1149,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1153,7 +1178,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','text'=>'PAGE_ELEMENTS_DESC') ?><?php $attr5_class='text' ?><?php $attr5_text='PAGE_ELEMENTS_DESC' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','text'=>'PAGE_ELEMENTS_DESC','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='PAGE_ELEMENTS_DESC' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1188,7 +1213,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1210,7 +1235,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1239,7 +1264,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','raw'=>'_') ?><?php $attr5_class='text' ?><?php $attr5_raw='_' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1274,7 +1299,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1296,7 +1321,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?> </table> +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/page/form.tpl.php b/themes/default/pages/html/page/form.tpl.php @@ -70,7 +70,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { diff --git a/themes/default/pages/html/page/prop.tpl.php b/themes/default/pages/html/page/prop.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -140,7 +148,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_name') ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'name','default'=>'','type'=>'text','name'=>'name','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='name' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -242,7 +250,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -257,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_filename') ?><?php $attr6_class='text' ?><?php $attr6_text='global_filename' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_filename','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_filename' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -292,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -314,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -329,7 +337,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'filename','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='filename' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'filename','default'=>'','type'=>'text','name'=>'filename','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='filename' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='filename' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -344,7 +352,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -359,7 +367,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_description') ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'global_description','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -394,7 +402,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -416,7 +424,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -431,7 +439,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('name'=>'description','rows'=>'10','cols'=>'40','class'=>'','default'=>'') ?><?php $attr6_name='description' ?><?php $attr6_rows='10' ?><?php $attr6_cols='40' ?><?php $attr6_class='' ?><?php $attr6_default='' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'description','rows'=>'10','cols'=>'40','class'=>'description','default'=>'') ?><?php $attr6_name='description' ?><?php $attr6_rows='10' ?><?php $attr6_cols='40' ?><?php $attr6_class='description' ?><?php $attr6_default='' ?><textarea class="<?php echo $attr6_class ?>" name="<?php echo $attr6_name ?>" rows="<?php echo $attr6_rows ?>" cols="<?php echo $attr6_cols ?>"><?php echo htmlentities(isset($$attr6_name)?$$attr6_name:$attr6_default) ?></textarea><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_rows) ?><?php unset($attr6_cols) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -462,13 +470,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/page/pub.tpl.php b/themes/default/pages/html/page/pub.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -160,7 +168,7 @@ $checked = $$attr6_name; else $checked = $attr6_default; -?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -195,7 +203,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -217,7 +225,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr6 = array('class'=>'text','text'=>'global_files') ?><?php $attr6_class='text' ?><?php $attr6_text='global_files' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr6 = array('class'=>'text','text'=>'global_files','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_files' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -252,7 +260,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -274,7 +282,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -305,13 +313,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/page/showprop.tpl.php b/themes/default/pages/html/page/showprop.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -77,7 +77,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -94,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -137,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_name') ?><?php $attr5_class='text' ?><?php $attr5_text='global_name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -172,7 +180,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -194,7 +202,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -209,7 +217,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name') ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='name' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -244,7 +252,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -266,7 +274,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -295,7 +303,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_filename') ?><?php $attr5_class='text' ?><?php $attr5_text='global_filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -330,7 +338,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -352,7 +360,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -367,7 +375,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'filename') ?><?php $attr5_class='text' ?><?php $attr5_var='filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -402,7 +410,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -424,7 +432,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -453,7 +461,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_description') ?><?php $attr5_class='text' ?><?php $attr5_text='global_description' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_description','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_description' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -488,7 +496,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -510,7 +518,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -525,7 +533,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'description') ?><?php $attr5_class='text' ?><?php $attr5_var='description' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'description','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='description' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -560,7 +568,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -582,7 +590,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -611,7 +619,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'page_template') ?><?php $attr5_class='text' ?><?php $attr5_text='page_template' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'page_template','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='page_template' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -646,7 +654,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -668,7 +676,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -774,6 +782,18 @@ if ( $exec ) { ?><?php unset($attr5) ?><?php unset($attr5_present) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>'template_url','class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url='template_url' ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -781,7 +801,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('file'=>'icon_template','align'=>'left') ?><?php $attr7_file='icon_template' ?><?php $attr7_align='left' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -794,7 +814,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','var'=>'template_name') ?><?php $attr7_class='text' ?><?php $attr7_var='template_name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','var'=>'template_name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='template_name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -829,7 +849,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -851,7 +871,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('empty'=>'template_url') ?><?php $attr5_empty='template_url' ?><?php @@ -956,7 +976,7 @@ if (isset($attr6_elementtype)) { } elseif (isset($attr6_fileext)) { ?><img src="<?php echo $image_dir.$attr6_fileext ?>" border="0" align="<?php echo $attr6_align ?>"><?php } elseif (isset($attr6_file)) { -?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_file) ?><?php unset($attr6_align) ?><?php $attr6 = array('class'=>'text','var'=>'template_name') ?><?php $attr6_class='text' ?><?php $attr6_var='template_name' ?><?php +?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_file) ?><?php unset($attr6_align) ?><?php $attr6 = array('class'=>'text','var'=>'template_name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='template_name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -991,7 +1011,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -1013,7 +1033,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php @@ -1045,7 +1065,7 @@ if (isset($attr6_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_full_filename') ?><?php $attr5_class='text' ?><?php $attr5_text='global_full_filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_full_filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_full_filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1080,7 +1100,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1102,7 +1122,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -1117,7 +1137,7 @@ if (isset($attr6_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'full_filename') ?><?php $attr5_class='text' ?><?php $attr5_var='full_filename' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'full_filename','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='full_filename' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1152,7 +1172,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1174,7 +1194,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -1203,7 +1223,7 @@ if (isset($attr6_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created') ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_created','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_created' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1238,7 +1258,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1260,7 +1280,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -1331,7 +1351,7 @@ if (isset($attr6_elementtype)) { echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1366,7 +1386,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1388,7 +1408,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>'create_user') ?><?php $attr5_user='create_user' ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else @@ -1432,7 +1452,7 @@ if (isset($attr6_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange') ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','text'=>'global_lastchange','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_text='global_lastchange' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1467,7 +1487,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1489,7 +1509,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('class'=>'fx') ?><?php $attr4_class='fx' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -1560,7 +1580,7 @@ if (isset($attr6_elementtype)) { echo '</span>'; } -?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_') ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php +?><?php unset($attr5) ?><?php unset($attr5_date) ?><?php $attr5 = array('class'=>'text','raw'=>',_','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw=',_' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -1595,7 +1615,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -1617,7 +1637,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('user'=>'lastchange_user') ?><?php $attr5_user='lastchange_user' ?><?php if ( is_object($attr5_user) ) $user = $attr5_user; else diff --git a/themes/default/pages/html/page/src.tpl.php b/themes/default/pages/html/page/src.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -77,7 +77,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -94,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -138,7 +146,7 @@ $attr4['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><pre> -<?php $attr5 = array('class'=>'text','var'=>'src') ?><?php $attr5_class='text' ?><?php $attr5_var='src' ?><?php +<?php $attr5 = array('class'=>'text','var'=>'src','escape'=>false) ?><?php $attr5_class='text' ?><?php $attr5_var='src' ?><?php $attr5_escape=false ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -173,7 +181,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -195,7 +203,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?></pre> +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?></pre> <?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> diff --git a/themes/default/pages/html/pageelement/advanced.tpl.php b/themes/default/pages/html/pageelement/advanced.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','var'=>'desc') ?><?php $attr6_class='text' ?><?php $attr6_var='desc' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','var'=>'desc','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='desc' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php // Wahr-Vergleich // Html::debug($attr4); @@ -383,7 +391,7 @@ if (isset($attr9_elementtype)) { } elseif (isset($attr9_fileext)) { ?><img src="<?php echo $image_dir.$attr9_fileext ?>" border="0" align="<?php echo $attr9_align ?>"><?php } elseif (isset($attr9_file)) { -?><img src="<?php echo $image_dir.$attr9_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php } ?><?php unset($attr9) ?><?php unset($attr9_file) ?><?php unset($attr9_align) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?><img src="<?php echo $image_dir.$attr9_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php } ?><?php unset($attr9) ?><?php unset($attr9_file) ?><?php unset($attr9_align) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -418,7 +426,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -440,7 +448,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>$monthname) ?><?php $attr8_class='text' ?><?php $attr8_text=$monthname ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>$monthname,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=$monthname ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -475,7 +483,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -497,7 +505,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -532,7 +540,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -554,7 +562,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextmonthurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextmonthurl ?><?php $attr8_class='' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextmonthurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextmonthurl ?><?php $attr8_class='' ?><?php if(empty($attr8_class)) $attr8_class=''; if(empty($attr8_title)) @@ -575,7 +583,7 @@ if (isset($attr9_elementtype)) { } elseif (isset($attr9_fileext)) { ?><img src="<?php echo $image_dir.$attr9_fileext ?>" border="0" align="<?php echo $attr9_align ?>"><?php } elseif (isset($attr9_file)) { -?><img src="<?php echo $image_dir.$attr9_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php } ?><?php unset($attr9) ?><?php unset($attr9_file) ?><?php unset($attr9_align) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','raw'=>'_____') ?><?php $attr8_class='text' ?><?php $attr8_raw='_____' ?><?php +?><img src="<?php echo $image_dir.$attr9_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php } ?><?php unset($attr9) ?><?php unset($attr9_file) ?><?php unset($attr9_align) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','raw'=>'_____','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_____' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -610,7 +618,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -632,7 +640,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$lastyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$lastyearurl ?><?php $attr8_class='' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$lastyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$lastyearurl ?><?php $attr8_class='' ?><?php if(empty($attr8_class)) $attr8_class=''; if(empty($attr8_title)) @@ -653,7 +661,7 @@ if (isset($attr9_elementtype)) { } elseif (isset($attr9_fileext)) { ?><img src="<?php echo $image_dir.$attr9_fileext ?>" border="0" align="<?php echo $attr9_align ?>"><?php } elseif (isset($attr9_file)) { -?><img src="<?php echo $image_dir.$attr9_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php } ?><?php unset($attr9) ?><?php unset($attr9_file) ?><?php unset($attr9_align) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?><img src="<?php echo $image_dir.$attr9_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr9_align ?>"><?php } ?><?php unset($attr9) ?><?php unset($attr9_file) ?><?php unset($attr9_align) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -688,7 +696,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -710,7 +718,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>$yearname) ?><?php $attr8_class='text' ?><?php $attr8_text=$yearname ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>$yearname,'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=$yearname ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -745,7 +753,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -767,7 +775,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -802,7 +810,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -824,7 +832,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextyearurl ?><?php $attr8_class='' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$nextyearurl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$nextyearurl ?><?php $attr8_class='' ?><?php if(empty($attr8_class)) $attr8_class=''; if(empty($attr8_title)) @@ -874,7 +882,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','text'=>lang('global_nr')) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('global_nr') ?><?php +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php $attr8 = array('class'=>'text','text'=>lang('global_nr'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('global_nr') ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -909,7 +917,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -931,7 +939,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('list'=>'weekdays','extract'=>false,'key'=>'list_key','value'=>'weekday') ?><?php $attr7_list='weekdays' ?><?php $attr7_extract=false ?><?php $attr7_key='list_key' ?><?php $attr7_value='weekday' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('list'=>'weekdays','extract'=>false,'key'=>'list_key','value'=>'weekday') ?><?php $attr7_list='weekdays' ?><?php $attr7_extract=false ?><?php $attr7_key='list_key' ?><?php $attr7_value='weekday' ?><?php $attr7_list_tmp_key = $attr7_key; $attr7_list_tmp_value = $attr7_value; $attr7_list_extract = $attr7_extract; @@ -965,7 +973,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr8 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr8) ?><?php $attr9 = array('class'=>'text','text'=>$weekday) ?><?php $attr9_class='text' ?><?php $attr9_text=$weekday ?><?php +?><td <?php foreach( $attr8 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr8) ?><?php $attr9 = array('class'=>'text','text'=>$weekday,'escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text=$weekday ?><?php $attr9_escape=true ?><?php if ( isset($attr9_prefix)&& isset($attr9_key)) $attr9_key = $attr9_prefix.$attr9_key; if ( isset($attr9_suffix)&& isset($attr9_key)) @@ -1000,7 +1008,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr9_key)) $tmp_text = lang($attr9_key); elseif (!empty($attr9_var)) - $tmp_text = isset($$attr9_var)?htmlentities($$attr9_var):'error: variable '.$attr9_var.' not present'; + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; elseif (!empty($attr9_raw)) $tmp_text = str_replace('_','&nbsp;',$attr9_raw); elseif (!empty($attr9_value)) @@ -1022,7 +1030,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6 = array('list'=>'weeklist','extract'=>false,'key'=>'weeknr','value'=>'week') ?><?php $attr6_list='weeklist' ?><?php $attr6_extract=false ?><?php $attr6_key='weeknr' ?><?php $attr6_value='week' ?><?php +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr6 = array('list'=>'weeklist','extract'=>false,'key'=>'weeknr','value'=>'week') ?><?php $attr6_list='weeklist' ?><?php $attr6_extract=false ?><?php $attr6_key='weeknr' ?><?php $attr6_value='week' ?><?php $attr6_list_tmp_key = $attr6_key; $attr6_list_tmp_value = $attr6_value; $attr6_list_extract = $attr6_extract; @@ -1070,7 +1078,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr8 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr8) ?><?php unset($attr8_width) ?><?php $attr9 = array('class'=>'text','text'=>$weeknr) ?><?php $attr9_class='text' ?><?php $attr9_text=$weeknr ?><?php +?><td <?php foreach( $attr8 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr8) ?><?php unset($attr8_width) ?><?php $attr9 = array('class'=>'text','text'=>$weeknr,'escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text=$weeknr ?><?php $attr9_escape=true ?><?php if ( isset($attr9_prefix)&& isset($attr9_key)) $attr9_key = $attr9_prefix.$attr9_key; if ( isset($attr9_suffix)&& isset($attr9_key)) @@ -1105,7 +1113,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr9_key)) $tmp_text = lang($attr9_key); elseif (!empty($attr9_var)) - $tmp_text = isset($$attr9_var)?htmlentities($$attr9_var):'error: variable '.$attr9_var.' not present'; + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; elseif (!empty($attr9_raw)) $tmp_text = str_replace('_','&nbsp;',$attr9_raw); elseif (!empty($attr9_value)) @@ -1127,7 +1135,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr8 = array('list'=>'week','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr8_list='week' ?><?php $attr8_extract=true ?><?php $attr8_key='list_key' ?><?php $attr8_value='list_value' ?><?php +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7 = array() ?></td><?php unset($attr7) ?><?php $attr8 = array('list'=>'week','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr8_list='week' ?><?php $attr8_extract=true ?><?php $attr8_key='list_key' ?><?php $attr8_value='list_value' ?><?php $attr8_list_tmp_key = $attr8_key; $attr8_list_tmp_value = $attr8_value; $attr8_list_extract = $attr8_extract; @@ -1251,7 +1259,7 @@ if (isset($attr9_elementtype)) { if ( $exec ) { -?><?php unset($attr10) ?><?php unset($attr10_empty) ?><?php $attr11 = array('class'=>'text','raw'=>'__') ?><?php $attr11_class='text' ?><?php $attr11_raw='__' ?><?php +?><?php unset($attr10) ?><?php unset($attr10_empty) ?><?php $attr11 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_raw='__' ?><?php $attr11_escape=true ?><?php if ( isset($attr11_prefix)&& isset($attr11_key)) $attr11_key = $attr11_prefix.$attr11_key; if ( isset($attr11_suffix)&& isset($attr11_key)) @@ -1286,7 +1294,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr11_key)) $tmp_text = lang($attr11_key); elseif (!empty($attr11_var)) - $tmp_text = isset($$attr11_var)?htmlentities($$attr11_var):'error: variable '.$attr11_var.' not present'; + $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?'; elseif (!empty($attr11_raw)) $tmp_text = str_replace('_','&nbsp;',$attr11_raw); elseif (!empty($attr11_value)) @@ -1308,7 +1316,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php $attr11 = array('class'=>'text','text'=>$nr) ?><?php $attr11_class='text' ?><?php $attr11_text=$nr ?><?php +?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr11 = array('class'=>'text','text'=>$nr,'escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_text=$nr ?><?php $attr11_escape=true ?><?php if ( isset($attr11_prefix)&& isset($attr11_key)) $attr11_key = $attr11_prefix.$attr11_key; if ( isset($attr11_suffix)&& isset($attr11_key)) @@ -1343,7 +1351,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr11_key)) $tmp_text = lang($attr11_key); elseif (!empty($attr11_var)) - $tmp_text = isset($$attr11_var)?htmlentities($$attr11_var):'error: variable '.$attr11_var.' not present'; + $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?'; elseif (!empty($attr11_raw)) $tmp_text = str_replace('_','&nbsp;',$attr11_raw); elseif (!empty($attr11_value)) @@ -1365,7 +1373,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_text) ?><?php $attr11 = array('class'=>'text','raw'=>'__') ?><?php $attr11_class='text' ?><?php $attr11_raw='__' ?><?php +?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_text) ?><?php unset($attr11_escape) ?><?php $attr11 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_raw='__' ?><?php $attr11_escape=true ?><?php if ( isset($attr11_prefix)&& isset($attr11_key)) $attr11_key = $attr11_prefix.$attr11_key; if ( isset($attr11_suffix)&& isset($attr11_key)) @@ -1400,7 +1408,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr11_key)) $tmp_text = lang($attr11_key); elseif (!empty($attr11_var)) - $tmp_text = isset($$attr11_var)?htmlentities($$attr11_var):'error: variable '.$attr11_var.' not present'; + $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?'; elseif (!empty($attr11_raw)) $tmp_text = str_replace('_','&nbsp;',$attr11_raw); elseif (!empty($attr11_value)) @@ -1422,7 +1430,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php $attr9 = array() ?><?php +?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr10 = array('not'=>true,'empty'=>'url') ?><?php $attr10_not=true ?><?php $attr10_empty='url' ?><?php @@ -1524,7 +1532,7 @@ if (isset($attr9_elementtype)) { $tmp_url = $attr11_url; else $tmp_url = Html::url($attr11_action,$attr11_subaction,!empty($$attr11_id)?$$attr11_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr11_class ?>" target="<?php echo $attr11_target ?>"<?php if (isset($attr11_accesskey)) echo ' accesskey="'.$attr11_accesskey.'"' ?> title="<?php echo $attr11_title ?>"><?php unset($attr11) ?><?php unset($attr11_title) ?><?php unset($attr11_target) ?><?php unset($attr11_url) ?><?php unset($attr11_class) ?><?php $attr12 = array('class'=>'text','raw'=>'__') ?><?php $attr12_class='text' ?><?php $attr12_raw='__' ?><?php +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr11_class ?>" target="<?php echo $attr11_target ?>"<?php if (isset($attr11_accesskey)) echo ' accesskey="'.$attr11_accesskey.'"' ?> title="<?php echo $attr11_title ?>"><?php unset($attr11) ?><?php unset($attr11_title) ?><?php unset($attr11_target) ?><?php unset($attr11_url) ?><?php unset($attr11_class) ?><?php $attr12 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr12_class='text' ?><?php $attr12_raw='__' ?><?php $attr12_escape=true ?><?php if ( isset($attr12_prefix)&& isset($attr12_key)) $attr12_key = $attr12_prefix.$attr12_key; if ( isset($attr12_suffix)&& isset($attr12_key)) @@ -1559,7 +1567,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr12_key)) $tmp_text = lang($attr12_key); elseif (!empty($attr12_var)) - $tmp_text = isset($$attr12_var)?htmlentities($$attr12_var):'error: variable '.$attr12_var.' not present'; + $tmp_text = isset($$attr12_var)?($attr12_escape?htmlentities($$attr12_var):$$attr12_var):'?'.$attr12_var.'?'; elseif (!empty($attr12_raw)) $tmp_text = str_replace('_','&nbsp;',$attr12_raw); elseif (!empty($attr12_value)) @@ -1581,7 +1589,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php $attr12 = array('class'=>'text','text'=>$nr) ?><?php $attr12_class='text' ?><?php $attr12_text=$nr ?><?php +?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php unset($attr12_escape) ?><?php $attr12 = array('class'=>'text','text'=>$nr,'escape'=>true) ?><?php $attr12_class='text' ?><?php $attr12_text=$nr ?><?php $attr12_escape=true ?><?php if ( isset($attr12_prefix)&& isset($attr12_key)) $attr12_key = $attr12_prefix.$attr12_key; if ( isset($attr12_suffix)&& isset($attr12_key)) @@ -1616,7 +1624,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr12_key)) $tmp_text = lang($attr12_key); elseif (!empty($attr12_var)) - $tmp_text = isset($$attr12_var)?htmlentities($$attr12_var):'error: variable '.$attr12_var.' not present'; + $tmp_text = isset($$attr12_var)?($attr12_escape?htmlentities($$attr12_var):$$attr12_var):'?'.$attr12_var.'?'; elseif (!empty($attr12_raw)) $tmp_text = str_replace('_','&nbsp;',$attr12_raw); elseif (!empty($attr12_value)) @@ -1638,7 +1646,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_text) ?><?php $attr12 = array('class'=>'text','raw'=>'__') ?><?php $attr12_class='text' ?><?php $attr12_raw='__' ?><?php +?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_text) ?><?php unset($attr12_escape) ?><?php $attr12 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr12_class='text' ?><?php $attr12_raw='__' ?><?php $attr12_escape=true ?><?php if ( isset($attr12_prefix)&& isset($attr12_key)) $attr12_key = $attr12_prefix.$attr12_key; if ( isset($attr12_suffix)&& isset($attr12_key)) @@ -1673,7 +1681,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr12_key)) $tmp_text = lang($attr12_key); elseif (!empty($attr12_var)) - $tmp_text = isset($$attr12_var)?htmlentities($$attr12_var):'error: variable '.$attr12_var.' not present'; + $tmp_text = isset($$attr12_var)?($attr12_escape?htmlentities($$attr12_var):$$attr12_var):'?'.$attr12_var.'?'; elseif (!empty($attr12_raw)) $tmp_text = str_replace('_','&nbsp;',$attr12_raw); elseif (!empty($attr12_value)) @@ -1695,7 +1703,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php $attr10 = array() ?></a><?php unset($attr10) ?><?php $attr9 = array() ?><?php +?></span><?php unset($attr12) ?><?php unset($attr12_class) ?><?php unset($attr12_raw) ?><?php unset($attr12_escape) ?><?php $attr10 = array() ?></a><?php unset($attr10) ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr10 = array('true'=>$today) ?><?php $attr10_true=$today ?><?php @@ -1788,7 +1796,7 @@ if (isset($attr9_elementtype)) { if ( $exec ) { -?><?php unset($attr10) ?><?php unset($attr10_true) ?><?php $attr11 = array('class'=>'text','raw'=>'*') ?><?php $attr11_class='text' ?><?php $attr11_raw='*' ?><?php +?><?php unset($attr10) ?><?php unset($attr10_true) ?><?php $attr11 = array('class'=>'text','raw'=>'*','escape'=>true) ?><?php $attr11_class='text' ?><?php $attr11_raw='*' ?><?php $attr11_escape=true ?><?php if ( isset($attr11_prefix)&& isset($attr11_key)) $attr11_key = $attr11_prefix.$attr11_key; if ( isset($attr11_suffix)&& isset($attr11_key)) @@ -1823,7 +1831,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr11_key)) $tmp_text = lang($attr11_key); elseif (!empty($attr11_var)) - $tmp_text = isset($$attr11_var)?htmlentities($$attr11_var):'error: variable '.$attr11_var.' not present'; + $tmp_text = isset($$attr11_var)?($attr11_escape?htmlentities($$attr11_var):$$attr11_var):'?'.$attr11_var.'?'; elseif (!empty($attr11_raw)) $tmp_text = str_replace('_','&nbsp;',$attr11_raw); elseif (!empty($attr11_value)) @@ -1845,7 +1853,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php $attr9 = array() ?><?php +?></span><?php unset($attr11) ?><?php unset($attr11_class) ?><?php unset($attr11_raw) ?><?php unset($attr11_escape) ?><?php $attr9 = array() ?><?php } ?><?php unset($attr9) ?><?php $attr8 = array() ?></td><?php unset($attr8) ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr6 = array() ?></tr><?php unset($attr6) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr6 = array() ?><?php @@ -1877,7 +1885,7 @@ if (isset($attr9_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('class'=>'text','text'=>lang('date')) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('date') ?><?php +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('class'=>'text','text'=>lang('date'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('date') ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1912,7 +1920,7 @@ if (isset($attr9_elementtype)) { elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1934,7 +1942,7 @@ if (isset($attr9_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php // if (empty($attr7_class)) // $attr7['class']=$row_class; $column_class_idx++; @@ -1955,7 +1963,7 @@ if (count($$attr8_list)==1) echo ' disabled="disabled"' $attr8_tmp_list = $$attr8_list; if ( isset($$attr8_name) && isset($attr8_tmp_list[$$attr8_name]) ) $attr8_tmp_default = $$attr8_name; - elseif ( isset($$attr8_default) ) + elseif ( isset($attr8_default) ) $attr8_tmp_default = $attr8_default; else $attr8_tmp_default = ''; @@ -1969,7 +1977,7 @@ if (count($$attr8_list)==1) echo ' disabled="disabled"' } ?></select><?php if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" value="'.$box_key.'" />' -?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php +?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -2004,7 +2012,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -2026,13 +2034,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('list'=>'all_months','name'=>'month','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_months' ?><?php $attr8_name='month' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('list'=>'all_months','name'=>'month','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_months' ?><?php $attr8_name='month' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php if (count($$attr8_list)==1) echo ' disabled="disabled"' ?>><?php $attr8_tmp_list = $$attr8_list; if ( isset($$attr8_name) && isset($attr8_tmp_list[$$attr8_name]) ) $attr8_tmp_default = $$attr8_name; - elseif ( isset($$attr8_default) ) + elseif ( isset($attr8_default) ) $attr8_tmp_default = $attr8_default; else $attr8_tmp_default = ''; @@ -2046,7 +2054,7 @@ if (count($$attr8_list)==1) echo ' disabled="disabled"' } ?></select><?php if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" value="'.$box_key.'" />' -?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php +?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -2081,7 +2089,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -2103,13 +2111,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('list'=>'all_days','name'=>'day','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_days' ?><?php $attr8_name='day' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('list'=>'all_days','name'=>'day','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_days' ?><?php $attr8_name='day' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php if (count($$attr8_list)==1) echo ' disabled="disabled"' ?>><?php $attr8_tmp_list = $$attr8_list; if ( isset($$attr8_name) && isset($attr8_tmp_list[$$attr8_name]) ) $attr8_tmp_default = $$attr8_name; - elseif ( isset($$attr8_default) ) + elseif ( isset($attr8_default) ) $attr8_tmp_default = $attr8_default; else $attr8_tmp_default = ''; @@ -2152,7 +2160,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('class'=>'text','text'=>lang('date_time')) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('date_time') ?><?php +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('class'=>'text','text'=>lang('date_time'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('date_time') ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -2187,7 +2195,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -2209,7 +2217,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr7 = array('class'=>'fx','colspan'=>'5') ?><?php $attr7_class='fx' ?><?php $attr7_colspan='5' ?><?php // if (empty($attr7_class)) // $attr7['class']=$row_class; $column_class_idx++; @@ -2230,7 +2238,7 @@ if (count($$attr8_list)==1) echo ' disabled="disabled"' $attr8_tmp_list = $$attr8_list; if ( isset($$attr8_name) && isset($attr8_tmp_list[$$attr8_name]) ) $attr8_tmp_default = $$attr8_name; - elseif ( isset($$attr8_default) ) + elseif ( isset($attr8_default) ) $attr8_tmp_default = $attr8_default; else $attr8_tmp_default = ''; @@ -2244,7 +2252,7 @@ if (count($$attr8_list)==1) echo ' disabled="disabled"' } ?></select><?php if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" value="'.$box_key.'" />' -?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php +?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -2279,7 +2287,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -2301,13 +2309,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('list'=>'all_minutes','name'=>'minute','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_minutes' ?><?php $attr8_name='minute' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('list'=>'all_minutes','name'=>'minute','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_minutes' ?><?php $attr8_name='minute' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php if (count($$attr8_list)==1) echo ' disabled="disabled"' ?>><?php $attr8_tmp_list = $$attr8_list; if ( isset($$attr8_name) && isset($attr8_tmp_list[$$attr8_name]) ) $attr8_tmp_default = $$attr8_name; - elseif ( isset($$attr8_default) ) + elseif ( isset($attr8_default) ) $attr8_tmp_default = $attr8_default; else $attr8_tmp_default = ''; @@ -2321,7 +2329,7 @@ if (count($$attr8_list)==1) echo ' disabled="disabled"' } ?></select><?php if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" value="'.$box_key.'" />' -?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php +?><?php unset($attr8) ?><?php unset($attr8_list) ?><?php unset($attr8_name) ?><?php unset($attr8_onchange) ?><?php unset($attr8_title) ?><?php unset($attr8_class) ?><?php $attr8 = array('class'=>'text','raw'=>'_-_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_-_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -2356,7 +2364,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -2378,13 +2386,13 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('list'=>'all_seconds','name'=>'second','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_seconds' ?><?php $attr8_name='second' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('list'=>'all_seconds','name'=>'second','onchange'=>'','title'=>'','class'=>'') ?><?php $attr8_list='all_seconds' ?><?php $attr8_name='second' ?><?php $attr8_onchange='' ?><?php $attr8_title='' ?><?php $attr8_class='' ?><select size="1" id="id_<?php echo $attr8_name ?>" name="<?php echo $attr8_name ?>" onchange="<?php echo $attr8_onchange ?>" title="<?php echo $attr8_title ?>" class="<?php echo $attr8_class ?>"<?php if (count($$attr8_list)==1) echo ' disabled="disabled"' ?>><?php $attr8_tmp_list = $$attr8_list; if ( isset($$attr8_name) && isset($attr8_tmp_list[$$attr8_name]) ) $attr8_tmp_default = $$attr8_name; - elseif ( isset($$attr8_default) ) + elseif ( isset($attr8_default) ) $attr8_tmp_default = $attr8_default; else $attr8_tmp_default = ''; @@ -3022,7 +3030,7 @@ else if ( $exec ) { -?><?php unset($attr8) ?><?php unset($attr8_present) ?><?php $attr9 = array('class'=>'text','var'=>'preview_text') ?><?php $attr9_class='text' ?><?php $attr9_var='preview_text' ?><?php +?><?php unset($attr8) ?><?php unset($attr8_present) ?><?php $attr9 = array('class'=>'text','var'=>'preview_text','escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_var='preview_text' ?><?php $attr9_escape=true ?><?php if ( isset($attr9_prefix)&& isset($attr9_key)) $attr9_key = $attr9_prefix.$attr9_key; if ( isset($attr9_suffix)&& isset($attr9_key)) @@ -3057,7 +3065,7 @@ else elseif (!empty($attr9_key)) $tmp_text = lang($attr9_key); elseif (!empty($attr9_var)) - $tmp_text = isset($$attr9_var)?htmlentities($$attr9_var):'error: variable '.$attr9_var.' not present'; + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; elseif (!empty($attr9_raw)) $tmp_text = str_replace('_','&nbsp;',$attr9_raw); elseif (!empty($attr9_value)) @@ -3079,7 +3087,7 @@ else } echo $tmp_text; -?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_var) ?><?php $attr9 = array() ?><br/><?php unset($attr9) ?><?php $attr7 = array() ?><?php +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_var) ?><?php unset($attr9_escape) ?><?php $attr9 = array() ?><br/><?php unset($attr9) ?><?php $attr7 = array() ?><?php } ?><?php unset($attr7) ?><?php $attr8 = array('name'=>'text','type'=>'wiki') ?><?php $attr8_name='text' ?><?php $attr8_type='wiki' ?><?php @@ -3412,7 +3420,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -3561,7 +3569,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -3840,7 +3848,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -3988,7 +3996,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4023,7 +4031,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4045,7 +4053,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4080,7 +4088,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4102,7 +4110,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php @@ -4229,7 +4237,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4264,7 +4272,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4286,7 +4294,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE') ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -4321,7 +4329,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -4343,7 +4351,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php @@ -4377,13 +4385,12 @@ document.forms[0].<?php echo $attr7_field ?>.select(); ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/pageelement/archive.tpl.php b/themes/default/pages/html/pageelement/archive.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NR') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NR' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NR','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NR' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help','colspan'=>'2') ?><?php $attr5_class='help' ?><?php $attr5_colspan='2' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help','colspan'=>'2') ?><?php $attr5_class='help' ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_COMPARE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_COMPARE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_COMPARE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_COMPARE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -269,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -291,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -306,7 +307,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'DATE') ?><?php $attr6_class='text' ?><?php $attr6_text='DATE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'DATE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='DATE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -341,7 +342,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -363,7 +364,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -378,7 +379,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_USER') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_USER' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_USER','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_USER' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -413,7 +414,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -435,7 +436,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -450,7 +451,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_VALUE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_VALUE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_VALUE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_VALUE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -485,7 +486,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -507,7 +508,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -522,7 +523,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -557,7 +558,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -579,7 +580,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'help') ?><?php $attr5_class='help' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -594,7 +595,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_') ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -629,7 +630,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -651,7 +652,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('empty'=>'el') ?><?php $attr4_empty='el' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('empty'=>'el') ?><?php $attr4_empty='el' ?><?php // Wahr-Vergleich // Html::debug($attr4); @@ -770,7 +771,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_NOT_FOUND' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_colspan) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_NOT_FOUND','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_NOT_FOUND' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -805,7 +806,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -827,7 +828,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('list'=>'el','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='el' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php @@ -878,7 +879,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>$lfd_nr) ?><?php $attr7_class='text' ?><?php $attr7_text=$lfd_nr ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>$lfd_nr,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$lfd_nr ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -913,7 +914,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -935,7 +936,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -980,7 +981,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','var'=>'date') ?><?php $attr7_class='text' ?><?php $attr7_var='date' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','var'=>'date','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='date' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1015,7 +1016,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1037,7 +1038,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1052,7 +1053,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'user') ?><?php $attr7_class='text' ?><?php $attr7_text='user' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'user','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='user' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1087,7 +1088,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1109,7 +1110,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1124,7 +1125,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>$value) ?><?php $attr7_class='text' ?><?php $attr7_text=$value ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>$value,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$value ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1159,7 +1160,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1181,7 +1182,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -1286,7 +1287,7 @@ if ( $exec ) { -?><?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_PUBLIC')) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_PUBLIC') ?><?php +?><?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_PUBLIC'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_PUBLIC') ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1321,7 +1322,7 @@ elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1343,13 +1344,25 @@ } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7 = array() ?><?php if ( !$last_exec ) { ?><?php unset($attr7) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$releaseUrl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$releaseUrl ?><?php $attr8_class='' ?><?php + $params = array(); + if (!empty($attr8_var1) && isset($attr8_value1)) + $params[$attr8_var1]=$attr8_value1; + if (!empty($attr8_var2) && isset($attr8_value2)) + $params[$attr8_var2]=$attr8_value2; + if (!empty($attr8_var3) && isset($attr8_value3)) + $params[$attr8_var3]=$attr8_value3; + if (!empty($attr8_var4) && isset($attr8_value4)) + $params[$attr8_var4]=$attr8_value4; + if (!empty($attr8_var5) && isset($attr8_value5)) + $params[$attr8_var5]=$attr8_value5; + if(empty($attr8_class)) $attr8_class=''; if(empty($attr8_title)) @@ -1357,8 +1370,8 @@ if(!empty($attr8_url)) $tmp_url = $attr8_url; else - $tmp_url = Html::url($attr8_action,$attr8_subaction,!empty($$attr8_id)?$$attr8_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr8_class ?>" target="<?php echo $attr8_target ?>"<?php if (isset($attr8_accesskey)) echo ' accesskey="'.$attr8_accesskey.'"' ?> title="<?php echo $attr8_title ?>"><?php unset($attr8) ?><?php unset($attr8_title) ?><?php unset($attr8_target) ?><?php unset($attr8_url) ?><?php unset($attr8_class) ?><?php $attr9 = array('class'=>'text','text'=>lang('GLOBAL_RELEASE')) ?><?php $attr9_class='text' ?><?php $attr9_text=lang('GLOBAL_RELEASE') ?><?php + $tmp_url = Html::url($attr8_action,$attr8_subaction,!empty($attr8_id)?$attr8_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr8_class ?>" target="<?php echo $attr8_target ?>"<?php if (isset($attr8_accesskey)) echo ' accesskey="'.$attr8_accesskey.'"' ?> title="<?php echo $attr8_title ?>"><?php unset($attr8) ?><?php unset($attr8_title) ?><?php unset($attr8_target) ?><?php unset($attr8_url) ?><?php unset($attr8_class) ?><?php $attr9 = array('class'=>'text','text'=>lang('GLOBAL_RELEASE'),'escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text=lang('GLOBAL_RELEASE') ?><?php $attr9_escape=true ?><?php if ( isset($attr9_prefix)&& isset($attr9_key)) $attr9_key = $attr9_prefix.$attr9_key; if ( isset($attr9_suffix)&& isset($attr9_key)) @@ -1393,7 +1406,7 @@ elseif (!empty($attr9_key)) $tmp_text = lang($attr9_key); elseif (!empty($attr9_var)) - $tmp_text = isset($$attr9_var)?htmlentities($$attr9_var):'error: variable '.$attr9_var.' not present'; + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; elseif (!empty($attr9_raw)) $tmp_text = str_replace('_','&nbsp;',$attr9_raw); elseif (!empty($attr9_value)) @@ -1415,7 +1428,7 @@ } echo $tmp_text; -?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php // if (empty($attr6_class)) @@ -1522,7 +1535,7 @@ if ( $exec ) { -?><?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_ACTIVE')) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_ACTIVE') ?><?php +?><?php unset($attr7) ?><?php unset($attr7_true) ?><?php $attr8 = array('class'=>'text','text'=>lang('GLOBAL_ACTIVE'),'escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text=lang('GLOBAL_ACTIVE') ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -1557,7 +1570,7 @@ elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -1579,13 +1592,25 @@ } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr7 = array() ?><?php if ( !$last_exec ) { ?><?php unset($attr7) ?><?php $attr8 = array('title'=>'','target'=>'_self','url'=>$useUrl,'class'=>'') ?><?php $attr8_title='' ?><?php $attr8_target='_self' ?><?php $attr8_url=$useUrl ?><?php $attr8_class='' ?><?php + $params = array(); + if (!empty($attr8_var1) && isset($attr8_value1)) + $params[$attr8_var1]=$attr8_value1; + if (!empty($attr8_var2) && isset($attr8_value2)) + $params[$attr8_var2]=$attr8_value2; + if (!empty($attr8_var3) && isset($attr8_value3)) + $params[$attr8_var3]=$attr8_value3; + if (!empty($attr8_var4) && isset($attr8_value4)) + $params[$attr8_var4]=$attr8_value4; + if (!empty($attr8_var5) && isset($attr8_value5)) + $params[$attr8_var5]=$attr8_value5; + if(empty($attr8_class)) $attr8_class=''; if(empty($attr8_title)) @@ -1593,8 +1618,8 @@ if(!empty($attr8_url)) $tmp_url = $attr8_url; else - $tmp_url = Html::url($attr8_action,$attr8_subaction,!empty($$attr8_id)?$$attr8_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr8_class ?>" target="<?php echo $attr8_target ?>"<?php if (isset($attr8_accesskey)) echo ' accesskey="'.$attr8_accesskey.'"' ?> title="<?php echo $attr8_title ?>"><?php unset($attr8) ?><?php unset($attr8_title) ?><?php unset($attr8_target) ?><?php unset($attr8_url) ?><?php unset($attr8_class) ?><?php $attr9 = array('class'=>'text','text'=>lang('GLOBAL_USE')) ?><?php $attr9_class='text' ?><?php $attr9_text=lang('GLOBAL_USE') ?><?php + $tmp_url = Html::url($attr8_action,$attr8_subaction,!empty($attr8_id)?$attr8_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr8_class ?>" target="<?php echo $attr8_target ?>"<?php if (isset($attr8_accesskey)) echo ' accesskey="'.$attr8_accesskey.'"' ?> title="<?php echo $attr8_title ?>"><?php unset($attr8) ?><?php unset($attr8_title) ?><?php unset($attr8_target) ?><?php unset($attr8_url) ?><?php unset($attr8_class) ?><?php $attr9 = array('class'=>'text','text'=>lang('GLOBAL_USE'),'escape'=>true) ?><?php $attr9_class='text' ?><?php $attr9_text=lang('GLOBAL_USE') ?><?php $attr9_escape=true ?><?php if ( isset($attr9_prefix)&& isset($attr9_key)) $attr9_key = $attr9_prefix.$attr9_key; if ( isset($attr9_suffix)&& isset($attr9_key)) @@ -1629,7 +1654,7 @@ elseif (!empty($attr9_key)) $tmp_text = lang($attr9_key); elseif (!empty($attr9_var)) - $tmp_text = isset($$attr9_var)?htmlentities($$attr9_var):'error: variable '.$attr9_var.' not present'; + $tmp_text = isset($$attr9_var)?($attr9_escape?htmlentities($$attr9_var):$$attr9_var):'?'.$attr9_var.'?'; elseif (!empty($attr9_raw)) $tmp_text = str_replace('_','&nbsp;',$attr9_raw); elseif (!empty($attr9_value)) @@ -1651,7 +1676,7 @@ } echo $tmp_text; -?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr6 = array() ?><?php +?></span><?php unset($attr9) ?><?php unset($attr9_class) ?><?php unset($attr9_text) ?><?php unset($attr9_escape) ?><?php $attr7 = array() ?></a><?php unset($attr7) ?><?php $attr6 = array() ?><?php } ?><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; @@ -1684,13 +1709,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/pageelement/edit.tpl.php b/themes/default/pages/html/pageelement/edit.tpl.php @@ -76,13 +76,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -120,6 +120,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -163,7 +164,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','var'=>'desc') ?><?php $attr6_class='text' ?><?php $attr6_var='desc' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','var'=>'desc','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='desc' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -198,7 +199,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -220,7 +221,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('equals'=>'date','value'=>$type) ?><?php $attr4_equals='date' ?><?php $attr4_value=$type ?><?php // Wahr-Vergleich // Html::debug($attr4); @@ -734,7 +735,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -883,7 +884,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -1162,7 +1163,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -1276,6 +1277,221 @@ document.forms[0].<?php echo $attr7_field ?>.select(); if ( $exec ) { +?><?php unset($attr4) ?><?php unset($attr4_present) ?><?php $attr5 = array('present'=>'publish') ?><?php $attr5_present='publish' ?><?php + + // Wahr-Vergleich +// Html::debug($attr5); + + if ( isset($attr5_true) ) + { + if (gettype($attr5_true) === '' && gettype($attr5_true) === '1') + $exec = $$attr5_true == true; + else + $exec = $attr5_true == true; + } + + // Falsch-Vergleich + elseif ( isset($attr5_false) ) + { + if (gettype($attr5_false) === '' && gettype($attr5_false) === '1') + $exec = $$attr5_false == false; + else + $exec = $attr5_false == false; + } + // Inhalt-Vergleich mit Wertliste + elseif( isset($attr5_contains) ) + $exec = in_array($attr5_value,explode(',',$attr5_contains)); + + // Inhalt-Vergleich + elseif( isset($attr5_equals)&& isset($attr5_value) ) + $exec = $attr5_equals == $attr5_value; + + // Vergleich auf leer + elseif ( isset($attr5_empty) ) + { + if ( !isset($$attr5_empty) ) + $exec = empty($attr5_empty); + elseif ( is_array($$attr5_empty) ) + $exec = (count($$attr5_empty)==0); + elseif ( is_bool($$attr5_empty) ) + $exec = true; + else + $exec = empty( $$attr5_empty ); + } + + // Vergleich auf Vorhandensein + elseif ( isset($attr5_present) ) + { + $exec = isset($$attr5_present); +// if ( !isset($$attr5_present) ) +// $exec = false; +// elseif ( is_array($$attr5_present) ) +// $exec = (count($$attr5_present)>0); +// elseif ( is_bool($$attr5_present) ) +// $exec = $$attr5_present; +// elseif ( is_numeric($$attr5_present) ) +// $exec = $$attr5_present>=0; +// else +// $exec = true; + } + + else + { + Html::debug( $attr5 ); + echo("error in IF line ".__LINE__); + echo("assume: FALSE"); + $exec = false; + } + + // Ergebnis umdrehen + // TODO: Bald ausbauen, stattdessen "not" verwenden. + if ( !empty($attr5_invert) ) + $exec = !$exec; + + // Ergebnis umdrehen + if ( !empty($attr5_not) ) + $exec = !$exec; + + unset($attr5_true); + unset($attr5_false); + unset($attr5_notempty); + unset($attr5_empty); + unset($attr5_contains); + unset($attr5_present); + unset($attr5_invert); + unset($attr5_not); + unset($attr5_value); + unset($attr5_equals); + + $last_exec = $exec; + + if ( $exec ) + { +?><?php unset($attr5) ?><?php unset($attr5_present) ?><?php $attr6 = 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($attr6_class)) + $attr6_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array('colspan'=>'2') ?><?php $attr7_colspan='2' ?><?php +// if (empty($attr7_class)) +// $attr7['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($attr7_class)) + $attr7['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) + $attr7['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('title'=>lang('options')) ?><?php $attr8_title=lang('options') ?><fieldset><legend><?php echo $attr8_title ?></legend><?php unset($attr8) ?><?php unset($attr8_title) ?><?php $attr7 = array() ?></fieldset><?php unset($attr7) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4 = array() ?><?php + } + +?><?php unset($attr4) ?><?php $attr3 = array() ?><?php + } + +?><?php unset($attr3) ?><?php $attr4 = array('present'=>'release') ?><?php $attr4_present='release' ?><?php + + // Wahr-Vergleich +// Html::debug($attr4); + + if ( isset($attr4_true) ) + { + if (gettype($attr4_true) === '' && gettype($attr4_true) === '1') + $exec = $$attr4_true == true; + else + $exec = $attr4_true == true; + } + + // Falsch-Vergleich + elseif ( isset($attr4_false) ) + { + if (gettype($attr4_false) === '' && gettype($attr4_false) === '1') + $exec = $$attr4_false == false; + else + $exec = $attr4_false == false; + } + // Inhalt-Vergleich mit Wertliste + elseif( isset($attr4_contains) ) + $exec = in_array($attr4_value,explode(',',$attr4_contains)); + + // Inhalt-Vergleich + elseif( isset($attr4_equals)&& isset($attr4_value) ) + $exec = $attr4_equals == $attr4_value; + + // Vergleich auf leer + elseif ( isset($attr4_empty) ) + { + if ( !isset($$attr4_empty) ) + $exec = empty($attr4_empty); + elseif ( is_array($$attr4_empty) ) + $exec = (count($$attr4_empty)==0); + elseif ( is_bool($$attr4_empty) ) + $exec = true; + else + $exec = empty( $$attr4_empty ); + } + + // Vergleich auf Vorhandensein + elseif ( isset($attr4_present) ) + { + $exec = isset($$attr4_present); +// if ( !isset($$attr4_present) ) +// $exec = false; +// elseif ( is_array($$attr4_present) ) +// $exec = (count($$attr4_present)>0); +// elseif ( is_bool($$attr4_present) ) +// $exec = $$attr4_present; +// elseif ( is_numeric($$attr4_present) ) +// $exec = $$attr4_present>=0; +// else +// $exec = true; + } + + else + { + Html::debug( $attr4 ); + echo("error in IF line ".__LINE__); + echo("assume: FALSE"); + $exec = false; + } + + // Ergebnis umdrehen + // TODO: Bald ausbauen, stattdessen "not" verwenden. + if ( !empty($attr4_invert) ) + $exec = !$exec; + + // Ergebnis umdrehen + if ( !empty($attr4_not) ) + $exec = !$exec; + + unset($attr4_true); + unset($attr4_false); + unset($attr4_notempty); + unset($attr4_empty); + unset($attr4_contains); + unset($attr4_present); + unset($attr4_invert); + unset($attr4_not); + unset($attr4_value); + unset($attr4_equals); + + $last_exec = $exec; + + if ( $exec ) + { ?><?php unset($attr4) ?><?php unset($attr4_present) ?><?php $attr5 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -1310,7 +1526,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1345,7 +1561,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1367,7 +1583,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_RELEASE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1402,7 +1618,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1424,7 +1640,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php @@ -1551,7 +1767,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_') ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1586,7 +1802,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1608,7 +1824,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE') ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -1643,7 +1859,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -1665,7 +1881,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php @@ -1704,7 +1920,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/pageelement/link.tpl.php b/themes/default/pages/html/pageelement/link.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','var'=>'desc') ?><?php $attr6_class='text' ?><?php $attr6_var='desc' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','var'=>'desc','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='desc' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -254,7 +255,7 @@ if (count($$attr6_list)==1) echo ' disabled="disabled"' $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -358,6 +359,221 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( $exec ) { +?><?php unset($attr4) ?><?php unset($attr4_present) ?><?php $attr5 = array('present'=>'publish') ?><?php $attr5_present='publish' ?><?php + + // Wahr-Vergleich +// Html::debug($attr5); + + if ( isset($attr5_true) ) + { + if (gettype($attr5_true) === '' && gettype($attr5_true) === '1') + $exec = $$attr5_true == true; + else + $exec = $attr5_true == true; + } + + // Falsch-Vergleich + elseif ( isset($attr5_false) ) + { + if (gettype($attr5_false) === '' && gettype($attr5_false) === '1') + $exec = $$attr5_false == false; + else + $exec = $attr5_false == false; + } + // Inhalt-Vergleich mit Wertliste + elseif( isset($attr5_contains) ) + $exec = in_array($attr5_value,explode(',',$attr5_contains)); + + // Inhalt-Vergleich + elseif( isset($attr5_equals)&& isset($attr5_value) ) + $exec = $attr5_equals == $attr5_value; + + // Vergleich auf leer + elseif ( isset($attr5_empty) ) + { + if ( !isset($$attr5_empty) ) + $exec = empty($attr5_empty); + elseif ( is_array($$attr5_empty) ) + $exec = (count($$attr5_empty)==0); + elseif ( is_bool($$attr5_empty) ) + $exec = true; + else + $exec = empty( $$attr5_empty ); + } + + // Vergleich auf Vorhandensein + elseif ( isset($attr5_present) ) + { + $exec = isset($$attr5_present); +// if ( !isset($$attr5_present) ) +// $exec = false; +// elseif ( is_array($$attr5_present) ) +// $exec = (count($$attr5_present)>0); +// elseif ( is_bool($$attr5_present) ) +// $exec = $$attr5_present; +// elseif ( is_numeric($$attr5_present) ) +// $exec = $$attr5_present>=0; +// else +// $exec = true; + } + + else + { + Html::debug( $attr5 ); + echo("error in IF line ".__LINE__); + echo("assume: FALSE"); + $exec = false; + } + + // Ergebnis umdrehen + // TODO: Bald ausbauen, stattdessen "not" verwenden. + if ( !empty($attr5_invert) ) + $exec = !$exec; + + // Ergebnis umdrehen + if ( !empty($attr5_not) ) + $exec = !$exec; + + unset($attr5_true); + unset($attr5_false); + unset($attr5_notempty); + unset($attr5_empty); + unset($attr5_contains); + unset($attr5_present); + unset($attr5_invert); + unset($attr5_not); + unset($attr5_value); + unset($attr5_equals); + + $last_exec = $exec; + + if ( $exec ) + { +?><?php unset($attr5) ?><?php unset($attr5_present) ?><?php $attr6 = 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($attr6_class)) + $attr6_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr6_class ?>"><?php unset($attr6) ?><?php $attr7 = array('colspan'=>'2') ?><?php $attr7_colspan='2' ?><?php +// if (empty($attr7_class)) +// $attr7['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($attr7_class)) + $attr7['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) + $attr7['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr7 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr7) ?><?php unset($attr7_colspan) ?><?php $attr8 = array('title'=>'options') ?><?php $attr8_title='options' ?><fieldset><legend><?php echo $attr8_title ?></legend><?php unset($attr8) ?><?php unset($attr8_title) ?><?php $attr7 = array() ?></fieldset><?php unset($attr7) ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4 = array() ?><?php + } + +?><?php unset($attr4) ?><?php $attr3 = array() ?><?php + } + +?><?php unset($attr3) ?><?php $attr4 = array('present'=>'release') ?><?php $attr4_present='release' ?><?php + + // Wahr-Vergleich +// Html::debug($attr4); + + if ( isset($attr4_true) ) + { + if (gettype($attr4_true) === '' && gettype($attr4_true) === '1') + $exec = $$attr4_true == true; + else + $exec = $attr4_true == true; + } + + // Falsch-Vergleich + elseif ( isset($attr4_false) ) + { + if (gettype($attr4_false) === '' && gettype($attr4_false) === '1') + $exec = $$attr4_false == false; + else + $exec = $attr4_false == false; + } + // Inhalt-Vergleich mit Wertliste + elseif( isset($attr4_contains) ) + $exec = in_array($attr4_value,explode(',',$attr4_contains)); + + // Inhalt-Vergleich + elseif( isset($attr4_equals)&& isset($attr4_value) ) + $exec = $attr4_equals == $attr4_value; + + // Vergleich auf leer + elseif ( isset($attr4_empty) ) + { + if ( !isset($$attr4_empty) ) + $exec = empty($attr4_empty); + elseif ( is_array($$attr4_empty) ) + $exec = (count($$attr4_empty)==0); + elseif ( is_bool($$attr4_empty) ) + $exec = true; + else + $exec = empty( $$attr4_empty ); + } + + // Vergleich auf Vorhandensein + elseif ( isset($attr4_present) ) + { + $exec = isset($$attr4_present); +// if ( !isset($$attr4_present) ) +// $exec = false; +// elseif ( is_array($$attr4_present) ) +// $exec = (count($$attr4_present)>0); +// elseif ( is_bool($$attr4_present) ) +// $exec = $$attr4_present; +// elseif ( is_numeric($$attr4_present) ) +// $exec = $$attr4_present>=0; +// else +// $exec = true; + } + + else + { + Html::debug( $attr4 ); + echo("error in IF line ".__LINE__); + echo("assume: FALSE"); + $exec = false; + } + + // Ergebnis umdrehen + // TODO: Bald ausbauen, stattdessen "not" verwenden. + if ( !empty($attr4_invert) ) + $exec = !$exec; + + // Ergebnis umdrehen + if ( !empty($attr4_not) ) + $exec = !$exec; + + unset($attr4_true); + unset($attr4_false); + unset($attr4_notempty); + unset($attr4_empty); + unset($attr4_contains); + unset($attr4_present); + unset($attr4_invert); + unset($attr4_not); + unset($attr4_value); + unset($attr4_equals); + + $last_exec = $exec; + + if ( $exec ) + { ?><?php unset($attr4) ?><?php unset($attr4_present) ?><?php $attr5 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -392,7 +608,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'release') ?><?php $attr7_for='release' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'release') ?><?php $attr7_for='release' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -427,7 +643,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -449,7 +665,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_RELEASE') ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_RELEASE' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>'GLOBAL_RELEASE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='GLOBAL_RELEASE' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -484,7 +700,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -506,7 +722,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php @@ -633,7 +849,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $checked = $$attr7_name; else $checked = $attr7_default; -?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'publish') ?><?php $attr7_for='publish' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_') ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php +?><input type="checkbox" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" <?php if ($attr7_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7) ?><?php unset($attr7_default) ?><?php unset($attr7_readonly) ?><?php unset($attr7_name) ?><?php $attr7 = array('for'=>'publish') ?><?php $attr7_for='publish' ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7) ?><?php unset($attr7_for) ?><?php $attr8 = array('class'=>'text','raw'=>'_','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_raw='_' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -668,7 +884,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -690,7 +906,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php $attr8 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE') ?><?php $attr8_class='text' ?><?php $attr8_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8 = array('class'=>'text','text'=>'PAGE_PUBLISH_AFTER_SAVE','escape'=>true) ?><?php $attr8_class='text' ?><?php $attr8_text='PAGE_PUBLISH_AFTER_SAVE' ?><?php $attr8_escape=true ?><?php if ( isset($attr8_prefix)&& isset($attr8_key)) $attr8_key = $attr8_prefix.$attr8_key; if ( isset($attr8_suffix)&& isset($attr8_key)) @@ -725,7 +941,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr8_key)) $tmp_text = lang($attr8_key); elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?htmlentities($$attr8_var):'error: variable '.$attr8_var.' not present'; + $tmp_text = isset($$attr8_var)?($attr8_escape?htmlentities($$attr8_var):$$attr8_var):'?'.$attr8_var.'?'; elseif (!empty($attr8_raw)) $tmp_text = str_replace('_','&nbsp;',$attr8_raw); elseif (!empty($attr8_value)) @@ -747,7 +963,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4 = array() ?><?php @@ -781,13 +997,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/pageelement/show.tpl.php b/themes/default/pages/html/pageelement/show.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -144,7 +145,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','var'=>'value') ?><?php $attr5_class='text' ?><?php $attr5_var='value' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><?php unset($attr4_colspan) ?><?php $attr5 = array('class'=>'text','var'=>'value','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='value' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -179,7 +180,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -201,7 +202,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?> </table> +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/profile/edit.tpl.php b/themes/default/pages/html/profile/edit.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_username') ?><?php $attr6_class='text' ?><?php $attr6_text='user_username' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_username','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_username' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name') ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -269,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -291,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -320,7 +321,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_fullname') ?><?php $attr6_class='text' ?><?php $attr6_text='user_fullname' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_fullname','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_fullname' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -355,7 +356,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -377,7 +378,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -422,7 +423,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_tel') ?><?php $attr6_class='text' ?><?php $attr6_text='user_tel' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_tel','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_tel' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -457,7 +458,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -479,7 +480,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -524,7 +525,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_desc') ?><?php $attr6_class='text' ?><?php $attr6_text='user_desc' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_desc','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_desc' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -559,7 +560,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -581,7 +582,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -626,7 +627,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_style') ?><?php $attr6_class='text' ?><?php $attr6_text='user_style' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_style','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_style' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -661,7 +662,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -683,7 +684,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -754,7 +755,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/profile/mail.tpl.php b/themes/default/pages/html/profile/mail.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -169,6 +177,35 @@ $column_class_idx = 999; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('user_mail')) ?><?php $attr6_title=lang('user_mail') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + ?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; @@ -184,7 +221,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_new_mail') ?><?php $attr6_class='text' ?><?php $attr6_text='user_new_mail' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_new_mail','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_new_mail' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -219,7 +256,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -241,7 +278,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -271,7 +308,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -286,15 +323,14 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> @@ -310,7 +346,7 @@ <?php } ?> <?php unset($attr2) ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr2 = array('field'=>'act_password') ?><?php $attr2_field='act_password' ?> +<?php unset($attr1) ?><?php $attr2 = array('field'=>'mail') ?><?php $attr2_field='mail' ?> <script name="JavaScript" type="text/javascript"> <!-- document.forms[0].<?php echo $attr2_field ?>.focus(); diff --git a/themes/default/pages/html/profile/pwchange.tpl.php b/themes/default/pages/html/profile/pwchange.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -169,6 +177,35 @@ $column_class_idx = 999; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('user_act_password')) ?><?php $attr6_title=lang('user_act_password') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + ?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; @@ -184,7 +221,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_password') ?><?php $attr6_class='text' ?><?php $attr6_text='user_password' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_password','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_password' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -219,7 +256,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -241,7 +278,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -256,7 +293,36 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'act_password','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr6_name='act_password' ?><?php $attr6_default='' ?><?php $attr6_class='' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><input type="password" name="<?php echo $attr6_name ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_class) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'act_password','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr6_name='act_password' ?><?php $attr6_default='' ?><?php $attr6_class='' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><input type="password" name="<?php echo $attr6_name ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_class) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('user_new_password')) ?><?php $attr6_title=lang('user_new_password') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -285,7 +351,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_new_password') ?><?php $attr6_class='text' ?><?php $attr6_text='user_new_password' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_new_password','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_new_password' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -320,7 +386,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -342,7 +408,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -386,7 +452,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_new_password_repeat') ?><?php $attr6_class='text' ?><?php $attr6_text='user_new_password_repeat' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_new_password_repeat','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_new_password_repeat' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -421,7 +487,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -443,7 +509,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -472,7 +538,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -487,15 +553,14 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/project/add.tpl.php b/themes/default/pages/html/project/add.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -179,13 +195,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/project/edit.tpl.php b/themes/default/pages/html/project/edit.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'name','default'=>'','type'=>'text','name'=>'name','size'=>'30','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='name' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='30' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -257,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_TARGET_DIR') ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_TARGET_DIR' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_TARGET_DIR','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_TARGET_DIR' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -292,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -314,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -329,7 +337,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'filename','default'=>'','type'=>'text','name'=>'target_dir','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='filename' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='target_dir' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'filename','default'=>'','type'=>'text','name'=>'target_dir','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='filename' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='target_dir' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -359,7 +367,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_FTP_URL') ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_FTP_URL' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_CMD_AFTER_PUBLISH','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_CMD_AFTER_PUBLISH' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -394,7 +402,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -416,7 +424,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -431,7 +439,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'ftp_url','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='ftp_url' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'filename','default'=>'','type'=>'text','name'=>'cmd_after_publish','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='filename' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='cmd_after_publish' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -446,6 +454,35 @@ $column_class_idx = 999; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('project_FTP')) ?><?php $attr6_title=lang('project_FTP') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + ?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; @@ -461,7 +498,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_FTP_PASSIVE') ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_FTP_PASSIVE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_FTP_URL','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_FTP_URL' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -496,7 +533,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -518,7 +555,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -533,12 +570,8 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'ftp_passive') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='ftp_passive' ?><?php - if ( isset($$attr6_name) ) - $checked = $$attr6_name; - else - $checked = $attr6_default; -?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'filename','default'=>'','type'=>'text','name'=>'ftp_url','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='filename' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='ftp_url' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -567,64 +600,98 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_CMD_AFTER_PUBLISH') ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_CMD_AFTER_PUBLISH' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'ftp_passive') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='ftp_passive' ?><?php + if ( isset($$attr6_name) ) + $checked = $$attr6_name; + else + $checked = $attr6_default; +?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr6 = array('for'=>'ftp_passive') ?><?php $attr6_for='ftp_passive' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'PROJECT_FTP_PASSIVE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PROJECT_FTP_PASSIVE' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; + + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr6_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; - if (!empty($attr6_array)) + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr6_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - if (isset($attr6_accesskey)) + if (isset($attr7_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -639,8 +706,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'cmd_after_publish','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='cmd_after_publish' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; -?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -654,7 +720,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -669,84 +735,69 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_CONTENT_NEGOTIATION') ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_CONTENT_NEGOTIATION' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'content_negotiation') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='content_negotiation' ?><?php + if ( isset($$attr6_name) ) + $checked = $$attr6_name; + else + $checked = $attr6_default; +?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr6 = array('for'=>'content_negotiation') ?><?php $attr6_for='content_negotiation' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'PROJECT_CONTENT_NEGOTIATION','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PROJECT_CONTENT_NEGOTIATION' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr6_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; - if (!empty($attr6_array)) + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr6_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - if (isset($attr6_accesskey)) + if (isset($attr7_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php -// if (empty($attr5_class)) -// $attr5['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($attr5_class)) - $attr5['class']=$column_class; - - global $cell_column_nr; - $cell_column_nr++; - if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) - $attr5['width']=$column_widths[$cell_column_nr-1]; - -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'content_negotiation') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='content_negotiation' ?><?php - if ( isset($$attr6_name) ) - $checked = $$attr6_name; - else - $checked = $attr6_default; -?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -760,7 +811,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -775,84 +826,69 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'PROJECT_CUT_INDEX') ?><?php $attr6_class='text' ?><?php $attr6_text='PROJECT_CUT_INDEX' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'cut_index') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='cut_index' ?><?php + if ( isset($$attr6_name) ) + $checked = $$attr6_name; + else + $checked = $attr6_default; +?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr6 = array('for'=>'cut_index') ?><?php $attr6_for='cut_index' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'PROJECT_CUT_INDEX','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='PROJECT_CUT_INDEX' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr6_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; - if (!empty($attr6_array)) + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr6_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - if (isset($attr6_accesskey)) + if (isset($attr7_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php -// if (empty($attr5_class)) -// $attr5['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($attr5_class)) - $attr5['class']=$column_class; - - global $cell_column_nr; - $cell_column_nr++; - if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) - $attr5['width']=$column_widths[$cell_column_nr-1]; - -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'cut_index') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='cut_index' ?><?php - if ( isset($$attr6_name) ) - $checked = $$attr6_name; - else - $checked = $attr6_default; -?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -866,7 +902,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -881,15 +917,14 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/project/export.tpl.php b/themes/default/pages/html/project/export.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','key'=>'GLOBAL_DATABASE') ?><?php $attr6_class='text' ?><?php $attr6_key='GLOBAL_DATABASE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_width) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','key'=>'GLOBAL_DATABASE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_key='GLOBAL_DATABASE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'50%','class'=>'fx') ?><?php $attr5_width='50%' ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('width'=>'50%','class'=>'fx') ?><?php $attr5_width='50%' ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -233,7 +241,7 @@ if (count($$attr6_list)==1) echo ' disabled="disabled"' $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -278,13 +286,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'submit','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='submit' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/project/listing.tpl.php b/themes/default/pages/html/project/listing.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -164,6 +165,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('title'=>'','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -171,7 +184,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('file'=>'icon_project','align'=>'left') ?><?php $attr7_file='icon_project' ?><?php $attr7_align='left' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -184,7 +197,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','value'=>$name) ?><?php $attr7_class='text' ?><?php $attr7_value=$name ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_file) ?><?php unset($attr7_align) ?><?php $attr7 = array('class'=>'text','value'=>$name,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_value=$name ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -219,7 +232,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -241,7 +254,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -257,6 +270,18 @@ if (isset($attr7_elementtype)) { $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('title'=>'','target'=>$conf['interface']['frames']['top'],'url'=>$use_url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target=$conf['interface']['frames']['top'] ?><?php $attr6_url=$use_url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -264,8 +289,8 @@ if (isset($attr7_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','value'=>lang('GLOBAL_SELECT')) ?><?php $attr7_class='text' ?><?php $attr7_value=lang('GLOBAL_SELECT') ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','value'=>lang('GLOBAL_SELECT'),'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_value=lang('GLOBAL_SELECT') ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -300,7 +325,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -322,7 +347,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/project/maintenance.tpl.php b/themes/default/pages/html/project/maintenance.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -247,13 +255,12 @@ { ?><?php unset($attr6) ?><?php unset($attr6_not) ?><?php unset($attr6_present) ?><?php $attr7 = array('type'=>'submit','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr7_type='submit' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_ok' ?><?php if ($attr7_type=='ok') - { $attr7_type = 'submit'; -// $attr7_class = 'ok'; -// $attr7_text = 'BUTTON_OK'; -// $attr7_value = 'ok'; - } -?><input type="<?php echo $attr7_type ?>" name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php + if (isset($attr7_src)) + $attr7_type = 'image'; + else + $attr7_src = ''; +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> diff --git a/themes/default/pages/html/project/remove.tpl.php b/themes/default/pages/html/project/remove.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name') ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -262,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -284,7 +292,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -313,7 +321,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -348,7 +356,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -370,7 +378,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -419,7 +427,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GROUP_DELETE_DESC') ?><?php $attr6_class='text' ?><?php $attr6_text='GROUP_DELETE_DESC' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>'GROUP_DELETE_DESC','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GROUP_DELETE_DESC' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -454,7 +462,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -476,7 +484,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -507,13 +515,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/search/content.tpl.php b/themes/default/pages/html/search/content.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -162,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'lastchange_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='lastchange_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'lastchange_user') ?><?php $attr6_for='type' ?><?php $attr6_value='lastchange_user' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'user_lastchange_user') ?><?php $attr7_class='text' ?><?php $attr7_key='user_lastchange_user' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'lastchange_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='lastchange_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'lastchange_user') ?><?php $attr6_for='type' ?><?php $attr6_value='lastchange_user' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'user_lastchange_user','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='user_lastchange_user' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -197,7 +198,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -219,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -234,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('list'=>'users','name'=>'lastchange_user','default'=>$act_userid,'onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='users' ?><?php $attr6_name='lastchange_user' ?><?php $attr6_default=$act_userid ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('list'=>'users','name'=>'userid','default'=>$act_userid,'onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='users' ?><?php $attr6_name='userid' ?><?php $attr6_default=$act_userid ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php $attr6_tmp_list = $$attr6_list; @@ -283,7 +284,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'value','default'=>true,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='value' ?><?php $attr6_default=true ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'value') ?><?php $attr6_for='type' ?><?php $attr6_value='value' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'value') ?><?php $attr7_class='text' ?><?php $attr7_key='value' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'value','default'=>true,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='value' ?><?php $attr6_default=true ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'value') ?><?php $attr6_for='type' ?><?php $attr6_value='value' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'value','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='value' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -318,7 +319,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -340,7 +341,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -392,7 +393,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/search/prop.tpl.php b/themes/default/pages/html/search/prop.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -147,6 +148,35 @@ $column_class_idx = 999; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('global_user')) ?><?php $attr6_title=lang('global_user') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + ?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; @@ -162,7 +192,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'create_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='create_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'create_user') ?><?php $attr6_for='type' ?><?php $attr6_value='create_user' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'create_user') ?><?php $attr7_class='text' ?><?php $attr7_key='create_user' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'create_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='create_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'create_user') ?><?php $attr6_for='type' ?><?php $attr6_value='create_user' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'create_user','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='create_user' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -197,7 +227,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -219,7 +249,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'lastchange_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='lastchange_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'lastchange_user') ?><?php $attr6_for='type' ?><?php $attr6_value='lastchange_user' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'lastchange_user') ?><?php $attr7_class='text' ?><?php $attr7_key='lastchange_user' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'lastchange_user','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='lastchange_user' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'lastchange_user') ?><?php $attr6_for='type' ?><?php $attr6_value='lastchange_user' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'lastchange_user','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='lastchange_user' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -254,7 +284,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -276,7 +306,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -325,6 +355,35 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('MENU_SEARCH_PROP')) ?><?php $attr6_title=lang('MENU_SEARCH_PROP') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + ?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; @@ -340,7 +399,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'id','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='id' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'id') ?><?php $attr6_for='type' ?><?php $attr6_value='id' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'id') ?><?php $attr7_class='text' ?><?php $attr7_key='id' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'id','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='id' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'id') ?><?php $attr6_for='type' ?><?php $attr6_value='id' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'id','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='id' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -375,7 +434,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -397,7 +456,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'name','default'=>true,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='name' ?><?php $attr6_default=true ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'name') ?><?php $attr6_for='type' ?><?php $attr6_value='name' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_key='name' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'name','default'=>true,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='name' ?><?php $attr6_default=true ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'name') ?><?php $attr6_for='type' ?><?php $attr6_value='name' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -432,7 +491,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -454,7 +513,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'description','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='description' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'description') ?><?php $attr6_for='type' ?><?php $attr6_value='description' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'description') ?><?php $attr7_class='text' ?><?php $attr7_key='description' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'description','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='description' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'description') ?><?php $attr6_for='type' ?><?php $attr6_value='description' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'description','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='description' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -489,7 +548,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -511,7 +570,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'filename','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='filename' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'filename') ?><?php $attr6_for='type' ?><?php $attr6_value='filename' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'filename') ?><?php $attr7_class='text' ?><?php $attr7_key='filename' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'filename','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='filename' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><input type="radio" id="id_<?php echo $attr6_name.'_'.$attr6_value ?>" name="<?php echo $attr6_prefix.$attr6_name ?>"<?php if ( $attr6_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr6_value ?>" <?php if($attr6_value==$attr6_default) echo 'checked="checked"' ?> /><?php unset($attr6) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php unset($attr6_value) ?><?php unset($attr6_default) ?><?php unset($attr6_prefix) ?><?php unset($attr6_suffix) ?><?php unset($attr6_class) ?><?php unset($attr6_onchange) ?><?php $attr6 = array('for'=>'type','value'=>'filename') ?><?php $attr6_for='type' ?><?php $attr6_value='filename' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php unset($attr6_value) ?><?php $attr7 = array('class'=>'text','key'=>'filename','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='filename' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -546,7 +605,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -568,7 +627,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr6 = array() ?><br/><?php unset($attr6) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -598,7 +657,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -613,14 +672,14 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') $attr6_type = 'submit'; if (isset($attr6_src)) $attr6_type = 'image'; else $attr6_src = ''; -?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/search/result.tpl.php b/themes/default/pages/html/search/result.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -164,6 +165,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('title'=>'','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -171,7 +184,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','type'=>$type) ?><?php $attr7_align='left' ?><?php $attr7_type=$type ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -184,7 +197,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('title'=>$desc,'class'=>'text','text'=>$name) ?><?php $attr7_title=$desc ?><?php $attr7_class='text' ?><?php $attr7_text=$name ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('title'=>$desc,'class'=>'text','text'=>$name,'escape'=>true) ?><?php $attr7_title=$desc ?><?php $attr7_class='text' ?><?php $attr7_text=$name ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -219,7 +232,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -241,7 +254,78 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> +?></span><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('date'=>$lastchange_date) ?><?php $attr6_date=$lastchange_date ?><?php + global $conf; + $time = $attr6_date; + + if ( $time==0) + echo lang('GLOBAL_UNKNOWN'); + elseif ( !$conf['interface']['human_date_format'] ) + echo date(lang('DATE_FORMAT'),$time); + else + { + + $sekunden = time()-$time; + $minuten = intval($sekunden/60); + $stunden = intval($minuten /60); + $tage = intval($stunden /24); + $monate = intval($tage /30); + $jahre = intval($monate /12); + + echo '<span title="'.date(lang('DATE_FORMAT'),$time).'"">'; + + if ( $time==0) + echo lang('GLOBAL_UNKNOWN'); + elseif ( !$conf['interface']['human_date_format'] ) + echo date(lang('DATE_FORMAT'),$time); + elseif ( $sekunden == 1 ) + echo $sekunden.' '.lang('GLOBAL_SECOND'); + elseif ( $sekunden < 60 ) + echo $sekunden.' '.lang('GLOBAL_SECONDS'); + + elseif ( $minuten == 1 ) + echo $minuten.' '.lang('GLOBAL_MINUTE'); + elseif ( $minuten < 60 ) + echo $minuten.' '.lang('GLOBAL_MINUTES'); + + elseif ( $stunden == 1 ) + echo $stunden.' '.lang('GLOBAL_HOUR'); + elseif ( $stunden < 60 ) + echo $stunden.' '.lang('GLOBAL_HOURS'); + + elseif ( $tage == 1 ) + echo $tage.' '.lang('GLOBAL_DAY'); + elseif ( $tage < 60 ) + echo $tage.' '.lang('GLOBAL_DAYS'); + + elseif ( $monate == 1 ) + echo $monate.' '.lang('GLOBAL_MONTH'); + elseif ( $monate < 12 ) + echo $monate.' '.lang('GLOBAL_MONTHS'); + + elseif ( $jahre == 1 ) + echo $jahre.' '.lang('GLOBAL_YEAR'); + else + echo $jahre.' '.lang('GLOBAL_YEARS'); + + echo '</span>'; + } +?><?php unset($attr6) ?><?php unset($attr6_date) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/template/addel.tpl.php b/themes/default/pages/html/template/addel.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_name') ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -257,7 +265,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_description') ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'global_description','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='global_description' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -292,7 +300,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -314,7 +322,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -358,7 +366,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'element_type') ?><?php $attr6_class='text' ?><?php $attr6_text='element_type' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'element_type','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='element_type' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -393,7 +401,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -415,7 +423,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -430,13 +438,20 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('var'=>'text','value'=>'text') ?><?php $attr6_var='text' ?><?php $attr6_value='text' ?><?php $$attr6_var = $attr6_value ?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('list'=>'types','name'=>'type','default'=>'text','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='types' ?><?php $attr6_name='type' ?><?php $attr6_default='text' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('var'=>'text','value'=>'text') ?><?php $attr6_var='text' ?><?php $attr6_value='text' ?><?php + if (!isset($attr6_value)) + unset($$attr6_var); + elseif (isset($attr6_key)) + $$attr6_var = $attr6_value[$attr6_key]; + else + $$attr6_var = $attr6_value; +?><?php unset($attr6) ?><?php unset($attr6_var) ?><?php unset($attr6_value) ?><?php $attr6 = array('list'=>'types','name'=>'type','default'=>'text','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='types' ?><?php $attr6_name='type' ?><?php $attr6_default='text' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php $attr6_tmp_list = $$attr6_list; if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) + elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; @@ -481,13 +496,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/template/edit.tpl.php b/themes/default/pages/html/template/edit.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -145,7 +146,7 @@ $attr4['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_class) ?><code> -<?php $attr5 = array('class'=>'text','var'=>'text') ?><?php $attr5_class='text' ?><?php $attr5_var='text' ?><?php +<?php $attr5 = array('class'=>'text','var'=>'text','escape'=>false) ?><?php $attr5_class='text' ?><?php $attr5_var='text' ?><?php $attr5_escape=false ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -180,7 +181,7 @@ elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -202,7 +203,7 @@ } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><code> +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><code> <?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> diff --git a/themes/default/pages/html/template/el.tpl.php b/themes/default/pages/html/template/el.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -77,7 +77,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -94,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -157,6 +165,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>$desc,'target'=>'_self','url'=>$url,'class'=>'') ?><?php $attr6_title=$desc ?><?php $attr6_target='_self' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -164,7 +184,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','elementtype'=>$type) ?><?php $attr7_align='left' ?><?php $attr7_elementtype=$type ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -177,7 +197,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_elementtype) ?><?php $attr7 = array('class'=>'text','text'=>$name) ?><?php $attr7_class='text' ?><?php $attr7_text=$name ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_elementtype) ?><?php $attr7 = array('class'=>'text','text'=>$name,'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$name ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -212,7 +232,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -234,7 +254,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -249,7 +269,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','key'=>$type,'prefix'=>'EL_') ?><?php $attr6_class='text' ?><?php $attr6_key=$type ?><?php $attr6_prefix='EL_' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','key'=>$type,'prefix'=>'EL_','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_key=$type ?><?php $attr6_prefix='EL_' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -284,7 +304,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -306,7 +326,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_prefix) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('empty'=>'el') ?><?php $attr3_empty='el' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_key) ?><?php unset($attr6_prefix) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('empty'=>'el') ?><?php $attr3_empty='el' ?><?php // Wahr-Vergleich // Html::debug($attr3); @@ -425,7 +445,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>lang('GLOBAL_NOT_FOUND')) ?><?php $attr6_class='text' ?><?php $attr6_text=lang('GLOBAL_NOT_FOUND') ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('class'=>'text','text'=>lang('GLOBAL_NOT_FOUND'),'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=lang('GLOBAL_NOT_FOUND') ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -460,7 +480,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -482,7 +502,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> diff --git a/themes/default/pages/html/template/extension.tpl.php b/themes/default/pages/html/template/extension.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'TEMPLATE_extension') ?><?php $attr6_class='text' ?><?php $attr6_text='TEMPLATE_extension' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'TEMPLATE_extension','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='TEMPLATE_extension' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -259,13 +267,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/template/listing.tpl.php b/themes/default/pages/html/template/listing.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -101,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -164,6 +165,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -171,8 +184,8 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -207,7 +220,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -229,7 +242,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('empty'=>'templates') ?><?php $attr3_empty='templates' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr3 = array('empty'=>'templates') ?><?php $attr3_empty='templates' ?><?php // Wahr-Vergleich // Html::debug($attr3); @@ -348,7 +361,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NO_TEMPLATES_AVAILABLE_DESC' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NO_TEMPLATES_AVAILABLE_DESC','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NO_TEMPLATES_AVAILABLE_DESC' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -383,7 +396,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -405,7 +418,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> diff --git a/themes/default/pages/html/template/name.tpl.php b/themes/default/pages/html/template/name.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -95,7 +95,14 @@ if ( $tmp_pos !== false ) $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'TEMPLATE_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='TEMPLATE_NAME' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'TEMPLATE_NAME','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='TEMPLATE_NAME' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -259,13 +267,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><!-- + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><!-- <tr> <th colspan="2"><?php echo lang('GLOBAL_PAGES') ?></th> </tr> diff --git a/themes/default/pages/html/template/remove.tpl.php b/themes/default/pages/html/template/remove.tpl.php @@ -1,51 +1,72 @@ -<?php /* source: ./themes/default/include/html/page.inc.php - compile time: Sun, 29 Jan 2006 16:11:27 +0100 */ ?><?php $attr = array('class'=>'') ?><?php $attr_class='' ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> +<?php $attr1 = array('class'=>'main','title'=>$cms_title) ?><?php $attr1_class='main' ?><?php $attr1_title=$cms_title ?><?php header('Content-Type: text/html; charset='.lang('CHARSET')) +?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> -<!-- $Id$ --> <head> - <title><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> + <title><?php echo $attr1_title ?></title> + <meta http-equiv="content-type" content="text/html; charset=<?php echo lang('CHARSET') ?>" /> <meta name="MSSmartTagsPreventParsing" content="true" /> <meta name="robots" content="noindex,nofollow" /> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if (isset($windowMenu) && is_array($windowMenu)) foreach( $windowMenu as $menu ) + { + ?> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" /> +<?php + } +?> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> -<body<?php echo !empty($$attr_class)?' class="'.$$attr_class.'"':' class="'.$attr_class.'"' ?>> +<body class="<?php echo $attr1_class ?>"> - -<?php unset($attr) ?><?php unset($attr_class) ?><?php /* source: ./themes/default/include/html/form.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +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 - if (empty($attr_action)) - $attr_action = $actionName; - if (empty($attr_subaction)) - $attr_subaction = $targetSubActionName; - if (empty($attr_id)) - $attr_id = $this->getRequestId(); +<?php unset($attr1) ?><?php unset($attr1_class) ?><?php unset($attr1_title) ?><?php $attr2 = array('name'=>'','target'=>'_self','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_self' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php + if (empty($attr2_action)) + $attr2_action = $actionName; + if (empty($attr2_subaction)) + $attr2_subaction = $targetSubActionName; + if (empty($attr2_id)) + $attr2_id = $this->getRequestId(); -?><form name="<?php echo $attr_name ?>" - target="<?php echo $attr_target ?>" - action="<?php echo Html::url( $attr_action,$attr_subaction,$attr_id ) ?>" - method="<?php echo $attr_method ?>" - enctype="<?php echo $attr_enctype ?>"> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr_id ?>" /><?php +?><form name="<?php echo $attr2_name ?>" + target="<?php echo $attr2_target ?>" + action="<?php echo Html::url( $attr2_action,$attr2_subaction,$attr2_id ) ?>" + method="<?php echo $attr2_method ?>" + enctype="<?php echo $attr2_enctype ?>"> +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_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 16:11:28 +0100 */ ?><?php $attr = array('title'=>'','name'=>'','icon'=>'template','widths'=>'','width'=>'85%') ?><?php $attr_title='' ?><?php $attr_name='' ?><?php $attr_icon='template' ?><?php $attr_widths='' ?><?php $attr_width='85%' ?><?php +?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3 = array('icon'=>'template','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_icon='template' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php $coloumn_widths=array(); - if (!empty($attr_widths)) + if (!empty($attr3_widths)) + { + $column_widths = explode(',',$attr3_widths); + unset($attr3['widths']); + } + if (!empty($attr3_rowclasses)) + { + $row_classes = explode(',',$attr3_rowclasses); + $row_class_idx = 999; + unset($attr3['rowclasses']); + } + if (!empty($attr3_columnclasses)) { - $column_widths = explode(',',$attr_widths); - unset($attr['widths']); + $column_classes = explode(',',$attr3_columnclasses); + unset($attr3['columnclasses']); } global $image_dir; echo '<br/><br/><br/><center>'; - echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr_width.'">'; + echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$attr3_width.'">'; echo '<tr><td class="menu">'; - if ( !empty($attr_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !empty($attr3_icon) ) + echo '<img src="'.$image_dir.'icon_'.$attr3_icon.IMG_ICON_EXT.'" align="left" border="0">'; + if ( !isset($path) || is_array($path) ) + $path = array(); foreach( $path as $pathElement) { extract($pathElement); @@ -54,13 +75,39 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </th> + </td><td class="menu" style="align:right;"> + <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) + { + ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php + } + ?> + </td> </tr> <tr><td class="subaction"> - <?php foreach( $windowMenu as $menu ) + + <?php if ( !isset($windowMenu) || !is_array($windowMenu) ) + $windowMenu = array(); + foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } + if ($conf['help']['enabled'] ) + { + ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('GLOBAL_HELP') ?>" class="menu">?</a><?php + } ?></td> </tr> @@ -86,191 +133,338 @@ <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 16:11:28 +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($attr3) ?><?php unset($attr3_icon) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + 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 16:11:28 +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 $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_NAME') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_NAME' ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; -?><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 16:11:28 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_NAME','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_NAME' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php - if (!empty($attr_array)) + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); + else + $attr6_title = ''; + +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; + else + $tmp_text = lang($tmpArray[$attr6_text]); + } + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; + else + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - elseif (!empty($attr_text)) - $tmp_text = lang($attr_text); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - else echo 'text error'; - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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 16:11:28 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +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($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['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 16:11:28 +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 - if (!empty($attr_array)) +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name') ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; + + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); + else + $attr6_title = ''; + +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); + } + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); + else + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; + else + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - elseif (!empty($attr_text)) - $tmp_text = lang($attr_text); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - else echo 'text error'; - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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 16:11:28 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + 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 16:11:28 +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 $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['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 16:11:28 +0100 */ ?><?php $attr = array('title'=>'','class'=>'','var'=>'','text'=>'GLOBAL_DELETE','raw'=>'','maxlength'=>'') ?><?php $attr_title='' ?><?php $attr_class='' ?><?php $attr_var='' ?><?php $attr_text='GLOBAL_DELETE' ?><?php $attr_raw='' ?><?php $attr_maxlength='' ?><?php - if(empty($attr_title)) $attr_title = $attr_text; -?><span class="<?php echo $attr_class ?>"><?php - if (!empty($attr_array)) +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr6_class='text' ?><?php $attr6_text='GLOBAL_DELETE' ?><?php + if ( isset($attr6_prefix)&& isset($attr6_key)) + $attr6_key = $attr6_prefix.$attr6_key; + if ( isset($attr6_suffix)&& isset($attr6_key)) + $attr6_key = $attr6_key.$attr6_suffix; + + if(empty($attr6_title)) + if (!empty($attr6_key)) + $attr6_title = lang($attr6_key.'_HELP'); + else + $attr6_title = ''; + +?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php + $attr6_title = ''; + + if (!empty($attr6_array)) { //geht nicht: - //echo $$attr_array[$attr_var].'%'; - $tmpArray = $$attr_array; - if (!empty($attr_var)) - $tmp_text = $tmpArray[$attr_var]; + //echo $$attr6_array[$attr6_var].'%'; + $tmpArray = $$attr6_array; + if (!empty($attr6_var)) + $tmp_text = $tmpArray[$attr6_var]; else - $tmp_text = lang($tmpArray[$attr_text]); + $tmp_text = lang($tmpArray[$attr6_text]); + } + elseif (!empty($attr6_text)) + if ( isset($$attr6_text)) + $tmp_text = lang($$attr6_text); + else + $tmp_text = lang($attr6_text); + elseif (!empty($attr6_textvar)) + $tmp_text = lang($$attr6_textvar); + elseif (!empty($attr6_key)) + $tmp_text = lang($attr6_key); + elseif (!empty($attr6_var)) + $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + elseif (!empty($attr6_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + elseif (!empty($attr6_value)) + $tmp_text = $attr6_value; + else + { + $tmp_text = '&nbsp;'; + //Html::debug($attr6);echo 'text error'; } - elseif (!empty($attr_text)) - $tmp_text = lang($attr_text); - elseif (!empty($attr_var)) - $tmp_text = isset($$attr_var)?$$attr_var:'error: variable '.$attr_var.' not present'; - elseif (!empty($attr_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr_raw); - else echo 'text error'; - if ( !empty($attr_maxlength) && intval($attr_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr_maxlength) ); - + if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + + if (isset($attr6_accesskey)) + { + $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + if ( $pos !== false ) + $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); + } + echo $tmp_text; -?></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 16:11:28 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/cell.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +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($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'delete') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='delete' ?><?php + if ( isset($$attr6_name) ) + $checked = $$attr6_name; + else + $checked = $attr6_default; +?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; -?><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 16:11:28 +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 16:11:28 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?><?php - global $fx; - if ( $fx =='f1') - $fx='f2'; - else $fx='f1'; - 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 16:11:28 +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 $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['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]; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['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 16:11:28 +0100 */ ?><?php $attr = array('type'=>'ok') ?><?php $attr_type='ok' ?><?php - if ($attr_type=='ok') - { - $attr_type = 'submit'; - $attr_class = 'ok'; - $attr_text = 'BUTTON_OK'; - $attr_value = 'ok'; - } -?><input type="<?php echo $attr_type ?>" name="<?php echo $attr_value ?>" class="<?php echo $attr_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr) ?><?php unset($attr_type) ?><?php /* source: ./themes/default/include/html/cell-end.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?></td><?php unset($attr) ?><?php /* source: ./themes/default/include/html/row-end.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?></tr><?php unset($attr) ?><?php /* source: ./themes/default/include/html/window-end.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?> </table> +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php + if ($attr6_type=='ok') + $attr6_type = 'submit'; + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> -<?php if ($showDuration) { ?> +</center> + +<?php if ($showDuration) + { ?> <br/> <small>&nbsp; <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small> <?php } ?> +<?php unset($attr2) ?><?php $attr1 = array() ?></form> -</center><?php unset($attr) ?><?php /* source: ./themes/default/include/html/form-end.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?></form><?php unset($attr) ?><?php /* source: ./themes/default/include/html/focus.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array('field'=>'delete') ?><?php $attr_field='delete' ?><script name="JavaScript" type="text/javascript"><!-- -document.forms[0].<?php echo $attr_field ?>.focus(); -document.forms[0].<?php echo $attr_field ?>.select(); -//--></script> -<?php unset($attr) ?><?php unset($attr_field) ?><?php /* source: ./themes/default/include/html/page-end.inc.php - compile time: Sun, 29 Jan 2006 16:11:28 +0100 */ ?><?php $attr = array() ?> +<?php unset($attr1) ?><?php $attr2 = array('field'=>'delete') ?><?php $attr2_field='delete' ?> +<script name="JavaScript" type="text/javascript"> +<!-- +document.forms[0].<?php echo $attr2_field ?>.focus(); +document.forms[0].<?php echo $attr2_field ?>.select(); +// --> +</script> +<?php unset($attr2) ?><?php unset($attr2_field) ?><?php $attr0 = array() ?> <!-- $Id$ --> -<?php if ($showDuration && false) { ?> +<?php if ($showDuration) { ?> <br/> <small>&nbsp; <?php $dur = time()-START_TIME; - echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small> +// echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small> <?php } ?> </body> -</html><?php unset($attr) ?>- \ No newline at end of file +</html><?php unset($attr0) ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/template/src.tpl.php b/themes/default/pages/html/template/src.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -193,13 +194,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/template/srcelement.tpl.php b/themes/default/pages/html/template/srcelement.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -119,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -278,7 +279,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -440,7 +441,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -602,7 +603,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -764,7 +765,7 @@ if (count($$attr7_list)==1) echo ' disabled="disabled"' $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; - elseif ( isset($$attr7_default) ) + elseif ( isset($attr7_default) ) $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; @@ -812,13 +813,12 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/title/show.tpl.php b/themes/default/pages/html/title/show.tpl.php @@ -95,7 +95,7 @@ if (isset($attr5_elementtype)) { } elseif (isset($attr5_fileext)) { ?><img src="<?php echo $image_dir.$attr5_fileext ?>" border="0" align="<?php echo $attr5_align ?>"><?php } elseif (isset($attr5_file)) { -?><img src="<?php echo $image_dir.$attr5_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr5_align ?>"><?php } ?><?php unset($attr5) ?><?php unset($attr5_icon) ?><?php unset($attr5_align) ?><?php $attr5 = array('title'=>$dbid,'class'=>'text','text'=>$dbname) ?><?php $attr5_title=$dbid ?><?php $attr5_class='text' ?><?php $attr5_text=$dbname ?><?php +?><img src="<?php echo $image_dir.$attr5_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr5_align ?>"><?php } ?><?php unset($attr5) ?><?php unset($attr5_icon) ?><?php unset($attr5_align) ?><?php $attr5 = array('title'=>$dbid,'class'=>'text','text'=>$dbname,'escape'=>true) ?><?php $attr5_title=$dbid ?><?php $attr5_class='text' ?><?php $attr5_text=$dbname ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -130,7 +130,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -152,7 +152,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('width'=>'20%','style'=>'text-align:center;','class'=>'title') ?><?php $attr4_width='20%' ?><?php $attr4_style='text-align:center;' ?><?php $attr4_class='title' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('width'=>'20%','style'=>'text-align:center;','class'=>'title') ?><?php $attr4_width='20%' ?><?php $attr4_style='text-align:center;' ?><?php $attr4_class='title' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -167,7 +167,7 @@ if (isset($attr5_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_width) ?><?php unset($attr4_style) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'cms_title') ?><?php $attr5_class='text' ?><?php $attr5_var='cms_title' ?><?php +?><td <?php foreach( $attr4 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr4) ?><?php unset($attr4_width) ?><?php unset($attr4_style) ?><?php unset($attr4_class) ?><?php $attr5 = array('class'=>'text','var'=>'cms_title','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_var='cms_title' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -202,7 +202,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -224,7 +224,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('width'=>'40%','style'=>'text-align:right;','class'=>'title') ?><?php $attr4_width='40%' ?><?php $attr4_style='text-align:right;' ?><?php $attr4_class='title' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_var) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr4 = array('width'=>'40%','style'=>'text-align:right;','class'=>'title') ?><?php $attr4_width='40%' ?><?php $attr4_style='text-align:right;' ?><?php $attr4_class='title' ?><?php // if (empty($attr4_class)) // $attr4['class']=$row_class; $column_class_idx++; @@ -252,6 +252,18 @@ if (isset($attr5_elementtype)) { ?><img src="<?php echo $image_dir.$attr5_fileext ?>" border="0" align="<?php echo $attr5_align ?>"><?php } elseif (isset($attr5_file)) { ?><img src="<?php echo $image_dir.$attr5_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr5_align ?>"><?php } ?><?php unset($attr5) ?><?php unset($attr5_icon) ?><?php unset($attr5_align) ?><?php $attr5 = array('title'=>'USER_LOGOUT_DESC','target'=>'_top','url'=>$logout_url,'class'=>'') ?><?php $attr5_title='USER_LOGOUT_DESC' ?><?php $attr5_target='_top' ?><?php $attr5_url=$logout_url ?><?php $attr5_class='' ?><?php + $params = array(); + if (!empty($attr5_var1) && isset($attr5_value1)) + $params[$attr5_var1]=$attr5_value1; + if (!empty($attr5_var2) && isset($attr5_value2)) + $params[$attr5_var2]=$attr5_value2; + if (!empty($attr5_var3) && isset($attr5_value3)) + $params[$attr5_var3]=$attr5_value3; + if (!empty($attr5_var4) && isset($attr5_value4)) + $params[$attr5_var4]=$attr5_value4; + if (!empty($attr5_var5) && isset($attr5_value5)) + $params[$attr5_var5]=$attr5_value5; + if(empty($attr5_class)) $attr5_class=''; if(empty($attr5_title)) @@ -259,8 +271,8 @@ if (isset($attr5_elementtype)) { if(!empty($attr5_url)) $tmp_url = $attr5_url; else - $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($$attr5_id)?$$attr5_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'USER_LOGOUT') ?><?php $attr6_class='text' ?><?php $attr6_text='USER_LOGOUT' ?><?php + $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'USER_LOGOUT','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='USER_LOGOUT' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -295,7 +307,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -317,7 +329,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5 = array('class'=>'text','raw'=>'_(') ?><?php $attr5_class='text' ?><?php $attr5_raw='_(' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr5 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr5_class='text' ?><?php $attr5_raw='_(' ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -352,7 +364,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -374,7 +386,19 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php $attr5 = array('title'=>'USER_PROFILE_DESC','target'=>'cms_main_main','url'=>$profile_url,'class'=>'') ?><?php $attr5_title='USER_PROFILE_DESC' ?><?php $attr5_target='cms_main_main' ?><?php $attr5_url=$profile_url ?><?php $attr5_class='' ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_raw) ?><?php unset($attr5_escape) ?><?php $attr5 = array('title'=>'USER_PROFILE_DESC','target'=>'cms_main_main','url'=>$profile_url,'class'=>'') ?><?php $attr5_title='USER_PROFILE_DESC' ?><?php $attr5_target='cms_main_main' ?><?php $attr5_url=$profile_url ?><?php $attr5_class='' ?><?php + $params = array(); + if (!empty($attr5_var1) && isset($attr5_value1)) + $params[$attr5_var1]=$attr5_value1; + if (!empty($attr5_var2) && isset($attr5_value2)) + $params[$attr5_var2]=$attr5_value2; + if (!empty($attr5_var3) && isset($attr5_value3)) + $params[$attr5_var3]=$attr5_value3; + if (!empty($attr5_var4) && isset($attr5_value4)) + $params[$attr5_var4]=$attr5_value4; + if (!empty($attr5_var5) && isset($attr5_value5)) + $params[$attr5_var5]=$attr5_value5; + if(empty($attr5_class)) $attr5_class=''; if(empty($attr5_title)) @@ -382,8 +406,8 @@ if (isset($attr5_elementtype)) { if(!empty($attr5_url)) $tmp_url = $attr5_url; else - $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($$attr5_id)?$$attr5_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'userfullname') ?><?php $attr6_class='text' ?><?php $attr6_text='userfullname' ?><?php + $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo $attr5_title ?>"><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_target) ?><?php unset($attr5_url) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'userfullname','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='userfullname' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -418,7 +442,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -440,7 +464,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr6 = array('class'=>'text','raw'=>')') ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr6 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw=')' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -475,7 +499,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -497,7 +521,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?></table><?php unset($attr1) ?><?php $attr0 = array() ?> +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></a><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?></table><?php unset($attr1) ?><?php $attr0 = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> diff --git a/themes/default/pages/html/treetitle/show.tpl.php b/themes/default/pages/html/treetitle/show.tpl.php @@ -115,6 +115,18 @@ if (isset($attr5_elementtype)) { extract($$attr5_list_tmp_value); } ?><?php unset($attr5) ?><?php unset($attr5_list) ?><?php unset($attr5_extract) ?><?php unset($attr5_key) ?><?php unset($attr5_value) ?><?php $attr6 = array('title'=>'title','target'=>'cms_main','url'=>$url,'class'=>'path') ?><?php $attr6_title='title' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='path' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -122,8 +134,8 @@ if (isset($attr5_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','var'=>'name','maxlength'=>'20') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_maxlength='20' ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','var'=>'name','maxlength'=>'20','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_maxlength='20' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -158,7 +170,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -180,12 +192,12 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_maxlength) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('type'=>'filesep') ?><?php $attr6_type='filesep' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('type'=>'filesep') ?><?php $attr6_type='filesep' ?><?php if ($attr6_type=='filesep') echo '&nbsp;<strong>&raquo;</strong>&nbsp;'; else echo "char error"; -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('title'=>$text,'class'=>'title','text'=>$text) ?><?php $attr5_title=$text ?><?php $attr5_class='title' ?><?php $attr5_text=$text ?><?php +?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr5 = array('title'=>$text,'class'=>'title','text'=>$text,'escape'=>true) ?><?php $attr5_title=$text ?><?php $attr5_class='title' ?><?php $attr5_text=$text ?><?php $attr5_escape=true ?><?php if ( isset($attr5_prefix)&& isset($attr5_key)) $attr5_key = $attr5_prefix.$attr5_key; if ( isset($attr5_suffix)&& isset($attr5_key)) @@ -220,7 +232,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr5_key)) $tmp_text = lang($attr5_key); elseif (!empty($attr5_var)) - $tmp_text = isset($$attr5_var)?htmlentities($$attr5_var):'error: variable '.$attr5_var.' not present'; + $tmp_text = isset($$attr5_var)?($attr5_escape?htmlentities($$attr5_var):$$attr5_var):'?'.$attr5_var.'?'; elseif (!empty($attr5_raw)) $tmp_text = str_replace('_','&nbsp;',$attr5_raw); elseif (!empty($attr5_value)) @@ -242,7 +254,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php +?></span><?php unset($attr5) ?><?php unset($attr5_title) ?><?php unset($attr5_class) ?><?php unset($attr5_text) ?><?php unset($attr5_escape) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr3 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -291,6 +303,18 @@ if (isset($attr5_elementtype)) { extract($$attr5_list_tmp_value); } ?><?php unset($attr5) ?><?php unset($attr5_list) ?><?php unset($attr5_extract) ?><?php unset($attr5_key) ?><?php unset($attr5_value) ?><?php $attr6 = array('title'=>$title,'target'=>'_parent','url'=>$url,'class'=>'menu','accesskey'=>lang($key)) ?><?php $attr6_title=$title ?><?php $attr6_target='_parent' ?><?php $attr6_url=$url ?><?php $attr6_class='menu' ?><?php $attr6_accesskey=lang($key) ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -298,8 +322,8 @@ if (isset($attr5_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php unset($attr6_accesskey) ?><?php $attr7 = array('class'=>'text','text'=>$text,'accesskey'=>lang($key)) ?><?php $attr7_class='text' ?><?php $attr7_text=$text ?><?php $attr7_accesskey=lang($key) ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php unset($attr6_accesskey) ?><?php $attr7 = array('class'=>'text','text'=>$text,'accesskey'=>lang($key),'escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text=$text ?><?php $attr7_accesskey=lang($key) ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -334,7 +358,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -356,7 +380,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_accesskey) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'__') ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_accesskey) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','raw'=>'__','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_raw='__' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -391,7 +415,7 @@ if (isset($attr5_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -413,7 +437,7 @@ if (isset($attr5_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?></table><?php unset($attr1) ?><?php $attr0 = array() ?> +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_raw) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3 = array() ?></td><?php unset($attr3) ?><?php $attr2 = array() ?></tr><?php unset($attr2) ?><?php $attr1 = array() ?></table><?php unset($attr1) ?><?php $attr0 = array() ?> <!-- $Id$ --> <?php if ($showDuration) { ?> diff --git a/themes/default/pages/html/user/addgroup.tpl.php b/themes/default/pages/html/user/addgroup.tpl.php @@ -13,9 +13,11 @@ <?php } ?> - <link rel="stylesheet" type="text/css" href="./themes/default/css/default.css" /> -<?php if($stylesheet!='default') { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $stylesheet ?>" /> +<?php if(!empty($root_stylesheet)) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" /> +<?php } ?> +<?php if($root_stylesheet!=$user_stylesheet) { ?> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" /> <?php } ?> </head> @@ -73,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -87,7 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php if($this->subActionName==$menu['subaction']) echo '_active' ?>"><?php echo lang($menu['text']) ?></a>&nbsp;&nbsp;&nbsp;<?php + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); + + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -104,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -147,19 +163,27 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('list'=>'groups','name'=>'groupid','default'=>'','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='groups' ?><?php $attr6_name='groupid' ?><?php $attr6_default='' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('list'=>'groups','name'=>'groupid','onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='groups' ?><?php $attr6_name='groupid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php if (count($$attr6_list)==1) echo ' disabled="disabled"' ?>><?php - foreach( $$attr6_list as $box_key=>$box_value ) + $attr6_tmp_list = $$attr6_list; + if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) + $attr6_tmp_default = $$attr6_name; + elseif ( isset($attr6_default) ) + $attr6_tmp_default = $attr6_default; + else + $attr6_tmp_default = ''; + + foreach( $attr6_tmp_list as $box_key=>$box_value ) { echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; - if (isset($$attr6_name)&&$box_key==$$attr6_name || isset($attr6_default)&&$box_key == $attr6_default) + if ($box_key==$attr6_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' -?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -190,13 +214,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -140,7 +148,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_username') ?><?php $attr6_class='text' ?><?php $attr6_text='user_username' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_username','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_username' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'20','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='20' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'name','default'=>'','type'=>'text','name'=>'name','size'=>'20','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='name' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='name' ?><?php $attr6_size='20' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -242,7 +250,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -257,7 +265,36 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_fullname') ?><?php $attr6_class='text' ?><?php $attr6_text='user_fullname' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('ADDITIONAL_INFO')) ?><?php $attr6_title=lang('ADDITIONAL_INFO') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_fullname','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_fullname' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -292,7 +329,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -314,7 +351,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -329,7 +366,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'fullname','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='fullname' ?><?php $attr6_size='' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'fullname','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='fullname' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -344,7 +381,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -359,7 +396,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_mail') ?><?php $attr6_class='text' ?><?php $attr6_text='user_mail' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_mail','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_mail' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -394,7 +431,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -416,7 +453,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -431,7 +468,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'mail','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='mail' ?><?php $attr6_size='' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'mail','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='mail' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -446,7 +483,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -461,7 +498,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_desc') ?><?php $attr6_class='text' ?><?php $attr6_text='user_desc' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_desc','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_desc' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -496,7 +533,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -518,7 +555,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -533,7 +570,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'desc','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='desc' ?><?php $attr6_size='' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'desc','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='desc' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -548,7 +585,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -563,7 +600,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_tel') ?><?php $attr6_class='text' ?><?php $attr6_text='user_tel' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_tel','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_tel' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -598,7 +635,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -620,7 +657,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -635,7 +672,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'tel','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='tel' ?><?php $attr6_size='' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'tel','size'=>'40','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='tel' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; ?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) @@ -650,7 +687,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -665,80 +702,113 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_ldapdn') ?><?php $attr6_class='text' ?><?php $attr6_text='user_ldapdn' ?><?php - if ( isset($attr6_prefix)&& isset($attr6_key)) - $attr6_key = $attr6_prefix.$attr6_key; - if ( isset($attr6_suffix)&& isset($attr6_key)) - $attr6_key = $attr6_key.$attr6_suffix; +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'is_admin') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='is_admin' ?><?php + if ( isset($$attr6_name) ) + $checked = $$attr6_name; + else + $checked = $attr6_default; +?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr6 = array('for'=>'is_admin') ?><?php $attr6_for='is_admin' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7 = array('class'=>'text','text'=>'user_admin','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='user_admin' ?><?php $attr7_escape=true ?><?php + if ( isset($attr7_prefix)&& isset($attr7_key)) + $attr7_key = $attr7_prefix.$attr7_key; + if ( isset($attr7_suffix)&& isset($attr7_key)) + $attr7_key = $attr7_key.$attr7_suffix; + + if(empty($attr7_title)) + if (!empty($attr7_key)) + $attr7_title = lang($attr7_key.'_HELP'); else - $attr6_title = ''; + $attr7_title = ''; -?><span class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; +?><span class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php + $attr7_title = ''; - if (!empty($attr6_array)) + if (!empty($attr7_array)) { //geht nicht: - //echo $$attr6_array[$attr6_var].'%'; - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; + //echo $$attr7_array[$attr7_var].'%'; + $tmpArray = $$attr7_array; + if (!empty($attr7_var)) + $tmp_text = $tmpArray[$attr7_var]; else - $tmp_text = lang($tmpArray[$attr6_text]); + $tmp_text = lang($tmpArray[$attr7_text]); } - elseif (!empty($attr6_text)) - if ( isset($$attr6_text)) - $tmp_text = lang($$attr6_text); + elseif (!empty($attr7_text)) + if ( isset($$attr7_text)) + $tmp_text = lang($$attr7_text); else - $tmp_text = lang($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = lang($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = lang($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; + $tmp_text = lang($attr7_text); + elseif (!empty($attr7_textvar)) + $tmp_text = lang($$attr7_textvar); + elseif (!empty($attr7_key)) + $tmp_text = lang($attr7_key); + elseif (!empty($attr7_var)) + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; + elseif (!empty($attr7_raw)) + $tmp_text = str_replace('_','&nbsp;',$attr7_raw); + elseif (!empty($attr7_value)) + $tmp_text = $attr7_value; else { $tmp_text = '&nbsp;'; - //Html::debug($attr6);echo 'text error'; + //Html::debug($attr7);echo 'text error'; } - if ( !empty($attr6_maxlength) && intval($attr6_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr6_maxlength) ); + if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); - if (isset($attr6_accesskey)) + if (isset($attr7_accesskey)) { - $pos = strpos(strtolower($tmp_text),strtolower($attr6_accesskey)); + $pos = strpos(strtolower($tmp_text),strtolower($attr7_accesskey)); if ( $pos !== false ) $tmp_text = substr($tmp_text,0,max($pos,0)).'<span class="accesskey">'.substr($tmp_text,$pos,1).'</span>'.substr($tmp_text,$pos+1); } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php -// if (empty($attr5_class)) -// $attr5['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($attr5_class)) - $attr5['class']=$column_class; - - global $cell_column_nr; - $cell_column_nr++; - if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) - $attr5['width']=$column_widths[$cell_column_nr-1]; - -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'ldap_dn','size'=>'','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='ldap_dn' ?><?php $attr6_size='' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; -?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -752,7 +822,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -767,7 +837,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_style') ?><?php $attr6_class='text' ?><?php $attr6_text='user_style' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_ldapdn','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_ldapdn' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -802,7 +872,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -824,7 +894,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -839,27 +909,8 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('list'=>'allstyles','name'=>'style','default'=>$conf['interface']['style']['default'],'onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='allstyles' ?><?php $attr6_name='style' ?><?php $attr6_default=$conf['interface']['style']['default'] ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php -if (count($$attr6_list)==1) echo ' disabled="disabled"' -?>><?php - $attr6_tmp_list = $$attr6_list; - if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) - $attr6_tmp_default = $$attr6_name; - elseif ( isset($$attr6_default) ) - $attr6_tmp_default = $attr6_default; - else - $attr6_tmp_default = ''; - - foreach( $attr6_tmp_list as $box_key=>$box_value ) - { - echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; - if ($box_key==$attr6_tmp_default) - echo ' selected="selected"'; - echo '>'.$box_value.'</option>'; - } -?></select><?php -if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' -?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'ldap_dn','size'=>'50','maxlength'=>'256','onchange'=>'') ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='ldap_dn' ?><?php $attr6_size='50' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php if(!isset($attr6_default)) $attr6_default=''; +?><input id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" type="<?php echo $attr6_type ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" onxxxMouseOver="this.focus();" /><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_default) ?><?php unset($attr6_type) ?><?php unset($attr6_name) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php unset($attr6_onchange) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -873,7 +924,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -888,7 +939,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_admin') ?><?php $attr6_class='text' ?><?php $attr6_text='user_admin' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_style','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_style' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -923,7 +974,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -945,7 +996,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -960,12 +1011,27 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'is_admin') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='is_admin' ?><?php - if ( isset($$attr6_name) ) - $checked = $$attr6_name; - else - $checked = $attr6_default; -?><input type="checkbox" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" <?php if ($attr6_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?> /><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6) ?><?php unset($attr6_default) ?><?php unset($attr6_readonly) ?><?php unset($attr6_name) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('list'=>'allstyles','name'=>'style','default'=>$conf['interface']['style']['default'],'onchange'=>'','title'=>'','class'=>'') ?><?php $attr6_list='allstyles' ?><?php $attr6_name='style' ?><?php $attr6_default=$conf['interface']['style']['default'] ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><select size="1" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" onchange="<?php echo $attr6_onchange ?>" title="<?php echo $attr6_title ?>" class="<?php echo $attr6_class ?>"<?php +if (count($$attr6_list)==1) echo ' disabled="disabled"' +?>><?php + $attr6_tmp_list = $$attr6_list; + if ( isset($$attr6_name) && isset($attr6_tmp_list[$$attr6_name]) ) + $attr6_tmp_default = $$attr6_name; + elseif ( isset($attr6_default) ) + $attr6_tmp_default = $attr6_default; + else + $attr6_tmp_default = ''; + + foreach( $attr6_tmp_list as $box_key=>$box_value ) + { + echo '<option class="'.$attr6_class.'" value="'.$box_key.'"'; + if ($box_key==$attr6_tmp_default) + echo ' selected="selected"'; + echo '>'.$box_value.'</option>'; + } +?></select><?php +if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />' +?><?php unset($attr6) ?><?php unset($attr6_list) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -996,13 +1062,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6_src) ?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/user/groups.tpl.php b/themes/default/pages/html/user/groups.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -71,13 +71,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -94,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -168,7 +176,7 @@ if (isset($attr6_elementtype)) { } elseif (isset($attr6_fileext)) { ?><img src="<?php echo $image_dir.$attr6_fileext ?>" border="0" align="<?php echo $attr6_align ?>"><?php } elseif (isset($attr6_file)) { -?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_file) ?><?php unset($attr6_align) ?><?php $attr6 = array('class'=>'text','var'=>'name') ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr6_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr6_align ?>"><?php } ?><?php unset($attr6) ?><?php unset($attr6_file) ?><?php unset($attr6_align) ?><?php $attr6 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -203,7 +211,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -225,7 +233,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -241,6 +249,18 @@ if (isset($attr6_elementtype)) { $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'','target'=>'_self','url'=>$delgroupurl,'class'=>'') ?><?php $attr6_title='' ?><?php $attr6_target='_self' ?><?php $attr6_url=$delgroupurl ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -248,8 +268,8 @@ if (isset($attr6_elementtype)) { if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); -?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_DELETE') ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_DELETE' ?><?php + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); +?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_DELETE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_DELETE' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -284,7 +304,7 @@ if (isset($attr6_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -306,7 +326,7 @@ if (isset($attr6_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> </td> </tr> </table> diff --git a/themes/default/pages/html/user/listing.tpl.php b/themes/default/pages/html/user/listing.tpl.php @@ -57,13 +57,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -71,13 +71,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -94,6 +101,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -157,6 +165,18 @@ $attr5['width']=$column_widths[$cell_column_nr-1]; ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('title'=>'desc','target'=>'cms_main','url'=>$url,'class'=>'') ?><?php $attr6_title='desc' ?><?php $attr6_target='cms_main' ?><?php $attr6_url=$url ?><?php $attr6_class='' ?><?php + $params = array(); + if (!empty($attr6_var1) && isset($attr6_value1)) + $params[$attr6_var1]=$attr6_value1; + if (!empty($attr6_var2) && isset($attr6_value2)) + $params[$attr6_var2]=$attr6_value2; + if (!empty($attr6_var3) && isset($attr6_value3)) + $params[$attr6_var3]=$attr6_value3; + if (!empty($attr6_var4) && isset($attr6_value4)) + $params[$attr6_var4]=$attr6_value4; + if (!empty($attr6_var5) && isset($attr6_value5)) + $params[$attr6_var5]=$attr6_value5; + if(empty($attr6_class)) $attr6_class=''; if(empty($attr6_title)) @@ -164,7 +184,7 @@ if(!empty($attr6_url)) $tmp_url = $attr6_url; else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($$attr6_id)?$$attr6_id:$this->getRequestId(),array(!empty($var1)?$var1:'asdf'=>!empty($value1)?$$value1:'')); + $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a href="<?php echo $tmp_url ?>" class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo $attr6_title ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7 = array('align'=>'left','type'=>'user') ?><?php $attr7_align='left' ?><?php $attr7_type='user' ?><?php if (isset($attr7_elementtype)) { ?><img src="<?php echo $image_dir.'icon_el_'.$attr7_elementtype.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php @@ -177,7 +197,7 @@ if (isset($attr7_elementtype)) { } elseif (isset($attr7_fileext)) { ?><img src="<?php echo $image_dir.$attr7_fileext ?>" border="0" align="<?php echo $attr7_align ?>"><?php } elseif (isset($attr7_file)) { -?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'name') ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php +?><img src="<?php echo $image_dir.$attr7_file.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php } ?><?php unset($attr7) ?><?php unset($attr7_align) ?><?php unset($attr7_type) ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -212,7 +232,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -234,7 +254,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -249,7 +269,7 @@ if (isset($attr7_elementtype)) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','value'=>$fullname) ?><?php $attr6_class='text' ?><?php $attr6_value=$fullname ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','value'=>$fullname,'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_value=$fullname ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -284,7 +304,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -306,7 +326,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php $attr6 = array('true'=>$isAdmin) ?><?php $attr6_true=$isAdmin ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_escape) ?><?php $attr6 = array('true'=>$isAdmin) ?><?php $attr6_true=$isAdmin ?><?php // Wahr-Vergleich // Html::debug($attr6); @@ -396,7 +416,7 @@ if (isset($attr7_elementtype)) { if ( $exec ) { -?><?php unset($attr6) ?><?php unset($attr6_true) ?><?php $attr7 = array('class'=>'text','raw'=>'_(') ?><?php $attr7_class='text' ?><?php $attr7_raw='_(' ?><?php +?><?php unset($attr6) ?><?php unset($attr6_true) ?><?php $attr7 = array('class'=>'text','raw'=>'_(','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw='_(' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -431,7 +451,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -453,7 +473,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr7 = array('class'=>'text','key'=>'USER_ADMIN') ?><?php $attr7_class='text' ?><?php $attr7_key='USER_ADMIN' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','key'=>'USER_ADMIN','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='USER_ADMIN' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -488,7 +508,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -510,7 +530,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php $attr7 = array('class'=>'text','raw'=>')') ?><?php $attr7_class='text' ?><?php $attr7_raw=')' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr7 = array('class'=>'text','raw'=>')','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_raw=')' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -545,7 +565,7 @@ if (isset($attr7_elementtype)) { elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -567,7 +587,7 @@ if (isset($attr7_elementtype)) { } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php $attr5 = array() ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_raw) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?><?php } ?><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1 = array() ?> </table> diff --git a/themes/default/pages/html/user/pw.tpl.php b/themes/default/pages/html/user/pw.tpl.php @@ -75,13 +75,13 @@ } echo '<span class="title">'.lang($windowTitle).'</span>'; ?> - </td><td class="menu" style="align:right;"> + </td><!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a>&nbsp;<?php } ?> - </td> + </td>--> </tr> <tr><td class="subaction"> @@ -89,13 +89,20 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $text = lang($menu['text']); - $key = strtoupper(lang($menu['key' ])); - $pos = strpos(strtolower($text),strtolower($key)); - if ( $pos !== false ) - $text = substr($text,0,max($pos,0)).'<span class="accesskey">'. substr($text,$pos,1).'</span>'.substr($text,$pos+1); + $tmp_text = lang($menu['text']); + $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_pos = strpos(strtolower($tmp_text),strtolower($tmp_key)); + if ( $tmp_pos !== false ) + $tmp_text = substr($tmp_text,0,max($tmp_pos,0)).'<span class="accesskey">'. substr($tmp_text,$tmp_pos,1).'</span>'.substr($tmp_text,$tmp_pos+1); - ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $text ?></a>&nbsp;&nbsp;&nbsp;<?php + if ( isset($menu['url']) ) + { + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a>&nbsp;&nbsp;&nbsp;<?php + } + else + { + ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + } } if ($conf['help']['enabled'] ) { @@ -112,6 +119,7 @@ <?php foreach( $notices as $notice ) { ?> + <tr> <td><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td class="f1"><?php if ($notice['name']!='') { ?><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?>: <?php } ?><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?></td> </tr> @@ -140,7 +148,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -155,7 +163,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_username') ?><?php $attr6_class='text' ?><?php $attr6_text='user_username' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_username','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_username' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -190,7 +198,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -212,7 +220,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -227,7 +235,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','var'=>'name') ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_var='name' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -262,7 +270,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -284,7 +292,36 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('USER_new_password')) ?><?php $attr6_title=lang('USER_new_password') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -298,7 +335,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -313,7 +350,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'USER_new_password') ?><?php $attr6_class='text' ?><?php $attr6_text='USER_new_password' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'USER_new_password','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='USER_new_password' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -348,7 +385,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -370,7 +407,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -385,7 +422,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('name'=>'password1','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr6_name='password1' ?><?php $attr6_default='' ?><?php $attr6_class='' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><input type="password" name="<?php echo $attr6_name ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_class) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'password1','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr6_name='password1' ?><?php $attr6_default='' ?><?php $attr6_class='' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><input type="password" name="<?php echo $attr6_name ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_class) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php $row_class_idx++; if ($row_class_idx > count($row_classes)) $row_class_idx=1; @@ -399,7 +436,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -414,7 +451,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'USER_new_password_repeat') ?><?php $attr6_class='text' ?><?php $attr6_text='USER_new_password_repeat' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'USER_new_password_repeat','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='USER_new_password_repeat' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -449,7 +486,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -471,7 +508,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -486,7 +523,36 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('name'=>'password2','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr6_name='password2' ?><?php $attr6_default='' ?><?php $attr6_class='' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><input type="password" name="<?php echo $attr6_name ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_class) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('present'=>'mail') ?><?php $attr4_present='mail' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('name'=>'password2','default'=>'','class'=>'','size'=>'40','maxlength'=>'256') ?><?php $attr6_name='password2' ?><?php $attr6_default='' ?><?php $attr6_class='' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><input type="password" name="<?php echo $attr6_name ?>" size="<?php echo $attr6_size ?>" maxlength="<?php echo $attr6_maxlength ?>" class="<?php echo $attr6_class ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php unset($attr6) ?><?php unset($attr6_name) ?><?php unset($attr6_default) ?><?php unset($attr6_class) ?><?php unset($attr6_size) ?><?php unset($attr6_maxlength) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array() ?><?php + $row_class_idx++; + if ($row_class_idx > count($row_classes)) + $row_class_idx=1; + $row_class=$row_classes[$row_class_idx-1]; + + if (empty($attr4_class)) + $attr4_class=$row_class; + + global $cell_column_nr; + $cell_column_nr=0; + + $column_class_idx = 999; + +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php +// if (empty($attr5_class)) +// $attr5['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($attr5_class)) + $attr5['class']=$column_class; + + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5['width']=$column_widths[$cell_column_nr-1]; + +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><legend><?php echo $attr6_title ?></legend><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4 = array('present'=>'mail') ?><?php $attr4_present='mail' ?><?php // Wahr-Vergleich // Html::debug($attr4); @@ -590,7 +656,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -605,7 +671,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'user_mail_new_password') ?><?php $attr7_class='text' ?><?php $attr7_text='user_mail_new_password' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'user_mail_new_password','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='user_mail_new_password' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -640,7 +706,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -662,7 +728,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -677,7 +743,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('default'=>false,'readonly'=>false,'name'=>'email') ?><?php $attr7_default=false ?><?php $attr7_readonly=false ?><?php $attr7_name='email' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('default'=>false,'readonly'=>false,'name'=>'email') ?><?php $attr7_default=false ?><?php $attr7_readonly=false ?><?php $attr7_name='email' ?><?php if ( isset($$attr7_name) ) $checked = $$attr7_name; else @@ -696,7 +762,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?><tr class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -711,7 +777,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('class'=>'text','text'=>'user_random_password') ?><?php $attr7_class='text' ?><?php $attr7_text='user_random_password' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('class'=>'text','text'=>'user_random_password','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='user_random_password' ?><?php $attr7_escape=true ?><?php if ( isset($attr7_prefix)&& isset($attr7_key)) $attr7_key = $attr7_prefix.$attr7_key; if ( isset($attr7_suffix)&& isset($attr7_key)) @@ -746,7 +812,7 @@ elseif (!empty($attr7_key)) $tmp_text = lang($attr7_key); elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?htmlentities($$attr7_var):'error: variable '.$attr7_var.' not present'; + $tmp_text = isset($$attr7_var)?($attr7_escape?htmlentities($$attr7_var):$$attr7_var):'?'.$attr7_var.'?'; elseif (!empty($attr7_raw)) $tmp_text = str_replace('_','&nbsp;',$attr7_raw); elseif (!empty($attr7_value)) @@ -768,7 +834,7 @@ } echo $tmp_text; -?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array('class'=>'fx') ?><?php $attr6_class='fx' ?><?php +?></span><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6 = array() ?><?php // if (empty($attr6_class)) // $attr6['class']=$row_class; $column_class_idx++; @@ -783,7 +849,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php $attr7 = array('default'=>false,'readonly'=>false,'name'=>'random') ?><?php $attr7_default=false ?><?php $attr7_readonly=false ?><?php $attr7_name='random' ?><?php +?><td <?php foreach( $attr6 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr6) ?><?php $attr7 = array('default'=>false,'readonly'=>false,'name'=>'random') ?><?php $attr7_default=false ?><?php $attr7_readonly=false ?><?php $attr7_name='random' ?><?php if ( isset($$attr7_name) ) $checked = $$attr7_name; else @@ -805,7 +871,7 @@ $column_class_idx = 999; -?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?><tr class="<?php echo $attr4_class ?>"><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -820,7 +886,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('class'=>'text','text'=>'user_password_timeout') ?><?php $attr6_class='text' ?><?php $attr6_text='user_password_timeout' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('class'=>'text','text'=>'user_password_timeout','escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text='user_password_timeout' ?><?php $attr6_escape=true ?><?php if ( isset($attr6_prefix)&& isset($attr6_key)) $attr6_key = $attr6_prefix.$attr6_key; if ( isset($attr6_suffix)&& isset($attr6_key)) @@ -855,7 +921,7 @@ elseif (!empty($attr6_key)) $tmp_text = lang($attr6_key); elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?htmlentities($$attr6_var):'error: variable '.$attr6_var.' not present'; + $tmp_text = isset($$attr6_var)?($attr6_escape?htmlentities($$attr6_var):$$attr6_var):'?'.$attr6_var.'?'; elseif (!empty($attr6_raw)) $tmp_text = str_replace('_','&nbsp;',$attr6_raw); elseif (!empty($attr6_value)) @@ -877,7 +943,7 @@ } echo $tmp_text; -?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></span><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5 = array() ?><?php // if (empty($attr5_class)) // $attr5['class']=$row_class; $column_class_idx++; @@ -892,7 +958,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5['width']=$column_widths[$cell_column_nr-1]; -?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'timeout') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='timeout' ?><?php +?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php $attr6 = array('default'=>false,'readonly'=>false,'name'=>'timeout') ?><?php $attr6_default=false ?><?php $attr6_readonly=false ?><?php $attr6_name='timeout' ?><?php if ( isset($$attr6_name) ) $checked = $$attr6_name; else @@ -928,13 +994,12 @@ ?><td <?php foreach( $attr5 as $a_name=>$a_value ) echo " $a_name=\"$a_value\"" ?>><?php unset($attr5) ?><?php unset($attr5_class) ?><?php unset($attr5_colspan) ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text='button_ok' ?><?php if ($attr6_type=='ok') - { $attr6_type = 'submit'; -// $attr6_class = 'ok'; -// $attr6_text = 'BUTTON_OK'; -// $attr6_value = 'ok'; - } -?><input type="<?php echo $attr6_type ?>" name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> + if (isset($attr6_src)) + $attr6_type = 'image'; + else + $attr6_src = ''; +?><input type="<?php echo $attr6_type ?>"<?php if(isset($attr6_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr6_value ?>" class="<?php echo $attr6_class ?>" title="<?php echo lang($attr6_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2 = array() ?> </table> </td> </tr> </table>