commit 9d933b3c8d64655bf6f11eec50c4f582922109d9 parent 0758ce6f5b0c2cc40b46da568e4d821652fa88dc Author: dankert <devnull@localhost> Date: Thu, 21 May 2009 00:48:56 +0200 Umwandlung aller Templates. Diffstat:
75 files changed, 1886 insertions(+), 11398 deletions(-)
diff --git a/themes/default/pages/html/element/name.tpl.php b/themes/default/pages/html/element/name.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='ELEMENT_NAME'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -266,11 +196,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='name'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; @@ -294,80 +219,13 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_DESCRIPTION'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -382,11 +240,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_name='description'; $attr6_rows='5'; $attr6_cols='50'; $attr6_class='inputarea'; $attr6_default=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( !$attr6_readonly) { ?><textarea <?php if ($attr6_readonly) echo ' disabled="true"' ?> 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 @@ -407,22 +260,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/element/properties.tpl.php b/themes/default/pages/html/element/properties.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -184,80 +181,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='ELEMENT_SUBTYPE'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -272,11 +202,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_present='subtypes'; ?><?php $attr7_tmp_exec = isset($$attr7_present); $attr7_tmp_last_exec = $attr7_tmp_exec; @@ -338,8 +263,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va } ?><?php unset($attr8_list);unset($attr8_name);unset($attr8_onchange);unset($attr8_title);unset($attr8_class);unset($attr8_addempty);unset($attr8_multiple);unset($attr8_size);unset($attr8_lang); ?><?php ?><?php } ?><?php ?><?php $attr7_not=true; $attr7_present='subtypes'; ?><?php $attr7_tmp_exec = isset($$attr7_present); - if ( !empty($attr7_not) ) - $attr7_tmp_exec = !$attr7_tmp_exec; + $attr7_tmp_exec = !$attr7_tmp_exec; $attr7_tmp_last_exec = $attr7_tmp_exec; if ( $attr7_tmp_exec ) { @@ -373,80 +297,13 @@ if ($attr8_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_WITH_ICON'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -461,11 +318,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_default=false; $attr7_readonly=false; $attr7_name='with_icon'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) @@ -499,80 +351,13 @@ if ( $attr7_readonly && $checked ) if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_ALL_LANGUAGES'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -587,11 +372,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_default=false; $attr7_readonly=false; $attr7_name='all_languages'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) @@ -625,80 +405,13 @@ if ( $attr7_readonly && $checked ) if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_writable'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -713,11 +426,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_default=false; $attr7_readonly=false; $attr7_name='writable'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) @@ -751,80 +459,13 @@ if ( $attr7_readonly && $checked ) if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='width'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -839,11 +480,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='width'; $attr7_size='10'; $attr7_maxlength='256'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -'; if(!isset($attr7_default)) $attr7_default=''; @@ -873,80 +509,13 @@ if ($attr7_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='height'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -961,11 +530,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='height'; $attr7_size='10'; $attr7_maxlength='256'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -'; if(!isset($attr7_default)) $attr7_default=''; @@ -995,80 +559,13 @@ if ($attr7_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_DATEFORMAT'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1083,11 +580,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='dateformats'; $attr7_name='dateformat'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=false; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -1163,80 +655,13 @@ 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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_FORMAT'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1251,11 +676,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='formatlist'; $attr7_name='format'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; ?><?php $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; @@ -1293,80 +713,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_DECIMALS'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1381,11 +734,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='decimals'; $attr7_size='10'; $attr7_maxlength='2'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -'; if(!isset($attr7_default)) $attr7_default=''; @@ -1415,80 +763,13 @@ if ($attr7_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_DEC_POINT'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1503,11 +784,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='dec_point'; $attr7_size='10'; $attr7_maxlength='5'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -'; if(!isset($attr7_default)) $attr7_default=''; @@ -1537,80 +813,13 @@ if ($attr7_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_thousand_sep'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1625,11 +834,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='thousand_sep'; $attr7_size='10'; $attr7_maxlength='1'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -'; if(!isset($attr7_default)) $attr7_default=''; @@ -1659,80 +863,13 @@ if ($attr7_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_default_text'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1747,11 +884,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='default_text'; $attr7_size='40'; $attr7_maxlength='255'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -'; if(!isset($attr7_default)) $attr7_default=''; @@ -1781,80 +913,13 @@ if ($attr7_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_default_longtext'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1869,11 +934,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_name='default_longtext'; $attr7_rows='10'; $attr7_cols='40'; $attr7_class='inputarea'; $attr7_default=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( !$attr7_readonly) { ?><textarea <?php if ($attr7_readonly) echo ' disabled="true"' ?> class="<?php echo $attr7_class ?>" name="<?php echo $attr7_name ?>" rows="<?php echo $attr7_rows ?>" cols="<?php echo $attr7_cols ?>"><?php echo htmlentities(isset($$attr7_name)?$$attr7_name:$attr7_default) ?></textarea><?php @@ -1900,80 +960,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_DYNAMIC_PARAMETERS'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1988,11 +981,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_name='parameters'; $attr7_rows='15'; $attr7_cols='40'; $attr7_class='inputarea'; $attr7_default=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( !$attr7_readonly) { ?><textarea <?php if ($attr7_readonly) echo ' disabled="true"' ?> class="<?php echo $attr7_class ?>" name="<?php echo $attr7_name ?>" rows="<?php echo $attr7_rows ?>" cols="<?php echo $attr7_cols ?>"><?php echo htmlentities(isset($$attr7_name)?$$attr7_name:$attr7_default) ?></textarea><?php @@ -2013,11 +1001,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) @@ -2030,11 +1013,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='dynamic_class_parameters'; $attr7_extract=false; $attr7_key='paramName'; $attr7_value='defaultValue'; ?><?php $attr7_list_tmp_key = $attr7_key; $attr7_list_tmp_value = $attr7_value; @@ -2055,358 +1033,44 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } extract($$attr7_list_tmp_value); } ?><?php unset($attr7_list);unset($attr7_extract);unset($attr7_key);unset($attr7_value); ?><?php $attr8_class='text'; $attr8_var='paramName'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $langF = $attr8_escape?'langHtml':'lang'; + $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_raw='_('; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_text='GLOBAL_DEFAULT'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_raw=')_=_'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_var='defaultValue'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $langF = $attr8_escape?'langHtml':'lang'; + $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_escape); ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr4_present='select_items'; ?><?php @@ -2431,80 +1095,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_select_items'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -2519,11 +1116,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_name='select_items'; $attr7_rows='15'; $attr7_cols='40'; $attr7_class='inputarea'; $attr7_default=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( !$attr7_readonly) { ?><textarea <?php if ($attr7_readonly) echo ' disabled="true"' ?> class="<?php echo $attr7_class ?>" name="<?php echo $attr7_name ?>" rows="<?php echo $attr7_rows ?>" cols="<?php echo $attr7_cols ?>"><?php echo htmlentities(isset($$attr7_name)?$$attr7_name:$attr7_default) ?></textarea><?php @@ -2550,80 +1142,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_LINK'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -2638,11 +1163,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='linkelements'; $attr7_name='linkelement'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=false; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -2718,80 +1238,13 @@ 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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='ELEMENT_NAME'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -2806,11 +1259,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='names'; $attr7_name='name'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=false; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -2886,80 +1334,13 @@ 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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_DEFAULT_FOLDEROBJECT'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -2974,11 +1355,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='folders'; $attr7_name='folderobjectid'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=false; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -3054,80 +1430,13 @@ 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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_DEFAULT_OBJECT'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -3142,11 +1451,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='objects'; $attr7_name='default_objectid'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=false; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -3222,80 +1526,13 @@ 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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='EL_PROP_code'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -3310,11 +1547,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_name='code'; $attr7_rows='35'; $attr7_cols='60'; $attr7_class='inputarea'; $attr7_default=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( !$attr7_readonly) { ?><textarea <?php if ($attr7_readonly) echo ' disabled="true"' ?> class="<?php echo $attr7_class ?>" name="<?php echo $attr7_name ?>" rows="<?php echo $attr7_rows ?>" cols="<?php echo $attr7_cols ?>"><?php echo htmlentities(isset($$attr7_name)?$$attr7_name:$attr7_default) ?></textarea><?php @@ -3335,22 +1567,12 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/empty/blank.tpl.php b/themes/default/pages/html/empty/blank.tpl.php @@ -26,5 +26,5 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php ?></body> +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php ?></body> </html><?php ?> \ No newline at end of file diff --git a/themes/default/pages/html/empty/border.tpl.php b/themes/default/pages/html/empty/border.tpl.php @@ -26,5 +26,5 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php ?></body> +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php ?></body> </html><?php ?> \ 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 @@ -4,34 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_action='file'; $attr2_subaction='replace'; $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='multipart/form-data'; ?><?php - if (empty($attr2_action)) - $attr2_action = $actionName; - if (empty($attr2_subaction)) - $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_action='file'; $attr2_subaction='replace'; $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='multipart/form-data'; ?><?php $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,11 +173,6 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_name='file'; $attr6_class='upload'; $attr6_size='40'; ?><input size="<?php echo $attr6_size ?>" id="id_<?php echo $attr6_name ?>" type="file" <?php if (isset($attr6_maxlength))echo ' maxlength="'.$attr6_maxlength.'"' ?> name="<?php echo $attr6_name ?>" class="<?php echo $attr6_class ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php unset($attr6_name);unset($attr6_class);unset($attr6_size); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -199,22 +189,11 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/file/prop.tpl.php b/themes/default/pages/html/file/prop.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='global_name'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='name'; ?><?php @@ -266,11 +196,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_class='name'; $attr6_default=''; $attr6_type='text'; $attr6_name='name'; $attr6_size='50'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; @@ -294,80 +220,13 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='global_filename'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='filename'; ?><?php @@ -382,11 +241,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_class='filename'; $attr6_default=''; $attr6_type='text'; $attr6_name='filename'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; @@ -410,80 +265,13 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='file_extension'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='filename'; ?><?php @@ -498,11 +286,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_class='extension'; $attr6_default=''; $attr6_type='text'; $attr6_name='extension'; $attr6_size='10'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; @@ -526,80 +310,13 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='global_description'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -614,11 +331,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_name='description'; $attr6_rows='10'; $attr6_cols='40'; $attr6_class='description'; $attr6_default=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( !$attr6_readonly) { ?><textarea <?php if ($attr6_readonly) echo ' disabled="true"' ?> 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 @@ -639,11 +351,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('additional_info'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_false=$mode=="edit"; ?><?php if (gettype($attr4_false) === '' && gettype($attr4_false) === '1') $attr4_tmp_exec = $$attr4_false == false; @@ -669,80 +377,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_text='global_full_filename'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_class='filename'; ?><?php @@ -757,80 +398,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> class="<?php echo $attr6_class ?>" <?php ?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_var='full_filename'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php @@ -849,80 +423,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='FILE_SIZE'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -937,80 +444,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_var='size'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -1029,80 +468,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='FILE_mimetype'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='filename'; ?><?php @@ -1117,80 +489,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_class='text'; $attr6_var='mimetype'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -1209,80 +514,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text=lang('id'); $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1297,80 +535,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_var='objectid'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -1389,80 +559,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='CACHE_FILENAME'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='filename'; ?><?php @@ -1477,11 +580,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_present='cache_filename'; ?><?php $attr6_tmp_exec = isset($$attr6_present); $attr6_tmp_last_exec = $attr6_tmp_exec; @@ -1489,74 +588,11 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } { ?> <?php unset($attr6_present); ?><?php $attr7_class='text'; $attr7_var='cache_filename'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_present='cache_filename'; ?><?php @@ -1581,11 +617,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) @@ -1598,15 +629,10 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_icon='el_date'; $attr7_align='left'; ?><?php $attr7_tmp_image_file = $image_dir.'icon_'.$attr7_icon.IMG_ICON_EXT; $attr7_size = '16x16'; -?><img src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_icon);unset($attr7_align); ?><?php $attr7_date=$cache_filemtime; ?><?php +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_icon);unset($attr7_align); ?><?php $attr7_date=$cache_filemtime; ?><?php global $conf; $time = $attr7_date; if ( $time==0) @@ -1678,80 +704,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='FILE_PAGES'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1766,11 +725,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_list='pages'; $attr6_extract=true; $attr6_key='list_key'; $attr6_value='list_value'; ?><?php $attr6_list_tmp_key = $attr6_key; $attr6_list_tmp_value = $attr6_value; @@ -1792,96 +746,16 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } } ?><?php unset($attr6_list);unset($attr6_extract);unset($attr6_key);unset($attr6_value); ?><?php $attr7_title=''; $attr7_target='cms_main'; $attr7_url='url'; $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)) - $attr7_title = ''; - if(!empty($attr7_url)) $tmp_url = $attr7_url; - else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr7_name)) echo ' name="'.$attr7_name.'"'; else echo ' href="'.$tmp_url.($attr7_anchor?'#'.$attr7_anchor:'').'"' ?> class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo encodeHtml($attr7_title) ?>"><?php unset($attr7_title);unset($attr7_target);unset($attr7_url);unset($attr7_class); ?><?php $attr8_align='left'; $attr8_type='page'; ?><?php $attr8_tmp_image_file = $image_dir.'icon_'.$attr8_type.IMG_ICON_EXT; $attr8_size = '16x16'; -?><img src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='name'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?><img alt="<?php echo basename($attr8_tmp_image_file); echo ' ('; if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo $attr8_tmp_width.'x'.$attr8_tmp_height; echo')';} ?>" src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='name'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $langF = $attr8_escape?'langHtml':'lang'; + $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php $attr6_empty='pages'; ?><?php @@ -1898,74 +772,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } { ?> <?php unset($attr6_empty); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_NOT_FOUND'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -1984,11 +796,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -2005,80 +813,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='global_created'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -2093,39 +834,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_width='100%'; $attr6_space='0px'; $attr6_padding='0px'; ?><?php - $coloumn_widths=array(); - $row_classes = array(''); - $column_classes= array(''); - if(empty($attr6_class)) + $coloumn_widths = array(); + $row_classes = array(); + $column_classes = array(); $attr6_class=''; - if (!empty($attr6_widths)) - { $column_widths = explode(',',$attr6_widths); unset($attr6['widths']); - } - if (!empty($attr6_classes)) - { - $row_classes = explode(',',$attr6_rowclasses); - $row_class_idx = 999; - unset($attr6['rowclasses']); - } - if (!empty($attr6_rowclasses)) - { - $row_classes = explode(',',$attr6_rowclasses); - $row_class_idx = 999; - unset($attr6['rowclasses']); - } - if (!empty($attr6_columnclasses)) - { - $column_classes = explode(',',$attr6_columnclasses); - unset($attr6['columnclasses']); - } ?><table class="<?php echo $attr6_class ?>" cellspacing="<?php echo $attr6_space ?>" width="<?php echo $attr6_width ?>" cellpadding="<?php echo $attr6_padding ?>"><?php unset($attr6_width);unset($attr6_space);unset($attr6_padding); ?><?php ?><?php $attr7_tmp_class=''; $attr7_last_class = $attr7_tmp_class; @@ -2142,15 +857,10 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr8_width )) { ?> width="<?php echo $attr8_width ?>" <?php } -if ( isset($attr8_style )) { ?> style="<?php echo $attr8_style ?>" <?php } -if ( isset($attr8_class )) { ?> class="<?php echo $attr8_class ?>" <?php } -if ( isset($attr8_colspan)) { ?> colspan="<?php echo $attr8_colspan ?>" <?php } -if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } ?>><?php ?><?php $attr9_icon='el_date'; $attr9_align='left'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_icon.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_date=$create_date; ?><?php +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_date=$create_date; ?><?php global $conf; $time = $attr9_date; if ( $time==0) @@ -2218,15 +928,10 @@ if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr8_width )) { ?> width="<?php echo $attr8_width ?>" <?php } -if ( isset($attr8_style )) { ?> style="<?php echo $attr8_style ?>" <?php } -if ( isset($attr8_class )) { ?> class="<?php echo $attr8_class ?>" <?php } -if ( isset($attr8_colspan)) { ?> colspan="<?php echo $attr8_colspan ?>" <?php } -if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } ?>><?php ?><?php $attr9_icon='user'; $attr9_align='left'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_icon.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_user=$create_user; ?><?php +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_user=$create_user; ?><?php if ( is_object($attr9_user) ) $user = $attr9_user; else @@ -2255,80 +960,13 @@ if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='global_lastchange'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -2343,39 +981,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_width='100%'; $attr6_space='0px'; $attr6_padding='0px'; ?><?php - $coloumn_widths=array(); - $row_classes = array(''); - $column_classes= array(''); - if(empty($attr6_class)) + $coloumn_widths = array(); + $row_classes = array(); + $column_classes = array(); $attr6_class=''; - if (!empty($attr6_widths)) - { $column_widths = explode(',',$attr6_widths); unset($attr6['widths']); - } - if (!empty($attr6_classes)) - { - $row_classes = explode(',',$attr6_rowclasses); - $row_class_idx = 999; - unset($attr6['rowclasses']); - } - if (!empty($attr6_rowclasses)) - { - $row_classes = explode(',',$attr6_rowclasses); - $row_class_idx = 999; - unset($attr6['rowclasses']); - } - if (!empty($attr6_columnclasses)) - { - $column_classes = explode(',',$attr6_columnclasses); - unset($attr6['columnclasses']); - } ?><table class="<?php echo $attr6_class ?>" cellspacing="<?php echo $attr6_space ?>" width="<?php echo $attr6_width ?>" cellpadding="<?php echo $attr6_padding ?>"><?php unset($attr6_width);unset($attr6_space);unset($attr6_padding); ?><?php ?><?php $attr7_tmp_class=''; $attr7_last_class = $attr7_tmp_class; @@ -2392,15 +1004,10 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr8_width )) { ?> width="<?php echo $attr8_width ?>" <?php } -if ( isset($attr8_style )) { ?> style="<?php echo $attr8_style ?>" <?php } -if ( isset($attr8_class )) { ?> class="<?php echo $attr8_class ?>" <?php } -if ( isset($attr8_colspan)) { ?> colspan="<?php echo $attr8_colspan ?>" <?php } -if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } ?>><?php ?><?php $attr9_icon='el_date'; $attr9_align='left'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_icon.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_date=$lastchange_date; ?><?php +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_date=$lastchange_date; ?><?php global $conf; $time = $attr9_date; if ( $time==0) @@ -2468,15 +1075,10 @@ if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr8_width )) { ?> width="<?php echo $attr8_width ?>" <?php } -if ( isset($attr8_style )) { ?> style="<?php echo $attr8_style ?>" <?php } -if ( isset($attr8_class )) { ?> class="<?php echo $attr8_class ?>" <?php } -if ( isset($attr8_colspan)) { ?> colspan="<?php echo $attr8_colspan ?>" <?php } -if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } ?>><?php ?><?php $attr9_icon='user'; $attr9_align='left'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_icon.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_user=$lastchange_user; ?><?php +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_user=$lastchange_user; ?><?php if ( is_object($attr9_user) ) $user = $attr9_user; else @@ -2505,22 +1107,12 @@ if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/file/pub.tpl.php b/themes/default/pages/html/file/pub.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,22 +175,11 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/file/size.tpl.php b/themes/default/pages/html/file/size.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,14 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_class='text'; $attr6_text='IMAGE_OLD_SIZE'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -266,222 +197,28 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_var='width'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_raw='_*_'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_var='height'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_true=$mode=="edit"; ?><?php @@ -509,11 +246,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_title=lang('IMAGE_NEW_SIZE'); ?><fieldset><?php if(isset($attr7_title)) { ?><legend><?php echo encodeHtml($attr7_title) ?></legend><?php } ?><?php unset($attr7_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr5_tmp_class=''; $attr5_last_class = $attr5_tmp_class; @@ -530,11 +263,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_readonly=false; $attr7_name='type'; $attr7_value='factor'; $attr7_default=false; $attr7_prefix=''; $attr7_suffix=''; $attr7_class=''; $attr7_onchange=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) @@ -543,7 +271,8 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; - ?><input class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr7_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr7_readonly);unset($attr7_name);unset($attr7_value);unset($attr7_default);unset($attr7_prefix);unset($attr7_suffix);unset($attr7_class);unset($attr7_onchange); ?><?php ?></td><?php ?><?php ?><?php + ?><input onclick="<?php echo $attr7_name.'_'.$attr7_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr7_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr7_readonly);unset($attr7_name);unset($attr7_value);unset($attr7_default);unset($attr7_prefix);unset($attr7_suffix);unset($attr7_class);unset($attr7_onchange); ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -555,80 +284,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_for='type_factor'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_class='text'; $attr8_text='FILE_IMAGE_SIZE_FACTOR'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -643,11 +305,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='factors'; $attr7_name='factor'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=false; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -702,9 +359,7 @@ if (count($$attr7_list)==0) echo '<input type="hidden" name="'.$attr7_name.'" va if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" value="'.$box_key.'" />'; } ?><?php unset($attr7_list);unset($attr7_name);unset($attr7_onchange);unset($attr7_title);unset($attr7_class);unset($attr7_addempty);unset($attr7_multiple);unset($attr7_size);unset($attr7_lang); ?><?php $attr7_var='factor'; $attr7_value='1'; ?><?php - if (!isset($attr7_value)) - unset($$attr7_var); - elseif (isset($attr7_key)) + if (isset($attr7_key)) $$attr7_var = $attr7_value[$attr7_key]; else $$attr7_var = $attr7_value; @@ -724,11 +379,6 @@ 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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_readonly=false; $attr7_name='type'; $attr7_value='input'; $attr7_default=false; $attr7_prefix=''; $attr7_suffix=''; $attr7_class=''; $attr7_onchange=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) @@ -737,7 +387,8 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } $attr7_tmp_default = $attr7_default; else $attr7_tmp_default = ''; - ?><input class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr7_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?php unset($attr7_readonly);unset($attr7_name);unset($attr7_value);unset($attr7_default);unset($attr7_prefix);unset($attr7_suffix);unset($attr7_class);unset($attr7_onchange); ?><?php ?></td><?php ?><?php ?><?php + ?><input onclick="<?php echo $attr7_name.'_'.$attr7_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr7_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr7_readonly);unset($attr7_name);unset($attr7_value);unset($attr7_default);unset($attr7_prefix);unset($attr7_suffix);unset($attr7_class);unset($attr7_onchange); ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -749,80 +400,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_for='type_input'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_class='text'; $attr8_text='FILE_IMAGE_NEW_WIDTH_HEIGHT'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -837,11 +421,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='width'; $attr7_size='10'; $attr7_maxlength='256'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ($attr7_readonly && empty($$attr7_name)) $$attr7_name = '- '.lang('EMPTY').' -'; if(!isset($attr7_default)) $attr7_default=''; @@ -850,74 +429,11 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ($attr7_readonly) { ?><input type="hidden" id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" /><?php } } else { ?><span class="<?php echo $attr7_class ?>"><?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?></span><?php } ?><?php unset($attr7_class);unset($attr7_default);unset($attr7_type);unset($attr7_name);unset($attr7_size);unset($attr7_maxlength);unset($attr7_onchange);unset($attr7_readonly); ?><?php $attr7_class='text'; $attr7_raw='_*_'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_raw);unset($attr7_escape); ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='height'; $attr7_size='10'; $attr7_maxlength='256'; $attr7_onchange=''; $attr7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; @@ -943,11 +459,7 @@ if ($attr7_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_title=lang('options'); ?><fieldset><?php if(isset($attr7_title)) { ?><legend><?php echo encodeHtml($attr7_title) ?></legend><?php } ?><?php unset($attr7_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr5_tmp_class=''; $attr5_last_class = $attr5_tmp_class; @@ -964,80 +476,14 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_for='format'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_class='text'; $attr8_text='FILE_IMAGE_FORMAT'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -1052,11 +498,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='formats'; $attr7_name='format'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=false; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -1126,80 +567,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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_for='jpeglist_compression'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_class='text'; $attr8_text='FILE_IMAGE_JPEG_COMPRESSION'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -1214,15 +589,8 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_var='jpeg_compression'; $attr7_value='70'; ?><?php - if (!isset($attr7_value)) - unset($$attr7_var); - elseif (isset($attr7_key)) + if (isset($attr7_key)) $$attr7_var = $attr7_value[$attr7_key]; else $$attr7_var = $attr7_value; @@ -1295,11 +663,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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_default=false; $attr7_readonly=false; $attr7_name='copy'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) @@ -1312,74 +676,11 @@ if ( $attr7_readonly && $checked ) ?><input type="hidden" name="<?php echo $attr7_name ?>" value="1" /><?php } ?><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7_default);unset($attr7_readonly);unset($attr7_name); ?><?php $attr7_for='copy'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_class='text'; $attr8_key='copy'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_key);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php @@ -1398,22 +699,12 @@ if ( $attr7_readonly && $checked ) if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/folder/create.tpl.php b/themes/default/pages/html/folder/create.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='multipart/form-data'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='multipart/form-data'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/folder/createfile.tpl.php b/themes/default/pages/html/folder/createfile.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='multipart/form-data'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='multipart/form-data'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/folder/createfolder.tpl.php b/themes/default/pages/html/folder/createfolder.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/folder/createlink.tpl.php b/themes/default/pages/html/folder/createlink.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/folder/createpage.tpl.php b/themes/default/pages/html/folder/createpage.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/folder/edit.tpl.php b/themes/default/pages/html/folder/edit.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_action='folder'; $attr2_subaction='multiple'; $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_action='folder'; $attr2_subaction='multiple'; $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; diff --git a/themes/default/pages/html/folder/order.tpl.php b/themes/default/pages/html/folder/order.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { diff --git a/themes/default/pages/html/folder/prop.tpl.php b/themes/default/pages/html/folder/prop.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); @@ -204,6 +204,7 @@ if ( $attr8_readonly && $checked ) ?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr9_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_raw);unset($attr9_escape); ?><?php $attr9_class='text'; $attr9_text='global_pages'; $attr9_escape=true; ?><?php @@ -213,6 +214,7 @@ if ( $attr8_readonly && $checked ) $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = $langF($$attr9_textvar); $tmp_text = $langF($attr9_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_text);unset($attr9_escape); ?><?php ?></label><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php $attr6_present='files'; ?><?php @@ -247,6 +249,7 @@ if ( $attr8_readonly && $checked ) ?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr9_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_raw);unset($attr9_escape); ?><?php $attr9_class='text'; $attr9_text='global_files'; $attr9_escape=true; ?><?php @@ -256,6 +259,7 @@ if ( $attr8_readonly && $checked ) $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = $langF($$attr9_textvar); $tmp_text = $langF($attr9_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_text);unset($attr9_escape); ?><?php ?></label><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -313,6 +317,7 @@ if ( $attr7_readonly && $checked ) ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_text='GLOBAL_PUBLISH_WITH_SUBDIRS'; $attr8_escape=true; ?><?php @@ -322,6 +327,7 @@ if ( $attr7_readonly && $checked ) $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); $tmp_text = $langF($attr8_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php $attr6_present='clean'; ?><?php @@ -347,6 +353,7 @@ if ( $attr7_readonly && $checked ) ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_text='global_CLEAN_AFTER_PUBLISH'; $attr8_escape=true; ?><?php @@ -356,6 +363,7 @@ if ( $attr7_readonly && $checked ) $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); $tmp_text = $langF($attr8_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -382,6 +390,7 @@ if ( $attr7_readonly && $checked ) $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php diff --git a/themes/default/pages/html/folder/select.tpl.php b/themes/default/pages/html/folder/select.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_action='folder'; $attr2_subaction='edit'; $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_action='folder'; $attr2_subaction='edit'; $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; diff --git a/themes/default/pages/html/folder/show.tpl.php b/themes/default/pages/html/folder/show.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_widths='75%,25%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_widths='75%,25%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -176,6 +176,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr7_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_raw);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php @@ -202,6 +203,7 @@ $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = $langF($$attr5_textvar); $tmp_text = $langF($attr5_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_text);unset($attr5_escape); ?><?php $attr5_class='text'; $attr5_raw='_/_'; $attr5_escape=true; ?><?php @@ -210,6 +212,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr5_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_raw);unset($attr5_escape); ?><?php $attr5_class='text'; $attr5_text='GLOBAL_NAME'; $attr5_escape=true; ?><?php @@ -219,6 +222,7 @@ $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = $langF($$attr5_textvar); $tmp_text = $langF($attr5_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_text);unset($attr5_escape); ?><?php ?></td><?php ?><?php $attr4_class='help'; ?><?php @@ -241,6 +245,7 @@ $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = $langF($$attr5_textvar); $tmp_text = $langF($attr5_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_text);unset($attr5_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr3_list='object'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php @@ -297,6 +302,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php $attr7_class='text'; $attr7_raw='_'; $attr7_escape=true; ?><?php @@ -305,6 +311,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr7_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_raw);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php @@ -412,6 +419,7 @@ $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/group/add.tpl.php b/themes/default/pages/html/group/add.tpl.php @@ -1,54 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } -?><script type="text/javascript" src="themes/default/js/jquery.js"></script> - <script type="text/javascript" src="themes/default/js/jquery-lightbox.js"></script> - <link rel="stylesheet" type="text/css" href="themes/default/js/lightbox/css/jquery-lightbox.css" media="screen" /> - <script type="text/javascript"> - $(function() { - $('a.image').lightBox(); - }); - </script> -<?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $root_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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -56,7 +45,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_debug_info = 'a:5:{s:4:"name";s:13:"GLOBAL_GROUPS";s:4:"icon";s:5:"group";s:5:"width";s:3:"70%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('name'=>'GLOBAL_GROUPS','icon'=>'group','width'=>'70%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='GLOBAL_GROUPS' ?><?php $attr3_icon='group' ?><?php $attr3_width='70%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='GLOBAL_GROUPS'; $attr3_icon='group'; $attr3_width='70%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -89,20 +78,20 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo lang('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo lang('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/readonly.png" style="vertical-align:top; " border="0" /></a> <?php } + <?php if ($this->isEditMode()) { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.lang('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) { extract($pathElement); - echo '<a href="'.$url.'" class="path">'.lang($name).'</a>'; + echo '<a href="'.$url.'" class="path">'.langHtml($name).'</a>'; echo ' » '; } - echo '<span class="title">'.lang($windowTitle).'</span>'; + echo '<span class="title">'.langHtml($windowTitle).'</span>'; ?> </td> <?php @@ -111,7 +100,7 @@ <?php ?> <!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { - ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php + ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.langHtml($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php } ?> </td>--> @@ -121,23 +110,23 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $tmp_text = lang($menu['text']); - $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_text = langHtml($menu['text']); + $tmp_key = strtoupper(langHtml($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> <?php + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a> <?php } else { - ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php + ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php } } if (@$conf['help']['enabled'] ) { - ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':lang('MENU_HELP') ?></a><?php + ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php } ?></td> </tr> @@ -149,13 +138,13 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> - <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> + <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> </td> </tr> @@ -169,150 +158,76 @@ <?php } ?> <tr> <td> - <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_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_name);unset($attr3_icon);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:4:"name";s:6:"escape";s:4:"true";}' ?><?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)) - $attr6_key = $attr6_key.$attr6_suffix; - if(empty($attr6_title)) - if (!empty($attr6_key)) - $attr6_title = lang($attr6_key.'_HELP'); - else - $attr6_title = ''; - if (empty($attr6_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_text='name'; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if (!empty($attr6_array)) - { - $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_var:'?'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - if ( $attr6_escape && empty($attr6_raw) && $tmp_text!=' ' ) - $tmp_text = htmlentities($tmp_text); - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = $langF($$attr6_textvar); + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?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 $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='name'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; -?><?php if (!$attr6_readonly) { +?><?php if (!$attr6_readonly || $attr6_type=='hidden') { ?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" 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 ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php if ($attr6_readonly) { ?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php - } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?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 unset($attr6_readonly) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php + } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6_class);unset($attr6_default);unset($attr6_type);unset($attr6_name);unset($attr6_size);unset($attr6_maxlength);unset($attr6_onchange);unset($attr6_readonly); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; $attr5_colspan='2'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:9:"button_ok";}' ?><?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') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) - $attr6_text = lang('MODE_EDIT'); - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_text = 'MODE_EDIT'; + $attr6_type = 'submit'; $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=" <?php echo lang($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -324,12 +239,12 @@ if ($attr6_readonly) { <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:5:"field";s:4:"name";}' ?><?php $attr2 = array('field'=>'name') ?><?php $attr2_field='name' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='name'; ?><?php if (isset($errors[0])) $attr2_field = $errors[0]; ?><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_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php unset($attr2_field); ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/group/adduser.tpl.php b/themes/default/pages/html/group/adduser.tpl.php @@ -1,54 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } -?><script type="text/javascript" src="themes/default/js/jquery.js"></script> - <script type="text/javascript" src="themes/default/js/jquery-lightbox.js"></script> - <link rel="stylesheet" type="text/css" href="themes/default/js/lightbox/css/jquery-lightbox.css" media="screen" /> - <script type="text/javascript"> - $(function() { - $('a.image').lightBox(); - }); - </script> -<?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $root_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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -56,7 +45,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_debug_info = 'a:5:{s:4:"name";s:13:"GLOBAL_GROUPS";s:4:"icon";s:7:"project";s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('name'=>'GLOBAL_GROUPS','icon'=>'project','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='GLOBAL_GROUPS' ?><?php $attr3_icon='project' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='GLOBAL_GROUPS'; $attr3_icon='project'; $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -89,9 +78,9 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/readonly.png" style="vertical-align:top; " border="0" /></a> <?php } + <?php if ($this->isEditMode()) { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) @@ -149,11 +138,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -169,30 +158,31 @@ <?php } ?> <tr> <td> - <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_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_name);unset($attr3_icon);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:9:{s:4:"list";s:5:"users";s:4:"name";s:6:"userid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:4:"true";s:4:"size";s:2:"15";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'users','name'=>'userid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>true,'size'=>'15','lang'=>false) ?><?php $attr6_list='users' ?><?php $attr6_name='userid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=true ?><?php $attr6_size='15' ?><?php $attr6_lang=false ?><?php -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_list='users'; $attr6_name='userid'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=true; $attr6_size='15'; $attr6_lang=false; ?><?php +$attr6_tmp_list = $$attr6_list; +if ($this->isEditable() && !$this->isEditMode()) +{ + echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; +} +else +{ if ( $attr6_addempty!==FALSE ) { if ($attr6_addempty===TRUE) @@ -206,7 +196,6 @@ if ($attr6_multiple) echo ' multiple="multiple"'; if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"'; echo ' size="'.intval($attr6_size).'"'; ?>><?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) ) @@ -237,42 +226,32 @@ echo ' size="'.intval($attr6_size).'"'; } ?></select><?php if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; -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_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:5:"class";s:3:"act";}' ?><?php $attr5 = array('class'=>'act') ?><?php $attr5_class='act' ?><?php +if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />'; +} +?><?php unset($attr6_list);unset($attr6_name);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; ?><?php $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; + $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_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:9:"button_ok";}' ?><?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') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?>><?php unset($attr5_class); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) - $attr6_text = lang('MODE_EDIT'); - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_text = 'MODE_EDIT'; + $attr6_type = 'submit'; $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=" <?php echo lang($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -284,6 +263,6 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr0_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php ?><?php ?></form> +<?php ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/group/edit.tpl.php b/themes/default/pages/html/group/edit.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_NAME'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -266,11 +196,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='name'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; @@ -282,7 +207,7 @@ if ($attr6_readonly) { $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); -?><?php ?><?php $attr5_colspan='2'; ?><?php +?><?php ?><?php $attr5_class='act'; $attr5_colspan='2'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -294,22 +219,12 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } -?>><?php unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/group/listing.tpl.php b/themes/default/pages/html/group/listing.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_GROUPS'; $attr2_icon='group'; $attr2_width='70%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_GROUPS'; $attr2_icon='group'; $attr2_width='70%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -188,7 +188,7 @@ ?><a<?php if (isset($attr6_name)) echo ' name="'.$attr6_name.'"'; else echo ' href="'.$tmp_url.($attr6_anchor?'#'.$attr6_anchor:'').'"' ?> class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo encodeHtml($attr6_title) ?>"><?php unset($attr6_title);unset($attr6_target);unset($attr6_url);unset($attr6_class); ?><?php $attr7_file='icon_group'; $attr7_align='left'; ?><?php $attr7_tmp_image_file = $image_dir.$attr7_fileext; $attr7_tmp_image_file = $image_dir.$attr7_file.IMG_ICON_EXT; -?><img src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_file);unset($attr7_align); ?><?php $attr7_class='text'; $attr7_var='name'; $attr7_escape=true; ?><?php +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_file);unset($attr7_align); ?><?php $attr7_class='text'; $attr7_var='name'; $attr7_escape=true; ?><?php $attr7_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php diff --git a/themes/default/pages/html/group/remove.tpl.php b/themes/default/pages/html/group/remove.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_NAME'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -266,80 +196,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_var='name'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -358,11 +220,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('options'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -379,11 +237,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_default=false; $attr6_readonly=false; $attr6_name='confirm'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) @@ -396,74 +250,12 @@ if ( $attr6_readonly && $checked ) ?><input type="hidden" name="<?php echo $attr6_name ?>" value="1" /><?php } ?><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6_default);unset($attr6_readonly);unset($attr6_name); ?><?php $attr6_for='confirm'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_DELETE'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -482,80 +274,15 @@ if ( $attr6_readonly && $checked ) if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_class='text'; $attr6_text='GROUP_DELETE_DESC'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -574,22 +301,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/group/rights.tpl.php b/themes/default/pages/html/group/rights.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_title='ACL'; $attr2_name='x'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_title='ACL'; $attr2_name='x'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -119,11 +119,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -139,7 +139,7 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"> + <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_title);unset($attr2_name);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php $attr3_list='projects'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php $attr3_list_tmp_key = $attr3_key; $attr3_list_tmp_value = $attr3_value; @@ -160,16 +160,10 @@ extract($$attr3_list_tmp_value); } ?><?php unset($attr3_list);unset($attr3_extract);unset($attr3_key);unset($attr3_value); ?><?php ?><?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 ?><?php $attr5_colspan='14'; ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_colspan='14'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -181,11 +175,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=$projectname; ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_empty='acls'; ?><?php if ( !isset($$attr4_empty) ) $attr4_tmp_exec = empty($attr4_empty); @@ -200,16 +190,10 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } { ?> <?php unset($attr4_empty); ?><?php ?><?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 class="<?php echo $attr5_class ?>"><?php ?><?php $attr6_class='fx'; ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -221,80 +205,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } -?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_NOT_FOUND'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) +?>><?php ?><?php $attr7_class='text'; $attr7_text='GLOBAL_NOT_FOUND'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr4_not=true; $attr4_empty='acls'; ?><?php @@ -306,23 +223,16 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } $attr4_tmp_exec = true; else $attr4_tmp_exec = empty( $$attr4_empty ); - if ( !empty($attr4_not) ) - $attr4_tmp_exec = !$attr4_tmp_exec; + $attr4_tmp_exec = !$attr4_tmp_exec; $attr4_tmp_last_exec = $attr4_tmp_exec; if ( $attr4_tmp_exec ) { ?> <?php unset($attr4_not);unset($attr4_empty); ?><?php ?><?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 class="<?php echo $attr5_class ?>"><?php ?><?php $attr6_class='help'; ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -334,80 +244,14 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> class="<?php echo $attr6_class ?>" <?php ?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_USER'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_class='help'; ?><?php @@ -422,80 +266,14 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> class="<?php echo $attr6_class ?>" <?php ?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_NAME'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_class='help'; ?><?php @@ -510,80 +288,14 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> class="<?php echo $attr6_class ?>" <?php ?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_LANGUAGE'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_list='show'; $attr6_extract=false; $attr6_key='list_key'; $attr6_value='t'; ?><?php @@ -617,80 +329,14 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } +?> class="<?php echo $attr7_class ?>" <?php ?>><?php unset($attr7_class); ?><?php $attr8_title=lang('acl_'.$t.''); $attr8_class='text'; $attr8_key=$t; $attr8_suffix='_abbrev'; $attr8_prefix='acl_'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_title);unset($attr8_class);unset($attr8_key);unset($attr8_suffix);unset($attr8_prefix);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php } ?><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr4_list='rights'; $attr4_extract=true; $attr4_key='aclid'; $attr4_value='acl'; ?><?php @@ -712,17 +358,18 @@ if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } } extract($$attr4_list_tmp_value); } -?><?php unset($attr4_list);unset($attr4_extract);unset($attr4_key);unset($attr4_value); ?><?php ?><?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 class="<?php echo $attr5_class ?>"><?php ?><?php ?><?php +?><?php unset($attr4_list);unset($attr4_extract);unset($attr4_key);unset($attr4_value); ?><?php $attr5_class='data'; ?><?php + $attr5_tmp_class=''; + $attr5_tmp_class_list = explode(',',$attr5_classes); + $last_pos = array_search($attr5_last_class,$attr5_tmp_class_list); + if ( $last_pos === FALSE || $last_pos == count($attr5_tmp_class_list)-1) + $attr5_tmp_class = $attr5_tmp_class_list[0]; + else + $attr5_tmp_class = $attr5_tmp_class_list[++$last_pos]; + $attr5_tmp_class=$attr5_class; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php unset($attr5_class); ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -734,11 +381,6 @@ if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_present='groupname'; ?><?php $attr7_tmp_exec = isset($$attr7_present); $attr7_tmp_last_exec = $attr7_tmp_exec; @@ -748,89 +390,25 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } <?php unset($attr7_present); ?><?php $attr8_align='left'; $attr8_type='group'; ?><?php $attr8_tmp_image_file = $image_dir.'icon_'.$attr8_type.IMG_ICON_EXT; $attr8_size = '16x16'; -?><img src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='groupname'; $attr8_maxlength='20'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?><img alt="<?php echo basename($attr8_tmp_image_file); echo ' ('; if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo $attr8_tmp_width.'x'.$attr8_tmp_height; echo')';} ?>" src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='groupname'; $attr8_maxlength='20'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $langF = $attr8_escape?'langHtml':'lang'; + $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_maxlength);unset($attr8_escape); ?><?php ?><?php } ?><?php ?><?php $attr7_not=true; $attr7_present='username'; ?><?php $attr7_tmp_exec = isset($$attr7_present); - if ( !empty($attr7_not) ) - $attr7_tmp_exec = !$attr7_tmp_exec; + $attr7_tmp_exec = !$attr7_tmp_exec; $attr7_tmp_last_exec = $attr7_tmp_exec; if ( $attr7_tmp_exec ) { ?> <?php unset($attr7_not);unset($attr7_present); ?><?php $attr8_not=true; $attr8_present='groupname'; ?><?php $attr8_tmp_exec = isset($$attr8_present); - if ( !empty($attr8_not) ) - $attr8_tmp_exec = !$attr8_tmp_exec; + $attr8_tmp_exec = !$attr8_tmp_exec; $attr8_tmp_last_exec = $attr8_tmp_exec; if ( $attr8_tmp_exec ) { @@ -838,91 +416,20 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } <?php unset($attr8_not);unset($attr8_present); ?><?php $attr9_align='left'; $attr9_type='group'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_type.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_align);unset($attr9_type); ?><?php $attr9_class='text'; $attr9_key='global_all'; $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($attr9_title)) - $attr9_title = ''; - if (empty($attr9_type)) +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_align);unset($attr9_type); ?><?php $attr9_class='text'; $attr9_key='global_all'; $attr9_escape=true; ?><?php + $attr9_title = ''; $tmp_tag = 'span'; - else - switch( $attr9_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php - $attr9_title = ''; - if ( $attr9_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr9_array)) - { - $tmpArray = $$attr9_array; - if (!empty($attr9_var)) - $tmp_text = $tmpArray[$attr9_var]; - else - $tmp_text = $langF($tmpArray[$attr9_text]); - } - elseif (!empty($attr9_text)) - $tmp_text = $langF($attr9_text); - elseif (!empty($attr9_textvar)) - $tmp_text = $langF($$attr9_textvar); - elseif (!empty($attr9_key)) + $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = $langF($attr9_key); - elseif (!empty($attr9_var)) - $tmp_text = isset($$attr9_var)?$$attr9_var:'?unset:'.$attr9_var.'?'; - elseif (!empty($attr9_raw)) - $tmp_text = str_replace('_',' ',$attr9_raw); - elseif (!empty($attr9_value)) - $tmp_text = $attr9_value; - else - $tmp_text = ' '; - if ( !empty($attr9_maxlength) && intval($attr9_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr9_maxlength) ); - if (isset($attr9_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_key);unset($attr9_escape); ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php $attr7_var='username'; ?><?php if (!isset($attr7_value)) unset($$attr7_var); - elseif (isset($attr7_key)) - $$attr7_var = $attr7_value[$attr7_key]; - else - $$attr7_var = $attr7_value; ?><?php unset($attr7_var); ?><?php $attr7_var='groupname'; ?><?php if (!isset($attr7_value)) unset($$attr7_var); - elseif (isset($attr7_key)) - $$attr7_var = $attr7_value[$attr7_key]; - else - $$attr7_var = $attr7_value; ?><?php unset($attr7_var); ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) @@ -935,103 +442,18 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_align='left'; $attr7_type=$objecttype; ?><?php $attr7_tmp_image_file = $image_dir.'icon_'.$attr7_type.IMG_ICON_EXT; $attr7_size = '16x16'; -?><img src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_title=''; $attr7_target='_top'; $attr7_class=''; $attr7_action='index'; $attr7_subaction='object'; $attr7_id=$objectid; ?><?php +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_title=''; $attr7_target='_top'; $attr7_class=''; $attr7_action='index'; $attr7_subaction='object'; $attr7_id=$objectid; ?><?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)) - $attr7_title = ''; - if(!empty($attr7_url)) - $tmp_url = $attr7_url; - else $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr7_name)) echo ' name="'.$attr7_name.'"'; else echo ' href="'.$tmp_url.($attr7_anchor?'#'.$attr7_anchor:'').'"' ?> class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo encodeHtml($attr7_title) ?>"><?php unset($attr7_title);unset($attr7_target);unset($attr7_class);unset($attr7_action);unset($attr7_subaction);unset($attr7_id); ?><?php $attr8_title=lang('select'); $attr8_class='text'; $attr8_var='objectname'; $attr8_maxlength='20'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) + $langF = $attr8_escape?'langHtml':'lang'; + $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_title);unset($attr8_class);unset($attr8_var);unset($attr8_maxlength);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php @@ -1046,80 +468,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_class='text'; $attr7_var='languagename'; $attr7_maxlength='20'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - if ( !empty($attr7_maxlength) && intval($attr7_maxlength)!=0 ) + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; $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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_maxlength);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_list='show'; $attr6_extract=false; $attr6_key='list_key'; $attr6_value='list_value'; ?><?php @@ -1153,15 +508,8 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } ?>><?php ?><?php $attr8_var=$list_value; $attr8_value=$bits; $attr8_key=$list_value; ?><?php - if (!isset($attr8_value)) - unset($$attr8_var); - elseif (isset($attr8_key)) + if (isset($attr8_key)) $$attr8_var = $attr8_value[$attr8_key]; else $$attr8_var = $attr8_value; @@ -1171,7 +519,7 @@ if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } $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 if (in_array($attr8_name,$errors)) echo ' style="background-color:red;"' ?> /><?php +?><input class="checkbox" 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 if (in_array($attr8_name,$errors)) echo ' style="background-color:red;"' ?> /><?php if ( $attr8_readonly && $checked ) { ?><input type="hidden" name="<?php echo $attr8_name ?>" value="1" /><?php diff --git a/themes/default/pages/html/group/users.tpl.php b/themes/default/pages/html/group/users.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='GROUP_MEMBERSHIPS'; $attr2_icon='user'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='GROUP_MEMBERSHIPS'; $attr2_icon='user'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -119,11 +119,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -139,7 +139,7 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"> + <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_name);unset($attr2_icon);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php $attr3_list='memberships'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php $attr3_list_tmp_key = $attr3_key; $attr3_list_tmp_value = $attr3_value; @@ -170,7 +170,7 @@ $attr4_tmp_class=$attr4_class; $attr4_last_class = $attr4_tmp_class; echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); -?><?php unset($attr4_class); ?><?php $attr5_class='fx'; ?><?php +?><?php unset($attr4_class); ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -182,83 +182,15 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } -?>><?php unset($attr5_class); ?><?php $attr6_file='icon_user'; $attr6_align='left'; ?><?php +?>><?php ?><?php $attr6_file='icon_user'; $attr6_align='left'; ?><?php $attr6_tmp_image_file = $image_dir.$attr6_fileext; $attr6_tmp_image_file = $image_dir.$attr6_file.IMG_ICON_EXT; -?><img src="<?php echo $attr6_tmp_image_file ?>" border="0"<?php if(isset($attr6_align)) echo ' align="'.$attr6_align.'"' ?><?php if (isset($attr6_size)) { list($attr6_tmp_width,$attr6_tmp_height)=explode('x',$attr6_size);echo ' width="'.$attr6_tmp_width.'" height="'.$attr6_tmp_height.'"';} ?>><?php unset($attr6_file);unset($attr6_align); ?><?php $attr6_class='text'; $attr6_var='name'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) +?><img alt="<?php echo basename($attr6_tmp_image_file); echo ' ('; if (isset($attr6_size)) { list($attr6_tmp_width,$attr6_tmp_height)=explode('x',$attr6_size);echo $attr6_tmp_width.'x'.$attr6_tmp_height; echo')';} ?>" src="<?php echo $attr6_tmp_image_file ?>" border="0"<?php if(isset($attr6_align)) echo ' align="'.$attr6_align.'"' ?><?php if (isset($attr6_size)) { list($attr6_tmp_width,$attr6_tmp_height)=explode('x',$attr6_size);echo ' width="'.$attr6_tmp_width.'" height="'.$attr6_tmp_height.'"';} ?>><?php unset($attr6_file);unset($attr6_align); ?><?php $attr6_class='text'; $attr6_var='name'; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -273,100 +205,15 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_title=''; $attr6_target='_self'; $attr6_url=$delete_url; $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)) - $attr6_title = ''; - if(!empty($attr6_url)) $tmp_url = $attr6_url; - else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr6_name)) echo ' name="'.$attr6_name.'"'; else echo ' href="'.$tmp_url.($attr6_anchor?'#'.$attr6_anchor:'').'"' ?> class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo encodeHtml($attr6_title) ?>"><?php unset($attr6_title);unset($attr6_target);unset($attr6_url);unset($attr6_class); ?><?php $attr7_class='text'; $attr7_key='GLOBAL_DELETE'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/index/applications.tpl.php b/themes/default/pages/html/index/applications.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class);unset($attr1_title); ?><?php $attr2_icon='project'; $attr2_width='600'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class);unset($attr1_title); ?><?php $attr2_icon='project'; $attr2_width='600'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -119,11 +119,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -139,18 +139,12 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"> + <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_icon);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php ?><?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($attr3_class)) - $attr3_class=$row_class; - global $cell_column_nr; - $cell_column_nr=0; - $column_class_idx = 999; -?><tr class="<?php echo $attr3_class ?>"><?php ?><?php $attr4_colspan='2'; ?><?php + $attr3_tmp_class=''; + $attr3_last_class = $attr3_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr3_tmp_class)); +?><?php ?><?php $attr4_colspan='2'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -162,100 +156,16 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) $attr4_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr4_width )) { ?> width="<?php echo $attr4_width ?>" <?php } -if ( isset($attr4_style )) { ?> style="<?php echo $attr4_style ?>" <?php } -if ( isset($attr4_class )) { ?> class="<?php echo $attr4_class ?>" <?php } -if ( isset($attr4_colspan)) { ?> colspan="<?php echo $attr4_colspan ?>" <?php } -if ( isset($attr4_rowspan)) { ?> rowspan="<?php echo $attr4_rowspan ?>" <?php } +?> colspan="<?php echo $attr4_colspan ?>" <?php ?>><?php unset($attr4_colspan); ?><?php $attr5_title=''; $attr5_target='_self'; $attr5_class=''; $attr5_action='index'; $attr5_subaction='projectmenu'; ?><?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)) - $attr5_title = ''; - if(!empty($attr5_url)) - $tmp_url = $attr5_url; - else $tmp_url = Html::url($attr5_action,$attr5_subaction,!empty($attr5_id)?$attr5_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr5_name)) echo ' name="'.$attr5_name.'"'; else echo ' href="'.$tmp_url.($attr5_anchor?'#'.$attr5_anchor:'').'"' ?> class="<?php echo $attr5_class ?>" target="<?php echo $attr5_target ?>"<?php if (isset($attr5_accesskey)) echo ' accesskey="'.$attr5_accesskey.'"' ?> title="<?php echo encodeHtml($attr5_title) ?>"><?php unset($attr5_title);unset($attr5_target);unset($attr5_class);unset($attr5_action);unset($attr5_subaction); ?><?php $attr6_class='text'; $attr6_raw='OpenRat'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr3_list='applications'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php @@ -278,16 +188,10 @@ if ( isset($attr4_rowspan)) { ?> rowspan="<?php echo $attr4_rowspan ?>" <?php } extract($$attr3_list_tmp_value); } ?><?php unset($attr3_list);unset($attr3_extract);unset($attr3_key);unset($attr3_value); ?><?php ?><?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 ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -299,100 +203,15 @@ if ( isset($attr4_rowspan)) { ?> rowspan="<?php echo $attr4_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_title=''; $attr6_target='_self'; $attr6_url=$url; $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)) - $attr6_title = ''; - if(!empty($attr6_url)) $tmp_url = $attr6_url; - else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr6_name)) echo ' name="'.$attr6_name.'"'; else echo ' href="'.$tmp_url.($attr6_anchor?'#'.$attr6_anchor:'').'"' ?> class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo encodeHtml($attr6_title) ?>"><?php unset($attr6_title);unset($attr6_target);unset($attr6_url);unset($attr6_class); ?><?php $attr7_class='text'; $attr7_var='name'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php @@ -407,80 +226,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_var='description'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/index/projectmenu.tpl.php b/themes/default/pages/html/index/projectmenu.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class);unset($attr1_title); ?><?php $attr2_title='GLOBAL_PROJECTS'; $attr2_name='login'; $attr2_icon='project'; $attr2_width='600'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class);unset($attr1_title); ?><?php $attr2_title='GLOBAL_PROJECTS'; $attr2_name='login'; $attr2_icon='project'; $attr2_width='600'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -227,6 +227,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php diff --git a/themes/default/pages/html/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_action='index'; $attr2_subaction='login'; $attr2_name=''; $attr2_target='_top'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_action='index'; $attr2_subaction='login'; $attr2_name=''; $attr2_target='_top'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; diff --git a/themes/default/pages/html/language/advanced.tpl.php b/themes/default/pages/html/language/advanced.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $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(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_NAME'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -266,11 +196,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='name'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; @@ -294,80 +219,13 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='LANGUAGE_ISOCODE'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -382,11 +240,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='isocode'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; @@ -410,22 +263,12 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/language/edit.tpl.php b/themes/default/pages/html/language/edit.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_LANGUAGE'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -266,11 +196,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_list='isocodes'; $attr6_name='isocode'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; if ($this->isEditable() && !$this->isEditMode()) @@ -340,22 +265,12 @@ 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 -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/language/listing.tpl.php b/themes/default/pages/html/language/listing.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_icon='language'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_icon='language'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { diff --git a/themes/default/pages/html/link/edit.tpl.php b/themes/default/pages/html/link/edit.tpl.php @@ -1,54 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } -?><script type="text/javascript" src="themes/default/js/jquery.js"></script> - <script type="text/javascript" src="themes/default/js/jquery-lightbox.js"></script> - <link rel="stylesheet" type="text/css" href="themes/default/js/lightbox/css/jquery-lightbox.css" media="screen" /> - <script type="text/javascript"> - $(function() { - $('a.image').lightBox(); - }); - </script> -<?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $root_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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -56,7 +45,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_debug_info = 'a:7:{s:5:"title";s:11:"global_link";s:4:"name";s:11:"GLOBAL_PROP";s:4:"icon";s:4:"link";s:6:"widths";s:10:"5%,30%,65%";s:5:"width";s:3:"90%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('title'=>'global_link','name'=>'GLOBAL_PROP','icon'=>'link','widths'=>'5%,30%,65%','width'=>'90%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_title='global_link' ?><?php $attr3_name='GLOBAL_PROP' ?><?php $attr3_icon='link' ?><?php $attr3_widths='5%,30%,65%' ?><?php $attr3_width='90%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_title='global_link'; $attr3_name='GLOBAL_PROP'; $attr3_icon='link'; $attr3_widths='5%,30%,65%'; $attr3_width='90%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -89,9 +78,9 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/readonly.png" style="vertical-align:top; " border="0" /></a> <?php } + <?php if ($this->isEditMode()) { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) @@ -149,11 +138,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -169,248 +158,138 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"> -<?php unset($attr3) ?><?php unset($attr3_title) ?><?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_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_title);unset($attr3_name);unset($attr3_icon);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:3:"url";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'url','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='url' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='url'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) $attr6_tmp_default = $$attr6_name; elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; - ?><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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?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 $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + ?><input onclick="<?php echo $attr6_name.'_'.$attr6_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr6_readonly);unset($attr6_name);unset($attr6_value);unset($attr6_default);unset($attr6_prefix);unset($attr6_suffix);unset($attr6_class);unset($attr6_onchange); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:1:{s:3:"for";s:8:"type_url";}' ?><?php $attr6 = array('for'=>'type_url') ?><?php $attr6_for='type_url' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:8:"link_url";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'link_url','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='link_url' ?><?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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_for='type_url'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_text='link_url'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'url','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='url' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='url'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; ?><?php if (!$attr6_readonly || $attr6_type=='hidden') { ?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" 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 ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php if ($attr6_readonly) { ?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php - } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?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 unset($attr6_readonly) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6_class);unset($attr6_default);unset($attr6_type);unset($attr6_name);unset($attr6_size);unset($attr6_maxlength);unset($attr6_onchange);unset($attr6_readonly); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:4:"link";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'link','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='link' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='link'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) $attr6_tmp_default = $$attr6_name; elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; - ?><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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?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 $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + ?><input onclick="<?php echo $attr6_name.'_'.$attr6_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr6_readonly);unset($attr6_name);unset($attr6_value);unset($attr6_default);unset($attr6_prefix);unset($attr6_suffix);unset($attr6_class);unset($attr6_onchange); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:1:{s:3:"for";s:9:"type_link";}' ?><?php $attr6 = array('for'=>'type_link') ?><?php $attr6_for='type_link' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"link_target";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'link_target','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='link_target' ?><?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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_for='type_link'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_text='link_target'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:9:{s:4:"list";s:7:"objects";s:4:"name";s:14:"targetobjectid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'objects','name'=>'targetobjectid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr6_list='objects' ?><?php $attr6_name='targetobjectid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php $attr6_lang=false ?><?php -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_list='objects'; $attr6_name='targetobjectid'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php +$attr6_tmp_list = $$attr6_list; +if ($this->isEditable() && !$this->isEditMode()) +{ + echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; +} +else +{ if ( $attr6_addempty!==FALSE ) { if ($attr6_addempty===TRUE) @@ -424,7 +303,6 @@ if ($attr6_multiple) echo ' multiple="multiple"'; if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"'; echo ' size="'.intval($attr6_size).'"'; ?>><?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) ) @@ -455,42 +333,33 @@ echo ' size="'.intval($attr6_size).'"'; } ?></select><?php if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; -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_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"3";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'3') ?><?php $attr5_class='act' ?><?php $attr5_colspan='3' ?><?php +if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />'; +} +?><?php unset($attr6_list);unset($attr6_name);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; $attr5_colspan='3'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:9:"button_ok";}' ?><?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') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -502,12 +371,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:5:"field";s:4:"name";}' ?><?php $attr2 = array('field'=>'name') ?><?php $attr2_field='name' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='name'; ?><?php if (isset($errors[0])) $attr2_field = $errors[0]; ?><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_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php unset($attr2_field); ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/link/prop.tpl.php b/themes/default/pages/html/link/prop.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_width='100%'; $attr2_space='0'; $attr2_padding='5'; $attr2_rowclasses='a,b'; $attr2_columnclasses='a,b'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_width='100%'; $attr2_space='0'; $attr2_padding='5'; $attr2_rowclasses='a,b'; $attr2_columnclasses='a,b'; ?><?php $coloumn_widths = array(); $row_classes = array(); $column_classes = array(); @@ -103,6 +103,7 @@ $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_maxlength);unset($attr8_escape); ?><?php ?></a><?php ?><?php $attr7_type='filesep'; ?><?php @@ -115,6 +116,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_title);unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_style='text-align:right;'; $attr5_class='menu'; ?><?php @@ -231,7 +233,7 @@ if ($attr8_readonly) { if ( $attr6_tmp_exec ) { ?> -<?php unset($attr6_not);unset($attr6_empty); ?><?php $attr7_title=$title; $attr7_target='cms_main_main'; $attr7_url=$url; $attr7_class='menu'; $attr7_accesskey=$key; ?><?php +<?php unset($attr6_not);unset($attr6_empty); ?><?php $attr7_title=lang($title); $attr7_target='cms_main_main'; $attr7_url=$url; $attr7_class='menu'; $attr7_accesskey=$key; ?><?php $params = array(); $tmp_url = $attr7_url; ?><a<?php if (isset($attr7_name)) echo ' name="'.$attr7_name.'"'; else echo ' href="'.$tmp_url.($attr7_anchor?'#'.$attr7_anchor:'').'"' ?> class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo encodeHtml($attr7_title) ?>"><?php unset($attr7_title);unset($attr7_target);unset($attr7_url);unset($attr7_class);unset($attr7_accesskey); ?><?php $attr8_class='text'; $attr8_textvar='text'; $attr8_accesskey=$key; $attr8_escape=true; ?><?php @@ -243,6 +245,7 @@ if ($attr8_readonly) { $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); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_textvar);unset($attr8_accesskey);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php $attr6_empty='url'; ?><?php @@ -264,6 +267,7 @@ if ($attr8_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_textvar);unset($attr7_escape); ?><?php ?><?php } ?><?php ?><?php $attr6_class='text'; $attr6_raw='__'; $attr6_escape=true; ?><?php @@ -272,6 +276,7 @@ if ($attr8_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php ?><?php } ?><?php ?><?php $attr5_class='text'; $attr5_raw='_'; $attr5_escape=true; ?><?php @@ -280,6 +285,7 @@ if ($attr8_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr5_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_raw);unset($attr5_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?></table><?php ?><?php ?></body> diff --git a/themes/default/pages/html/model/edit.tpl.php b/themes/default/pages/html/model/edit.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/model/listing.tpl.php b/themes/default/pages/html/model/listing.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_MODELS'; $attr2_icon='group'; $attr2_widths='50%,25%,25%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_MODELS'; $attr2_icon='group'; $attr2_widths='50%,25%,25%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -227,7 +227,7 @@ echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr6_tmp_last_exec) { ?> -<?php ?><?php $attr7_class='name'; $attr7_text='GLOBAL_is_default'; $attr7_escape=true; ?><?php +<?php ?><?php $attr7_class='text'; $attr7_text='GLOBAL_is_default'; $attr7_escape=true; ?><?php $attr7_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php @@ -268,7 +268,7 @@ unset($attr5_tmp_last_exec) ?><?php ?><?php ?></td><?php ?><?php ?><?php echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr6_tmp_last_exec) { ?> -<?php ?><?php $attr7_class='name'; $attr7_text='GLOBAL_selected'; $attr7_escape=true; ?><?php +<?php ?><?php $attr7_class='text'; $attr7_text='GLOBAL_selected'; $attr7_escape=true; ?><?php $attr7_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php diff --git a/themes/default/pages/html/object/aclform.tpl.php b/themes/default/pages/html/object/aclform.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,11 +175,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('users'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -199,11 +192,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> width="<?php echo $attr5_width ?>"<?php ?>><?php unset($attr5_width); ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='all'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) @@ -225,80 +214,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_for='type'; $attr6_value='all'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for);unset($attr6_value); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_ALL'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -313,80 +235,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_raw='_'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -405,11 +259,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> width="<?php echo $attr5_width ?>"<?php ?>><?php unset($attr5_width); ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='user'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) @@ -431,80 +281,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_for='type'; $attr6_value='user'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for);unset($attr6_value); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_USER'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -519,11 +302,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_list='users'; $attr6_name='userid'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=true; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; if ($this->isEditable() && !$this->isEditMode()) @@ -599,11 +377,7 @@ 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 -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> width="<?php echo $attr6_width ?>"<?php ?>><?php unset($attr6_width); ?><?php $attr7_readonly=false; $attr7_name='type'; $attr7_value='group'; $attr7_default=false; $attr7_prefix=''; $attr7_suffix=''; $attr7_class=''; $attr7_onchange=''; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) @@ -625,80 +399,13 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_for='type'; $attr7_value='group'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for);unset($attr7_value); ?><?php $attr8_class='text'; $attr8_text='GLOBAL_GROUP'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -713,11 +420,6 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } ?>><?php ?><?php $attr7_list='groups'; $attr7_name='groupid'; $attr7_onchange=''; $attr7_title=''; $attr7_class=''; $attr7_addempty=true; $attr7_multiple=false; $attr7_size='1'; $attr7_lang=false; ?><?php $attr7_tmp_list = $$attr7_list; if ($this->isEditable() && !$this->isEditMode()) @@ -787,11 +489,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 -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('language'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -808,80 +506,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> width="<?php echo $attr5_width ?>"<?php ?>><?php unset($attr5_width); ?><?php $attr6_class='text'; $attr6_raw='_'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -896,80 +527,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_for='languageid'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_LANGUAGE'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -984,11 +548,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_list='languages'; $attr6_name='languageid'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; if ($this->isEditable() && !$this->isEditMode()) @@ -1058,11 +617,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 -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('acl'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_list='show'; $attr4_extract=false; $attr4_key='k'; $attr4_value='t'; ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; @@ -1098,11 +653,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> width="<?php echo $attr6_width ?>"<?php ?>><?php unset($attr6_width); ?><?php $attr7_equals='read'; $attr7_value=$t; ?><?php $attr7_tmp_exec = $attr7_equals == $attr7_value; $attr7_tmp_last_exec = $attr7_tmp_exec; @@ -1110,9 +661,7 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } { ?> <?php unset($attr7_equals);unset($attr7_value); ?><?php $attr8_var=$t; $attr8_value=true; ?><?php - if (!isset($attr8_value)) - unset($$attr8_var); - elseif (isset($attr8_key)) + if (isset($attr8_key)) $$attr8_var = $attr8_value[$attr8_key]; else $$attr8_var = $attr8_value; @@ -1129,9 +678,7 @@ if ( $attr8_readonly && $checked ) } ?><?php unset($attr8_name); unset($attr8_readonly); unset($attr8_default); ?><?php unset($attr8_default);unset($attr8_readonly);unset($attr8_name); ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr7_tmp_last_exec) { ?> <?php ?><?php $attr8_var=$t; $attr8_value=false; ?><?php - if (!isset($attr8_value)) - unset($$attr8_var); - elseif (isset($attr8_key)) + if (isset($attr8_key)) $$attr8_var = $attr8_value[$attr8_key]; else $$attr8_var = $attr8_value; @@ -1159,80 +706,14 @@ unset($attr6_tmp_last_exec) ?><?php ?><?php ?></td><?php ?><?php $attr6_cols if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_for=$t; $attr7_value=''; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for);unset($attr7_value); ?><?php $attr8_class='text'; $attr8_key=$t; $attr8_prefix='acl_'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_key);unset($attr8_prefix);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php @@ -1251,22 +732,12 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/object/rights.tpl.php b/themes/default/pages/html/object/rights.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/page/changetemplate.tpl.php b/themes/default/pages/html/page/changetemplate.tpl.php @@ -1,46 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -48,7 +45,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_debug_info = 'a:3:{s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?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_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -81,7 +78,7 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { + <?php if ($this->isEditMode()) { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } @@ -141,11 +138,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -161,303 +158,98 @@ <?php } ?> <tr> <td> - <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_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"page_template_old";s:6:"escape";s:4:"true";}' ?><?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)) - $attr6_key = $attr6_key.$attr6_suffix; - if(empty($attr6_title)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_text='page_template_old'; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:5:"_self";s:3:"url";s:12:"template_url";s:5:"class";s:0:"";}' ?><?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 + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_title=''; $attr6_target='_self'; $attr6_url='template_url'; $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)) - $attr6_title = ''; - if(!empty($attr6_url)) $tmp_url = $attr6_url; - else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); -?><a<?php if (isset($attr6_name)) echo ' name="'.$attr6_name.'"'; else echo ' href="'.$tmp_url.($attr6_anchor?'#'.$attr6_anchor:'').'"' ?> class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo encodeHtml($attr6_title) ?>"><?php unset($attr6) ?><?php unset($attr6_title) ?><?php unset($attr6_target) ?><?php unset($attr6_url) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:2:{s:5:"align";s:4:"left";s:4:"type";s:8:"template";}' ?><?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 -} elseif (isset($attr7_type)) { -?><img src="<?php echo $image_dir.'icon_'.$attr7_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php -} elseif (isset($attr7_icon)) { -?><img src="<?php echo $image_dir.'icon_'.$attr7_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php -} elseif (isset($attr7_tree)) { -?><img src="<?php echo $image_dir.'tree_'.$attr7_tree.IMG_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php -} elseif (isset($attr7_url)) { -?><img src="<?php echo $attr7_url ?>" border="0" align="<?php echo $attr7_align ?>"><?php -} 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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:13:"template_name";s:6:"escape";s:4:"true";}' ?><?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)) - $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr7_title)) - $attr7_title = ''; - if (empty($attr7_type)) +?><a<?php if (isset($attr6_name)) echo ' name="'.$attr6_name.'"'; else echo ' href="'.$tmp_url.($attr6_anchor?'#'.$attr6_anchor:'').'"' ?> class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo encodeHtml($attr6_title) ?>"><?php unset($attr6_title);unset($attr6_target);unset($attr6_url);unset($attr6_class); ?><?php $attr7_align='left'; $attr7_type='template'; ?><?php + $attr7_tmp_image_file = $image_dir.'icon_'.$attr7_type.IMG_ICON_EXT; + $attr7_size = '16x16'; +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_class='text'; $attr7_var='template_name'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:17:"page_template_new";s:6:"escape";s:4:"true";}' ?><?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)) - $attr6_key = $attr6_key.$attr6_suffix; - if(empty($attr6_title)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_text='page_template_new'; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:9:{s:4:"list";s:9:"templates";s:4:"name";s:10:"templateid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'templates','name'=>'templateid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr6_list='templates' ?><?php $attr6_name='templateid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php $attr6_lang=false ?><?php + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_list='templates'; $attr6_name='templateid'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') +if ($this->isEditable() && !$this->isEditMode()) { echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; } @@ -508,41 +300,31 @@ echo ' size="'.intval($attr6_size).'"'; if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; 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_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php +?><?php unset($attr6_list);unset($attr6_name);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; $attr5_colspan='2'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:19:"message:button_next";}' ?><?php $attr6 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>lang('button_next')) ?><?php $attr6_type='ok' ?><?php $attr6_class='ok' ?><?php $attr6_value='ok' ?><?php $attr6_text=lang('button_next') ?><?php - if ($attr6_type=='ok') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text=lang('button_next'); ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -554,12 +336,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:5:"field";s:10:"templateid";}' ?><?php $attr2 = array('field'=>'templateid') ?><?php $attr2_field='templateid' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='templateid'; ?><?php if (isset($errors[0])) $attr2_field = $errors[0]; ?><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_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php unset($attr2_field); ?><?php ?></body> +</html><?php ?>+ \ 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 @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_title='TEMPLATE_ELEMENTS'; $attr2_name='x'; $attr2_widths='30%,50%,20%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_title='TEMPLATE_ELEMENTS'; $attr2_name='x'; $attr2_widths='30%,50%,20%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -178,6 +178,7 @@ $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='help'; ?><?php @@ -200,6 +201,7 @@ $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='help'; ?><?php @@ -222,6 +224,7 @@ $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr3_empty='el'; ?><?php @@ -260,6 +263,7 @@ $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr3_list='el'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php @@ -316,6 +320,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php @@ -336,6 +341,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_raw='_'; $attr6_escape=true; ?><?php @@ -344,6 +350,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -374,6 +381,7 @@ $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); $tmp_text = $langF($attr8_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></a><?php ?><?php $attr7_class='text'; $attr7_raw='_(_'; $attr7_escape=true; ?><?php @@ -382,6 +390,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr7_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_raw);unset($attr7_escape); ?><?php $attr7_class='text'; $attr7_var='archive_count'; $attr7_escape=true; ?><?php @@ -390,6 +399,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php $attr7_class='text'; $attr7_raw='_)'; $attr7_escape=true; ?><?php @@ -398,6 +408,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr7_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_raw);unset($attr7_escape); ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr6_tmp_last_exec) { ?> @@ -407,6 +418,7 @@ $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); $tmp_text = $langF($attr7_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_title);unset($attr7_class);unset($attr7_text);unset($attr7_escape);unset($attr7_type); ?><?php ?><?php } @@ -438,6 +450,7 @@ unset($attr5_tmp_last_exec) ?><?php ?><?php $attr6_var='archive_url'; ?><?php $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = $langF($$attr5_textvar); $tmp_text = $langF($attr5_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_text);unset($attr5_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -463,6 +476,7 @@ unset($attr5_tmp_last_exec) ?><?php ?><?php $attr6_var='archive_url'; ?><?php ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr5_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_raw);unset($attr5_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/page/prop.tpl.php b/themes/default/pages/html/page/prop.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/page/pub.tpl.php b/themes/default/pages/html/page/pub.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); @@ -192,6 +192,7 @@ if ( $attr6_readonly && $checked ) ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_text='global_files'; $attr6_escape=true; ?><?php @@ -201,6 +202,7 @@ if ( $attr6_readonly && $checked ) $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?><br/><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php diff --git a/themes/default/pages/html/page/src.tpl.php b/themes/default/pages/html/page/src.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_icon='page'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_icon='page'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { diff --git a/themes/default/pages/html/pageelement/archive.tpl.php b/themes/default/pages/html/pageelement/archive.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/pageelement/diff.tpl.php b/themes/default/pages/html/pageelement/diff.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,11 +175,6 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) @@ -195,151 +187,21 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_COMPARE'; $attr6_escape=true; $attr6_type='emphatic'; ?><?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)) - $attr6_title = ''; - if (empty($attr6_type)) - $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } + $attr6_title = ''; + $tmp_tag = 'em'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape);unset($attr6_type); ?><?php $attr6_class='text'; $attr6_raw='_'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_date=$date_left; ?><?php @@ -410,11 +272,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) @@ -427,151 +284,21 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_WITH'; $attr6_escape=true; $attr6_type='emphatic'; ?><?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)) - $attr6_title = ''; - if (empty($attr6_type)) - $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } + $attr6_title = ''; + $tmp_tag = 'em'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape);unset($attr6_type); ?><?php $attr6_class='text'; $attr6_raw='_'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_date=$date_right; ?><?php @@ -646,11 +373,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_list='diff'; $attr4_extract=true; $attr4_key='list_key'; $attr4_value='list_value'; ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; @@ -699,80 +422,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } +?> width="<?php echo $attr7_width ?>"<?php +?> class="<?php echo $attr7_class ?>" <?php ?>><?php unset($attr7_width);unset($attr7_class); ?><?php $attr8_class='text'; $attr8_value=@$left[line]; $attr8_escape=true; $attr8_type='tt'; ?><?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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) - $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } + $attr8_title = ''; ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_value);unset($attr8_escape);unset($attr8_type); ?><?php ?></td><?php ?><?php $attr7_width='45%'; $attr7_class=@$left[type]; ?><?php @@ -787,80 +443,14 @@ if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } +?> width="<?php echo $attr7_width ?>"<?php +?> class="<?php echo $attr7_class ?>" <?php ?>><?php unset($attr7_width);unset($attr7_class); ?><?php $attr8_class='text'; $attr8_value=@$left[text]; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_value);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr6_tmp_last_exec) { ?> @@ -876,80 +466,15 @@ if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } +?> width="<?php echo $attr7_width ?>"<?php +?> class="<?php echo $attr7_class ?>" <?php +?> colspan="<?php echo $attr7_colspan ?>" <?php ?>><?php unset($attr7_width);unset($attr7_class);unset($attr7_colspan); ?><?php $attr8_class='text'; $attr8_raw='_'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php } @@ -971,80 +496,13 @@ unset($attr5_tmp_last_exec) ?><?php ?><?php $attr6_present='right'; ?><?php if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } +?> width="<?php echo $attr7_width ?>"<?php +?> class="<?php echo $attr7_class ?>" <?php ?>><?php unset($attr7_width);unset($attr7_class); ?><?php $attr8_class='text'; $attr8_value=@$right[line]; $attr8_escape=true; $attr8_type='tt'; ?><?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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) - $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } + $attr8_title = ''; ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_value);unset($attr8_escape);unset($attr8_type); ?><?php ?></td><?php ?><?php $attr7_width='45%'; $attr7_class=@$right[type]; ?><?php @@ -1059,80 +517,14 @@ if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } +?> width="<?php echo $attr7_width ?>"<?php +?> class="<?php echo $attr7_class ?>" <?php ?>><?php unset($attr7_width);unset($attr7_class); ?><?php $attr8_class='text'; $attr8_value=@$right[text]; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_value);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr6_tmp_last_exec) { ?> @@ -1148,97 +540,24 @@ if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr7_rowspan) ) $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr7_width )) { ?> width="<?php echo $attr7_width ?>" <?php } -if ( isset($attr7_style )) { ?> style="<?php echo $attr7_style ?>" <?php } -if ( isset($attr7_class )) { ?> class="<?php echo $attr7_class ?>" <?php } -if ( isset($attr7_colspan)) { ?> colspan="<?php echo $attr7_colspan ?>" <?php } -if ( isset($attr7_rowspan)) { ?> rowspan="<?php echo $attr7_rowspan ?>" <?php } +?> width="<?php echo $attr7_width ?>"<?php +?> class="<?php echo $attr7_class ?>" <?php +?> colspan="<?php echo $attr7_colspan ?>" <?php ?>><?php unset($attr7_width);unset($attr7_class);unset($attr7_colspan); ?><?php $attr8_class='text'; $attr8_raw='_'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php } unset($attr5_tmp_last_exec) ?><?php ?><?php ?></tr><?php ?><?php $attr5_var='left'; ?><?php if (!isset($attr5_value)) unset($$attr5_var); - elseif (isset($attr5_key)) - $$attr5_var = $attr5_value[$attr5_key]; - else - $$attr5_var = $attr5_value; ?><?php unset($attr5_var); ?><?php $attr5_var='right'; ?><?php if (!isset($attr5_value)) unset($$attr5_var); - elseif (isset($attr5_key)) - $$attr5_var = $attr5_value[$attr5_key]; - else - $$attr5_var = $attr5_value; ?><?php unset($attr5_var); ?><?php ?><?php } ?><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -1255,22 +574,9 @@ unset($attr5_tmp_last_exec) ?><?php ?><?php ?></tr><?php ?><?php $attr5_var= if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='submit'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='BUTTON_BACK'; ?><?php - if ($attr6_type=='ok') - { - if ($this->isEditable() && !$this->isEditMode()) - $attr6_text = 'MODE_EDIT'; - } - 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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/pageelement/edit.tpl.php b/themes/default/pages/html/pageelement/edit.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); @@ -197,6 +197,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_equals='date'; $attr4_value=$type; ?><?php @@ -287,6 +288,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php ?><?php } ?><?php ?><?php $attr10_class='text'; $attr10_var='monthname'; $attr10_escape=true; ?><?php @@ -295,6 +297,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php $langF = $attr10_escape?'langHtml':'lang'; $tmp_text = isset($$attr10_var)?$$attr10_var:'?unset:'.$attr10_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_var);unset($attr10_escape); ?><?php $attr10_true=$mode=="edit"; ?><?php @@ -312,6 +315,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php $attr11_title=''; $attr11_target='_self'; $attr11_url=$nextmonthurl; $attr11_class=''; ?><?php @@ -326,6 +330,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php $langF = $attr10_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr10_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_raw);unset($attr10_escape); ?><?php $attr10_true=$mode=="edit"; ?><?php @@ -349,6 +354,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php ?><?php } ?><?php ?><?php $attr10_class='text'; $attr10_var='yearname'; $attr10_escape=true; ?><?php @@ -357,6 +363,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php $langF = $attr10_escape?'langHtml':'lang'; $tmp_text = isset($$attr10_var)?$$attr10_var:'?unset:'.$attr10_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_var);unset($attr10_escape); ?><?php $attr10_true=$mode=="edit"; ?><?php @@ -374,6 +381,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php $attr11_title=''; $attr11_target='_self'; $attr11_url=$nextyearurl; $attr11_class=''; ?><?php @@ -404,6 +412,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php $langF = $attr10_escape?'langHtml':'lang'; $tmp_text = $langF($attr10_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_key);unset($attr10_escape); ?><?php ?></td><?php ?><?php $attr9_list='weekdays'; $attr9_extract=false; $attr9_key='list_key'; $attr9_value='weekday'; ?><?php @@ -443,6 +452,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = isset($$attr11_var)?$$attr11_var:'?unset:'.$attr11_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_var);unset($attr11_escape); ?><?php ?></td><?php ?><?php ?><?php } ?><?php ?><?php ?></tr><?php ?><?php $attr8_list='weeklist'; $attr8_extract=false; $attr8_key='weeknr'; $attr8_value='week'; ?><?php @@ -487,6 +497,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = isset($$attr11_var)?$$attr11_var:'?unset:'.$attr11_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_var);unset($attr11_escape); ?><?php ?></td><?php ?><?php $attr10_list='week'; $attr10_extract=true; $attr10_key='list_key'; $attr10_value='list_value'; ?><?php @@ -540,6 +551,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr13_class ?>" title="<?php echo $attr13_title ?>"><?php $langF = $attr13_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr13_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr13_class);unset($attr13_raw);unset($attr13_escape); ?><?php $attr13_class='text'; $attr13_var='nr'; $attr13_escape=true; ?><?php @@ -548,6 +560,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr13_class ?>" title="<?php echo $attr13_title ?>"><?php $langF = $attr13_escape?'langHtml':'lang'; $tmp_text = isset($$attr13_var)?$$attr13_var:'?unset:'.$attr13_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr13_class);unset($attr13_var);unset($attr13_escape); ?><?php $attr13_class='text'; $attr13_raw='__'; $attr13_escape=true; ?><?php @@ -556,6 +569,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr13_class ?>" title="<?php echo $attr13_title ?>"><?php $langF = $attr13_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr13_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr13_class);unset($attr13_raw);unset($attr13_escape); ?><?php ?><?php } ?><?php ?><?php $attr12_not=true; $attr12_empty='url'; ?><?php @@ -581,6 +595,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr14_class ?>" title="<?php echo $attr14_title ?>"><?php $langF = $attr14_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr14_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr14_class);unset($attr14_raw);unset($attr14_escape); ?><?php $attr14_class='text'; $attr14_var='nr'; $attr14_escape=true; ?><?php @@ -589,6 +604,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr14_class ?>" title="<?php echo $attr14_title ?>"><?php $langF = $attr14_escape?'langHtml':'lang'; $tmp_text = isset($$attr14_var)?$$attr14_var:'?unset:'.$attr14_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr14_class);unset($attr14_var);unset($attr14_escape); ?><?php $attr14_class='text'; $attr14_raw='__'; $attr14_escape=true; ?><?php @@ -597,6 +613,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr14_class ?>" title="<?php echo $attr14_title ?>"><?php $langF = $attr14_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr14_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr14_class);unset($attr14_raw);unset($attr14_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php $attr12_true=$today; ?><?php @@ -614,6 +631,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr13_class ?>" title="<?php echo $attr13_title ?>"><?php $langF = $attr13_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr13_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr13_class);unset($attr13_raw);unset($attr13_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?><?php } ?><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?></table><?php ?><?php ?></td><?php ?><?php ?><?php @@ -655,6 +673,7 @@ if ($attr3_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($attr8_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_key);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -728,6 +747,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_list='all_months'; $attr8_name='month'; $attr8_onchange=''; $attr8_title=''; $attr8_class=''; $attr8_addempty=false; $attr8_multiple=false; $attr8_size='1'; $attr8_lang=false; ?><?php @@ -789,6 +809,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_list='all_days'; $attr8_name='day'; $attr8_onchange=''; $attr8_title=''; $attr8_class=''; $attr8_addempty=false; $attr8_multiple=false; $attr8_size='1'; $attr8_lang=false; ?><?php @@ -866,6 +887,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($attr8_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_key);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -939,6 +961,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_list='all_minutes'; $attr8_name='minute'; $attr8_onchange=''; $attr8_title=''; $attr8_class=''; $attr8_addempty=false; $attr8_multiple=false; $attr8_size='1'; $attr8_lang=false; ?><?php @@ -1000,6 +1023,7 @@ if (count($$attr8_list)==1) echo '<input type="hidden" name="'.$attr8_name.'" va ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_list='all_seconds'; $attr8_name='second'; $attr8_onchange=''; $attr8_title=''; $attr8_class=''; $attr8_addempty=false; $attr8_multiple=false; $attr8_size='1'; $attr8_lang=false; ?><?php @@ -1123,7 +1147,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); <?php unset($attr7_equals);unset($attr7_value); ?><?php $attr8_name='text'; $attr8_type='html'; ?><?php function checkbox( $name,$value=false,$writable=true,$params=Array() ) { - $src = '<input type="checkbox" name="'.$name.'"'; + $src = '<input type="checkbox" id="id_'.$name.'" name="'.$name.'"'; foreach( $params as $name=>$val ) $src .= " $name=\"$val\""; if ( !$writable ) @@ -1151,6 +1175,11 @@ document.forms[0].<?php echo $attr7_field ?>.select(); $src .= '</select>'; return $src; } + function add_control($type,$image) + { + global $image_dir; + echo '<td><noscript>'.checkbox($type).'</noscript><label for="id_'.$type.'"><a href="javascript:'.$type.'();" title="'.langHtml('PAGE_EDITOR_ADD_'.$type).'"><img src="'.$image_dir.'/editor/'.$image.'" border"0" /></a></label>'; + } ?><?php switch( $attr8_type ) { @@ -1209,7 +1238,7 @@ function list() insert('<?php echo $attr8_name ?>',"","\n"); while( true ) { - t = window.prompt('<?php echo lang('EDITOR_PROMPT_LIST_ENTRY') ?>',''); + t = window.prompt('<?php echo langHtml('EDITOR_PROMPT_LIST_ENTRY') ?>',''); if ( t != '' && t != null ) insert('<?php echo $attr8_name ?>',"<?php echo $conf_tags['list-unnumbered'] ?> "+t+"\n",""); else @@ -1226,9 +1255,9 @@ function table() while( true ) { if ( column==1 ) - text='<?php echo lang('EDITOR_PROMPT_TABLE_CELL_FIRST_COLUMN') ?>'; + text='<?php echo langHtml('EDITOR_PROMPT_TABLE_CELL_FIRST_COLUMN') ?>'; else - text='<?php echo lang('EDITOR_PROMPT_TABLE_CELL') ?>'; + text='<?php echo langHtml('EDITOR_PROMPT_TABLE_CELL') ?>'; t = window.prompt(text,''); if ( t != '' && t != null ) { @@ -1250,25 +1279,25 @@ function table() } } </script> + <fieldset><legend><?php echo langHtml('EDITOR') ?></legend></fieldset> <table> <tr> - <td colspan="14"><noscript><input type="text" name="addtext" size="30" /></noscript></td> - </tr> - <tr> - <td><noscript><?php echo checkbox('strong') ?></noscript><a href="javascript:strong();" title="<?php echo lang('PAGE_EDITOR_ADD_STRONG') ?>"><img src="<?php echo $image_dir ?>/editor/bold.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('emphatic') ?></noscript><a href="javascript:emphatic();" title="<?php echo lang('PAGE_EDITOR_ADD_EMPHATIC') ?>"><img src="<?php echo $image_dir ?>/editor/italic.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('table') ?></noscript><a href="javascript:table();" title="<?php echo lang('PAGE_EDITOR_ADD_TABLE') ?>"><img src="<?php echo $image_dir ?>/editor/table.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('list') ?></noscript><a href="javascript:list();" title="<?php echo lang('PAGE_EDITOR_ADD_LIST') ?>"><img src="<?php echo $image_dir ?>/editor/list.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('numlist') ?></noscript><a href="javascript:numlist();" title="<?php echo lang('PAGE_EDITOR_ADD_NUMLIST') ?>"><img src="<?php echo $image_dir ?>/editor/numlist.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('image') ?></noscript><a href="javascript:image();" title="<?php echo lang('PAGE_EDITOR_ADD_IMAGE') ?>"><img src="<?php echo $image_dir ?>/editor/image.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('link') ?></noscript><a href="javascript:link();" title="<?php echo lang('PAGE_EDITOR_ADD_LINK') ?>"><img src="<?php echo $image_dir ?>/editor/link.png" border"0" /></a></td> - <td><?php echo selectBox('objectid',$objects) ?><noscript> <input type="submit" class="submit" name="addmarkup" value="<?php echo lang('GLOBAL_ADD') ?>"/></noscript></td> - <td> <input type="submit" class="submit" name="preview" value="<?php echo lang('PAGE_PREVIEW') ?>" style="width:200px;"/></td> + <td><noscript><input type="text" name="addtext" size="30" /></noscript></td> + <td><?php add_control('strong' ,'bold.png' )?></td> + <td><?php add_control('emphatic','italic.png') ?></td> + <td> </td> + <td><?php add_control('table','table.png') ?></td> + <td> </td> + <td><?php add_control('list' ,'list.png') ; ?></td> + <td><?php add_control('numlist','numlist.png') ?></td> + <td> </td> + <td><?php add_control('image','image.png') ?></td> + <td><?php add_control('link' ,'link.png' ) ?></td> + <td><input name="objectid" size="6" title="<?php echo langHtml('LINK_TO') ?>"></td> + <td><noscript> <input type="submit" class="submit" name="addmarkup" value="<?php echo langHtml('ADD') ?>"/></noscript></td> </tr> </table> + <fieldset><legend><?php echo langHtml('CONTENT') ?></legend></fieldset> <textarea name="<?php echo $attr8_name ?>" class="editor" style="width:100%;height:300px;"><?php echo $$attr8_name ?></textarea> <?php } @@ -1317,12 +1346,28 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php $langF = $attr10_escape?'langHtml':'lang'; $tmp_text = isset($$attr10_var)?$$attr10_var:'?unset:'.$attr10_var.'?'; + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_var);unset($attr10_escape); ?><?php ?></fieldset><?php ?><?php ?><br/><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php $attr8_present='languagetext'; ?><?php + $attr8_tmp_exec = isset($$attr8_present); + $attr8_tmp_last_exec = $attr8_tmp_exec; + if ( $attr8_tmp_exec ) + { +?> +<?php unset($attr8_present); ?><?php $attr9_title=$languagename; ?><fieldset><?php if(isset($attr9_title)) { ?><legend><?php echo encodeHtml($attr9_title) ?></legend><?php } ?><?php unset($attr9_title); ?><?php $attr10_class='text'; $attr10_var='languagetext'; $attr10_escape=true; ?><?php + $attr10_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php + $langF = $attr10_escape?'langHtml':'lang'; + $tmp_text = isset($$attr10_var)?$$attr10_var:'?unset:'.$attr10_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_var);unset($attr10_escape); ?><?php ?></fieldset><?php ?><?php ?><br/><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php $attr8_title=lang('value'); ?><fieldset><?php if(isset($attr8_title)) { ?><legend><?php echo encodeHtml($attr8_title) ?></legend><?php } ?><?php unset($attr8_title); ?><?php ?></fieldset><?php ?><?php $attr8_name='text'; $attr8_type='wiki'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_var);unset($attr10_escape); ?><?php ?></fieldset><?php ?><?php ?><br/><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php $attr8_name='text'; $attr8_type='wiki'; ?><?php function checkbox( $name,$value=false,$writable=true,$params=Array() ) { - $src = '<input type="checkbox" name="'.$name.'"'; + $src = '<input type="checkbox" id="id_'.$name.'" name="'.$name.'"'; foreach( $params as $name=>$val ) $src .= " $name=\"$val\""; if ( !$writable ) @@ -1350,6 +1395,11 @@ function table() $src .= '</select>'; return $src; } + function add_control($type,$image) + { + global $image_dir; + echo '<td><noscript>'.checkbox($type).'</noscript><label for="id_'.$type.'"><a href="javascript:'.$type.'();" title="'.langHtml('PAGE_EDITOR_ADD_'.$type).'"><img src="'.$image_dir.'/editor/'.$image.'" border"0" /></a></label>'; + } ?><?php switch( $attr8_type ) { @@ -1408,7 +1458,7 @@ function list() insert('<?php echo $attr8_name ?>',"","\n"); while( true ) { - t = window.prompt('<?php echo lang('EDITOR_PROMPT_LIST_ENTRY') ?>',''); + t = window.prompt('<?php echo langHtml('EDITOR_PROMPT_LIST_ENTRY') ?>',''); if ( t != '' && t != null ) insert('<?php echo $attr8_name ?>',"<?php echo $conf_tags['list-unnumbered'] ?> "+t+"\n",""); else @@ -1425,9 +1475,9 @@ function table() while( true ) { if ( column==1 ) - text='<?php echo lang('EDITOR_PROMPT_TABLE_CELL_FIRST_COLUMN') ?>'; + text='<?php echo langHtml('EDITOR_PROMPT_TABLE_CELL_FIRST_COLUMN') ?>'; else - text='<?php echo lang('EDITOR_PROMPT_TABLE_CELL') ?>'; + text='<?php echo langHtml('EDITOR_PROMPT_TABLE_CELL') ?>'; t = window.prompt(text,''); if ( t != '' && t != null ) { @@ -1449,25 +1499,25 @@ function table() } } </script> + <fieldset><legend><?php echo langHtml('EDITOR') ?></legend></fieldset> <table> <tr> - <td colspan="14"><noscript><input type="text" name="addtext" size="30" /></noscript></td> - </tr> - <tr> - <td><noscript><?php echo checkbox('strong') ?></noscript><a href="javascript:strong();" title="<?php echo lang('PAGE_EDITOR_ADD_STRONG') ?>"><img src="<?php echo $image_dir ?>/editor/bold.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('emphatic') ?></noscript><a href="javascript:emphatic();" title="<?php echo lang('PAGE_EDITOR_ADD_EMPHATIC') ?>"><img src="<?php echo $image_dir ?>/editor/italic.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('table') ?></noscript><a href="javascript:table();" title="<?php echo lang('PAGE_EDITOR_ADD_TABLE') ?>"><img src="<?php echo $image_dir ?>/editor/table.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('list') ?></noscript><a href="javascript:list();" title="<?php echo lang('PAGE_EDITOR_ADD_LIST') ?>"><img src="<?php echo $image_dir ?>/editor/list.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('numlist') ?></noscript><a href="javascript:numlist();" title="<?php echo lang('PAGE_EDITOR_ADD_NUMLIST') ?>"><img src="<?php echo $image_dir ?>/editor/numlist.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('image') ?></noscript><a href="javascript:image();" title="<?php echo lang('PAGE_EDITOR_ADD_IMAGE') ?>"><img src="<?php echo $image_dir ?>/editor/image.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('link') ?></noscript><a href="javascript:link();" title="<?php echo lang('PAGE_EDITOR_ADD_LINK') ?>"><img src="<?php echo $image_dir ?>/editor/link.png" border"0" /></a></td> - <td><?php echo selectBox('objectid',$objects) ?><noscript> <input type="submit" class="submit" name="addmarkup" value="<?php echo lang('GLOBAL_ADD') ?>"/></noscript></td> - <td> <input type="submit" class="submit" name="preview" value="<?php echo lang('PAGE_PREVIEW') ?>" style="width:200px;"/></td> + <td><noscript><input type="text" name="addtext" size="30" /></noscript></td> + <td><?php add_control('strong' ,'bold.png' )?></td> + <td><?php add_control('emphatic','italic.png') ?></td> + <td> </td> + <td><?php add_control('table','table.png') ?></td> + <td> </td> + <td><?php add_control('list' ,'list.png') ; ?></td> + <td><?php add_control('numlist','numlist.png') ?></td> + <td> </td> + <td><?php add_control('image','image.png') ?></td> + <td><?php add_control('link' ,'link.png' ) ?></td> + <td><input name="objectid" size="6" title="<?php echo langHtml('LINK_TO') ?>"></td> + <td><noscript> <input type="submit" class="submit" name="addmarkup" value="<?php echo langHtml('ADD') ?>"/></noscript></td> </tr> </table> + <fieldset><legend><?php echo langHtml('CONTENT') ?></legend></fieldset> <textarea name="<?php echo $attr8_name ?>" class="editor" style="width:100%;height:300px;"><?php echo $$attr8_name ?></textarea> <?php } @@ -1532,6 +1582,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_key='text_markup_strong'; $attr11_escape=true; ?><?php @@ -1540,6 +1591,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $langF($attr11_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_key);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['strong-end']; $attr11_escape=true; ?><?php @@ -1548,6 +1600,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php ?><br/><?php ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['emphatic-begin']; $attr11_escape=true; ?><?php @@ -1556,6 +1609,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_key='text_markup_emphatic'; $attr11_escape=true; ?><?php @@ -1564,6 +1618,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $langF($attr11_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_key);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['emphatic-end']; $attr11_escape=true; ?><?php @@ -1572,6 +1627,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1592,6 +1648,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_key='text_markup_numbered_list'; $attr11_escape=true; ?><?php @@ -1600,6 +1657,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $langF($attr11_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_key);unset($attr11_escape); ?><?php ?><br/><?php ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['list-numbered']; $attr11_escape=true; ?><?php @@ -1608,6 +1666,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_raw='...'; $attr11_escape=true; ?><?php @@ -1616,6 +1675,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php ?><br/><?php ?><?php ?></td><?php ?><?php ?><?php @@ -1636,6 +1696,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_key='text_markup_unnumbered_list'; $attr11_escape=true; ?><?php @@ -1644,6 +1705,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $langF($attr11_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_key);unset($attr11_escape); ?><?php ?><br/><?php ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['list-unnumbered']; $attr11_escape=true; ?><?php @@ -1652,6 +1714,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_raw='...'; $attr11_escape=true; ?><?php @@ -1660,6 +1723,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php ?><br/><?php ?><?php ?></td><?php ?><?php ?><?php @@ -1680,6 +1744,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_key='text_markup_table'; $attr11_escape=true; ?><?php @@ -1688,6 +1753,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $langF($attr11_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_key);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['table-cell-sep']; $attr11_escape=true; ?><?php @@ -1696,6 +1762,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_raw='...'; $attr11_escape=true; ?><?php @@ -1704,6 +1771,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['table-cell-sep']; $attr11_escape=true; ?><?php @@ -1712,6 +1780,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_raw='...'; $attr11_escape=true; ?><?php @@ -1720,6 +1789,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['table-cell-sep']; $attr11_escape=true; ?><?php @@ -1728,6 +1798,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php ?><br/><?php ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['table-cell-sep']; $attr11_escape=true; ?><?php @@ -1736,6 +1807,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_raw='...'; $attr11_escape=true; ?><?php @@ -1744,6 +1816,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['table-cell-sep']; $attr11_escape=true; ?><?php @@ -1752,6 +1825,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_raw='...'; $attr11_escape=true; ?><?php @@ -1760,6 +1834,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['table-cell-sep']; $attr11_escape=true; ?><?php @@ -1768,6 +1843,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_raw='...'; $attr11_escape=true; ?><?php @@ -1776,6 +1852,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr11_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_raw);unset($attr11_escape); ?><?php $attr11_class='text'; $attr11_value=@$conf['editor']['text-markup']['table-cell-sep']; $attr11_escape=true; ?><?php @@ -1784,6 +1861,7 @@ function table() ?><<?php echo $tmp_tag ?> class="<?php echo $attr11_class ?>" title="<?php echo $attr11_title ?>"><?php $langF = $attr11_escape?'langHtml':'lang'; $tmp_text = $attr11_value; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_value);unset($attr11_escape); ?><?php ?><br/><?php ?><?php ?></td><?php ?><?php ?></table><?php ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php $attr7_equals='text'; $attr7_value=$editor; ?><?php @@ -1830,6 +1908,7 @@ document.forms[0].<?php echo $attr8_field ?>.select(); ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($attr7_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1934,6 +2013,7 @@ document.forms[0].<?php echo $attr7_field ?>.select(); ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($attr8_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_key);unset($attr8_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -2253,6 +2333,158 @@ document.forms[0].<?php echo $attr7_field ?>.select(); if ( $attr4_tmp_exec ) { ?> +<?php unset($attr4_true); ?><?php $attr5_equals='longtext'; $attr5_value=$type; ?><?php + $attr5_tmp_exec = $attr5_equals == $attr5_value; + $attr5_tmp_last_exec = $attr5_tmp_exec; + if ( $attr5_tmp_exec ) + { +?> +<?php unset($attr5_equals);unset($attr5_value); ?><?php $attr6_equals='wiki'; $attr6_value=$editor; ?><?php + $attr6_tmp_exec = $attr6_equals == $attr6_value; + $attr6_tmp_last_exec = $attr6_tmp_exec; + if ( $attr6_tmp_exec ) + { +?> +<?php unset($attr6_equals);unset($attr6_value); ?><?php $attr7_present='languages'; ?><?php + $attr7_tmp_exec = isset($$attr7_present); + $attr7_tmp_last_exec = $attr7_tmp_exec; + if ( $attr7_tmp_exec ) + { +?> +<?php unset($attr7_present); ?><?php ?><?php + $attr8_tmp_class=''; + $attr8_last_class = $attr8_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr8_tmp_class)); +?><?php ?><?php $attr9_colspan='2'; ?><?php + $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 +?> colspan="<?php echo $attr9_colspan ?>" <?php +?>><?php unset($attr9_colspan); ?><?php $attr10_title=lang('editor_show_language'); ?><fieldset><?php if(isset($attr10_title)) { ?><legend><?php echo encodeHtml($attr10_title) ?></legend><?php } ?><?php unset($attr10_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr8_tmp_class=''; + $attr8_last_class = $attr8_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr8_tmp_class)); +?><?php ?><?php $attr9_colspan='2'; ?><?php + $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 +?> colspan="<?php echo $attr9_colspan ?>" <?php +?>><?php unset($attr9_colspan); ?><?php $attr10_list='languages'; $attr10_extract=false; $attr10_key='languageid'; $attr10_value='languagename'; ?><?php + $attr10_list_tmp_key = $attr10_key; + $attr10_list_tmp_value = $attr10_value; + $attr10_list_extract = $attr10_extract; + unset($attr10_key); + unset($attr10_value); + if ( !isset($$attr10_list) || !is_array($$attr10_list) ) + $$attr10_list = array(); + foreach( $$attr10_list as $$attr10_list_tmp_key => $$attr10_list_tmp_value ) + { + if ( $attr10_list_extract ) + { + if ( !is_array($$attr10_list_tmp_value) ) + { + print_r($$attr10_list_tmp_value); + die( 'not an array at key: '.$$attr10_list_tmp_key ); + } + extract($$attr10_list_tmp_value); + } +?><?php unset($attr10_list);unset($attr10_extract);unset($attr10_key);unset($attr10_value); ?><?php $attr11_readonly=false; $attr11_name='otherlanguageid'; $attr11_value=$languageid; $attr11_default=false; $attr11_prefix=''; $attr11_suffix=''; $attr11_class=''; $attr11_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr11_readonly=true; + if ( isset($$attr11_name) ) + $attr11_tmp_default = $$attr11_name; + elseif ( isset($attr11_default) ) + $attr11_tmp_default = $attr11_default; + else + $attr11_tmp_default = ''; + ?><input onclick="<?php echo $attr11_name.'_'.$attr11_value ?>_valueChanged(this);" class="radio" type="radio" id="id_<?php echo $attr11_name.'_'.$attr11_value ?>" name="<?php echo $attr11_prefix.$attr11_name ?>"<?php if ( $attr11_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $attr11_value ?>" <?php if($attr11_value==$attr11_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr11_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr11_readonly);unset($attr11_name);unset($attr11_value);unset($attr11_default);unset($attr11_prefix);unset($attr11_suffix);unset($attr11_class);unset($attr11_onchange); ?><?php $attr11_for='otherlanguageid_'.$languageid.''; ?><label for="id_<?php echo $attr11_for ?><?php if (!empty($attr11_value)) echo '_'.$attr11_value ?>"><?php unset($attr11_for); ?><?php $attr12_class='text'; $attr12_var='languagename'; $attr12_escape=true; ?><?php + $attr12_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $attr12_class ?>" title="<?php echo $attr12_title ?>"><?php + $langF = $attr12_escape?'langHtml':'lang'; + $tmp_text = isset($$attr12_var)?$$attr12_var:'?unset:'.$attr12_var.'?'; + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($attr12_class);unset($attr12_var);unset($attr12_escape); ?><?php ?></label><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php + $attr7_tmp_class=''; + $attr7_last_class = $attr7_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr7_tmp_class)); +?><?php ?><?php $attr8_colspan='2'; ?><?php + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr8_class)) + $attr8_class=$column_class; + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) + $attr8_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr8_colspan ?>" <?php +?>><?php unset($attr8_colspan); ?><?php $attr9_title=lang('PAGE_PREVIEW'); ?><fieldset><?php if(isset($attr9_title)) { ?><legend><?php echo encodeHtml($attr9_title) ?></legend><?php } ?><?php unset($attr9_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr7_tmp_class=''; + $attr7_last_class = $attr7_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr7_tmp_class)); +?><?php ?><?php $attr8_colspan='2'; ?><?php + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr8_class)) + $attr8_class=$column_class; + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) + $attr8_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr8_colspan ?>" <?php +?>><?php unset($attr8_colspan); ?><?php $attr9_default=false; $attr9_readonly=false; $attr9_name='preview'; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr9_readonly=true; + if ( isset($$attr9_name) ) + $checked = $$attr9_name; + else + $checked = $attr9_default; +?><input class="checkbox" type="checkbox" id="id_<?php echo $attr9_name ?>" name="<?php echo $attr9_name ?>" <?php if ($attr9_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?><?php if (in_array($attr9_name,$errors)) echo ' style="background-color:red;"' ?> /><?php +if ( $attr9_readonly && $checked ) +{ +?><input type="hidden" name="<?php echo $attr9_name ?>" value="1" /><?php +} +?><?php unset($attr9_name); unset($attr9_readonly); unset($attr9_default); ?><?php unset($attr9_default);unset($attr9_readonly);unset($attr9_name); ?><?php $attr9_for='preview'; ?><label for="id_<?php echo $attr9_for ?><?php if (!empty($attr9_value)) echo '_'.$attr9_value ?>"><?php unset($attr9_for); ?><?php $attr10_class='text'; $attr10_key='PAGE_PREVIEW'; $attr10_escape=true; ?><?php + $attr10_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $attr10_class ?>" title="<?php echo $attr10_title ?>"><?php + $langF = $attr10_escape?'langHtml':'lang'; + $tmp_text = $langF($attr10_key); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($attr10_class);unset($attr10_key);unset($attr10_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php $attr4_true=$mode=="edit"; ?><?php + if (gettype($attr4_true) === '' && gettype($attr4_true) === '1') + $attr4_tmp_exec = $$attr4_true == true; + else + $attr4_tmp_exec = $attr4_true == true; + $attr4_tmp_last_exec = $attr4_tmp_exec; + if ( $attr4_tmp_exec ) + { +?> <?php unset($attr4_true); ?><?php $attr5_present='release'; ?><?php $attr5_tmp_exec = isset($$attr5_present); $attr5_tmp_last_exec = $attr5_tmp_exec; @@ -2323,6 +2555,7 @@ if ( $attr8_readonly && $checked ) $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = $langF($$attr9_textvar); $tmp_text = $langF($attr9_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_text);unset($attr9_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr5_present='publish'; ?><?php @@ -2366,6 +2599,7 @@ if ( $attr8_readonly && $checked ) $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = $langF($$attr9_textvar); $tmp_text = $langF($attr9_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_text);unset($attr9_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php ?><?php diff --git a/themes/default/pages/html/pageelement/link.tpl.php b/themes/default/pages/html/pageelement/link.tpl.php @@ -1,54 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } -?><script type="text/javascript" src="themes/default/js/jquery.js"></script> - <script type="text/javascript" src="themes/default/js/jquery-lightbox.js"></script> - <link rel="stylesheet" type="text/css" href="themes/default/js/lightbox/css/jquery-lightbox.css" media="screen" /> - <script type="text/javascript"> - $(function() { - $('a.image').lightBox(); - }); - </script> -<?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $root_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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -56,7 +45,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_debug_info = 'a:4:{s:4:"name";s:7:"element";s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('name'=>'element','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='element' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='element'; $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -89,7 +78,7 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { + <?php if ($this->isEditMode()) { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } @@ -149,11 +138,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -169,117 +158,54 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"> -<?php unset($attr3) ?><?php unset($attr3_name) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:4:"help";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'help','colspan'=>'2') ?><?php $attr5_class='help' ?><?php $attr5_colspan='2' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='help'; $attr5_colspan='2'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:4:"desc";s:6:"escape";s:4:"true";}' ?><?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)) - $attr6_key = $attr6_key.$attr6_suffix; - if(empty($attr6_title)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_class='text'; $attr6_var='desc'; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_var) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:2:"fx";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'fx','colspan'=>'2') ?><?php $attr5_class='fx' ?><?php $attr5_colspan='2' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_colspan='2'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:9:{s:4:"list";s:7:"objects";s:4:"name";s:12:"linkobjectid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'objects','name'=>'linkobjectid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr6_list='objects' ?><?php $attr6_name='linkobjectid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php $attr6_lang=false ?><?php + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_list='objects'; $attr6_name='linkobjectid'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') +if ($this->isEditable() && !$this->isEditMode()) { echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; } @@ -330,630 +256,166 @@ echo ' size="'.intval($attr6_size).'"'; if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; 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_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"release";}' ?><?php $attr4 = array('present'=>'release') ?><?php $attr4_present='release' ?><?php - if ( isset($attr4_true) ) - { - if (gettype($attr4_true) === '' && gettype($attr4_true) === '1') - $exec = $$attr4_true == true; - else - $exec = $attr4_true == true; - } - elseif ( isset($attr4_false) ) - { - if (gettype($attr4_false) === '' && gettype($attr4_false) === '1') - $exec = $$attr4_false == false; - else - $exec = $attr4_false == false; - } - elseif( isset($attr4_contains) ) - $exec = in_array($attr4_value,explode(',',$attr4_contains)); - elseif( isset($attr4_equals)&& isset($attr4_value) ) - $exec = $attr4_equals == $attr4_value; - elseif( isset($attr4_lessthan)&& isset($attr4_value) ) - $exec = intval($attr4_lessthan) > intval($attr4_value); - elseif( isset($attr4_greaterthan)&& isset($attr4_value) ) - $exec = intval($attr4_greaterthan) < intval($attr4_value); - 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 ); - } - elseif ( isset($attr4_present) ) - { - $exec = isset($$attr4_present); - } - else - { - trigger_error("error in IF, assume: FALSE"); - $exec = false; - } - if ( !empty($attr4_invert) ) - $exec = !$exec; - 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($attr6_list);unset($attr6_name);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_present='release'; ?><?php + $attr4_tmp_exec = isset($$attr4_present); + $attr4_tmp_last_exec = $attr4_tmp_exec; + if ( $attr4_tmp_exec ) { ?> -<?php unset($attr4) ?><?php unset($attr4_present) ?><?php $attr5_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr5 = array('present'=>'publish') ?><?php $attr5_present='publish' ?><?php - if ( isset($attr5_true) ) - { - if (gettype($attr5_true) === '' && gettype($attr5_true) === '1') - $exec = $$attr5_true == true; - else - $exec = $attr5_true == true; - } - elseif ( isset($attr5_false) ) - { - if (gettype($attr5_false) === '' && gettype($attr5_false) === '1') - $exec = $$attr5_false == false; - else - $exec = $attr5_false == false; - } - elseif( isset($attr5_contains) ) - $exec = in_array($attr5_value,explode(',',$attr5_contains)); - elseif( isset($attr5_equals)&& isset($attr5_value) ) - $exec = $attr5_equals == $attr5_value; - elseif( isset($attr5_lessthan)&& isset($attr5_value) ) - $exec = intval($attr5_lessthan) > intval($attr5_value); - elseif( isset($attr5_greaterthan)&& isset($attr5_value) ) - $exec = intval($attr5_greaterthan) < intval($attr5_value); - 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 ); - } - elseif ( isset($attr5_present) ) - { - $exec = isset($$attr5_present); - } - else - { - trigger_error("error in IF, assume: FALSE"); - $exec = false; - } - if ( !empty($attr5_invert) ) - $exec = !$exec; - 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($attr4_present); ?><?php $attr5_present='publish'; ?><?php + $attr5_tmp_exec = isset($$attr5_present); + $attr5_tmp_last_exec = $attr5_tmp_exec; + if ( $attr5_tmp_exec ) { ?> -<?php unset($attr5) ?><?php unset($attr5_present) ?><?php $attr6_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:7:"colspan";s:1:"2";}' ?><?php $attr7 = array('colspan'=>'2') ?><?php $attr7_colspan='2' ?><?php +<?php unset($attr5_present); ?><?php ?><?php + $attr6_tmp_class=''; + $attr6_last_class = $attr6_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr6_tmp_class)); +?><?php ?><?php $attr7_colspan='2'; ?><?php $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; + $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_debug_info = 'a:1:{s:5:"title";s:7:"options";}' ?><?php $attr8 = array('title'=>'options') ?><?php $attr8_title='options' ?><fieldset><?php if(isset($attr8_title)) { ?><legend><?php echo encodeHtml($attr8_title) ?></legend><?php } ?><?php unset($attr8) ?><?php unset($attr8_title) ?><?php $attr7_debug_info = 'a:0:{}' ?><?php $attr7 = array() ?></fieldset><?php unset($attr7) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></td><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></tr><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?><?php } ?><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"release";}' ?><?php $attr4 = array('present'=>'release') ?><?php $attr4_present='release' ?><?php - if ( isset($attr4_true) ) - { - if (gettype($attr4_true) === '' && gettype($attr4_true) === '1') - $exec = $$attr4_true == true; - else - $exec = $attr4_true == true; - } - elseif ( isset($attr4_false) ) - { - if (gettype($attr4_false) === '' && gettype($attr4_false) === '1') - $exec = $$attr4_false == false; - else - $exec = $attr4_false == false; - } - elseif( isset($attr4_contains) ) - $exec = in_array($attr4_value,explode(',',$attr4_contains)); - elseif( isset($attr4_equals)&& isset($attr4_value) ) - $exec = $attr4_equals == $attr4_value; - elseif( isset($attr4_lessthan)&& isset($attr4_value) ) - $exec = intval($attr4_lessthan) > intval($attr4_value); - elseif( isset($attr4_greaterthan)&& isset($attr4_value) ) - $exec = intval($attr4_greaterthan) < intval($attr4_value); - 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 ); - } - elseif ( isset($attr4_present) ) - { - $exec = isset($$attr4_present); - } - else - { - trigger_error("error in IF, assume: FALSE"); - $exec = false; - } - if ( !empty($attr4_invert) ) - $exec = !$exec; - 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 ) + $attr7_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr7_colspan ?>" <?php +?>><?php unset($attr7_colspan); ?><?php $attr8_title=lang('options'); ?><fieldset><?php if(isset($attr8_title)) { ?><legend><?php echo encodeHtml($attr8_title) ?></legend><?php } ?><?php unset($attr8_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php $attr4_present='release'; ?><?php + $attr4_tmp_exec = isset($$attr4_present); + $attr4_tmp_last_exec = $attr4_tmp_exec; + if ( $attr4_tmp_exec ) { ?> -<?php unset($attr4) ?><?php unset($attr4_present) ?><?php $attr5_debug_info = 'a:0:{}' ?><?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 class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"class";s:2:"fx";s:7:"colspan";s:1:"2";}' ?><?php $attr6 = array('class'=>'fx','colspan'=>'2') ?><?php $attr6_class='fx' ?><?php $attr6_colspan='2' ?><?php +<?php unset($attr4_present); ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_colspan='2'; ?><?php $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; + $attr6_class=$column_class; global $cell_column_nr; $cell_column_nr++; 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_debug_info = 'a:3:{s:7:"default";s:5:"false";s:8:"readonly";s:5:"false";s:4:"name";s:7:"release";}' ?><?php $attr7 = array('default'=>false,'readonly'=>false,'name'=>'release') ?><?php $attr7_default=false ?><?php $attr7_readonly=false ?><?php $attr7_name='release' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr7_readonly=true; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr6_colspan ?>" <?php +?>><?php unset($attr6_colspan); ?><?php $attr7_default=false; $attr7_readonly=false; $attr7_name='release'; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) $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 if (in_array($attr7_name,$errors)) echo ' style="background-color:red;"' ?> /><?php +?><input class="checkbox" 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 if (in_array($attr7_name,$errors)) echo ' style="background-color:red;"' ?> /><?php if ( $attr7_readonly && $checked ) { ?><input type="hidden" name="<?php echo $attr7_name ?>" value="1" /><?php } -?><?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_debug_info = 'a:1:{s:3:"for";s:7:"release";}' ?><?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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7_default);unset($attr7_readonly);unset($attr7_name); ?><?php $attr7_for='release'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_class='text'; $attr8_raw='_'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:14:"GLOBAL_RELEASE";s:6:"escape";s:4:"true";}' ?><?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)) - $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_text='GLOBAL_RELEASE'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:1:{s:7:"present";s:7:"publish";}' ?><?php $attr4 = array('present'=>'publish') ?><?php $attr4_present='publish' ?><?php - if ( isset($attr4_true) ) - { - if (gettype($attr4_true) === '' && gettype($attr4_true) === '1') - $exec = $$attr4_true == true; - else - $exec = $attr4_true == true; - } - elseif ( isset($attr4_false) ) - { - if (gettype($attr4_false) === '' && gettype($attr4_false) === '1') - $exec = $$attr4_false == false; - else - $exec = $attr4_false == false; - } - elseif( isset($attr4_contains) ) - $exec = in_array($attr4_value,explode(',',$attr4_contains)); - elseif( isset($attr4_equals)&& isset($attr4_value) ) - $exec = $attr4_equals == $attr4_value; - elseif( isset($attr4_lessthan)&& isset($attr4_value) ) - $exec = intval($attr4_lessthan) > intval($attr4_value); - elseif( isset($attr4_greaterthan)&& isset($attr4_value) ) - $exec = intval($attr4_greaterthan) < intval($attr4_value); - 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 ); - } - elseif ( isset($attr4_present) ) - { - $exec = isset($$attr4_present); - } - else - { - trigger_error("error in IF, assume: FALSE"); - $exec = false; - } - if ( !empty($attr4_invert) ) - $exec = !$exec; - 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 echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr4_present='publish'; ?><?php + $attr4_tmp_exec = isset($$attr4_present); + $attr4_tmp_last_exec = $attr4_tmp_exec; + if ( $attr4_tmp_exec ) { ?> -<?php unset($attr4) ?><?php unset($attr4_present) ?><?php $attr5_debug_info = 'a:0:{}' ?><?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 class="<?php echo $attr5_class ?>"><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"class";s:2:"fx";s:7:"colspan";s:1:"2";}' ?><?php $attr6 = array('class'=>'fx','colspan'=>'2') ?><?php $attr6_class='fx' ?><?php $attr6_colspan='2' ?><?php +<?php unset($attr4_present); ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_colspan='2'; ?><?php $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; + $attr6_class=$column_class; global $cell_column_nr; $cell_column_nr++; 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_debug_info = 'a:3:{s:7:"default";s:5:"false";s:8:"readonly";s:5:"false";s:4:"name";s:7:"publish";}' ?><?php $attr7 = array('default'=>false,'readonly'=>false,'name'=>'publish') ?><?php $attr7_default=false ?><?php $attr7_readonly=false ?><?php $attr7_name='publish' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr7_readonly=true; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr6_colspan ?>" <?php +?>><?php unset($attr6_colspan); ?><?php $attr7_default=false; $attr7_readonly=false; $attr7_name='publish'; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr7_readonly=true; if ( isset($$attr7_name) ) $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 if (in_array($attr7_name,$errors)) echo ' style="background-color:red;"' ?> /><?php +?><input class="checkbox" 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 if (in_array($attr7_name,$errors)) echo ' style="background-color:red;"' ?> /><?php if ( $attr7_readonly && $checked ) { ?><input type="hidden" name="<?php echo $attr7_name ?>" value="1" /><?php } -?><?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_debug_info = 'a:1:{s:3:"for";s:7:"publish";}' ?><?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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"raw";s:1:"_";s:6:"escape";s:4:"true";}' ?><?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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?><?php unset($attr7_name); unset($attr7_readonly); unset($attr7_default); ?><?php unset($attr7_default);unset($attr7_readonly);unset($attr7_name); ?><?php $attr7_for='publish'; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_class='text'; $attr8_raw='_'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_raw) ?><?php unset($attr8_escape) ?><?php $attr8_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:23:"PAGE_PUBLISH_AFTER_SAVE";s:6:"escape";s:4:"true";}' ?><?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)) - $attr8_key = $attr8_key.$attr8_suffix; - if(empty($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_raw);unset($attr8_escape); ?><?php $attr8_class='text'; $attr8_text='PAGE_PUBLISH_AFTER_SAVE'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) + $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $tmp_text = $langF($attr8_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr8) ?><?php unset($attr8_class) ?><?php unset($attr8_text) ?><?php unset($attr8_escape) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?></label><?php unset($attr6) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></tr><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?><?php } ?><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_text);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; $attr5_colspan='2'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:9:"button_ok";}' ?><?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') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -965,12 +427,12 @@ if ( $attr7_readonly && $checked ) <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:5:"field";s:5:"linko";}' ?><?php $attr2 = array('field'=>'linko') ?><?php $attr2_field='linko' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='linko'; ?><?php if (isset($errors[0])) $attr2_field = $errors[0]; ?><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_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php unset($attr2_field); ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/pageelement/prop.tpl.php b/themes/default/pages/html/pageelement/prop.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,14 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='name'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='name'; ?><?php @@ -266,80 +197,14 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_class='text'; $attr6_var='name'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -358,80 +223,14 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='description'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -446,80 +245,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_var='description'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -538,80 +270,14 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='type'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='filename'; ?><?php @@ -626,83 +292,17 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php ?>><?php unset($attr5_class); ?><?php $attr6_align='left'; $attr6_elementtype=$element_type; ?><?php $attr6_tmp_image_file = $image_dir.'icon_el_'.$attr6_elementtype.IMG_ICON_EXT; $attr6_size = '16x16'; -?><img src="<?php echo $attr6_tmp_image_file ?>" border="0"<?php if(isset($attr6_align)) echo ' align="'.$attr6_align.'"' ?><?php if (isset($attr6_size)) { list($attr6_tmp_width,$attr6_tmp_height)=explode('x',$attr6_size);echo ' width="'.$attr6_tmp_width.'" height="'.$attr6_tmp_height.'"';} ?>><?php unset($attr6_align);unset($attr6_elementtype); ?><?php $attr6_class='text'; $attr6_key='el_'.$element_type.''; $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)) - $attr6_title = ''; - if (empty($attr6_type)) +?><img alt="<?php echo basename($attr6_tmp_image_file); echo ' ('; if (isset($attr6_size)) { list($attr6_tmp_width,$attr6_tmp_height)=explode('x',$attr6_size);echo $attr6_tmp_width.'x'.$attr6_tmp_height; echo')';} ?>" src="<?php echo $attr6_tmp_image_file ?>" border="0"<?php if(isset($attr6_align)) echo ' align="'.$attr6_align.'"' ?><?php if (isset($attr6_size)) { list($attr6_tmp_width,$attr6_tmp_height)=explode('x',$attr6_size);echo ' width="'.$attr6_tmp_width.'" height="'.$attr6_tmp_height.'"';} ?>><?php unset($attr6_align);unset($attr6_elementtype); ?><?php $attr6_class='text'; $attr6_key='el_'.$element_type.''; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -721,11 +321,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('additional_info'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -742,80 +338,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_key='template'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -830,11 +359,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_present='template_url'; ?><?php $attr6_tmp_exec = isset($$attr6_present); $attr6_tmp_last_exec = $attr6_tmp_exec; @@ -843,96 +367,17 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?> <?php unset($attr6_present); ?><?php $attr7_title=''; $attr7_target='cms_main_main'; $attr7_url=$template_url; $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)) - $attr7_title = ''; - if(!empty($attr7_url)) $tmp_url = $attr7_url; - else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr7_name)) echo ' name="'.$attr7_name.'"'; else echo ' href="'.$tmp_url.($attr7_anchor?'#'.$attr7_anchor:'').'"' ?> class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo encodeHtml($attr7_title) ?>"><?php unset($attr7_title);unset($attr7_target);unset($attr7_url);unset($attr7_class); ?><?php $attr8_file='icon_template'; $attr8_align='left'; ?><?php $attr8_tmp_image_file = $image_dir.$attr8_fileext; $attr8_tmp_image_file = $image_dir.$attr8_file.IMG_ICON_EXT; -?><img src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_file);unset($attr8_align); ?><?php $attr8_class='text'; $attr8_var='template_name'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?><img alt="<?php echo basename($attr8_tmp_image_file); echo ' ('; if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo $attr8_tmp_width.'x'.$attr8_tmp_height; echo')';} ?>" src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_file);unset($attr8_align); ?><?php $attr8_class='text'; $attr8_var='template_name'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $langF = $attr8_escape?'langHtml':'lang'; + $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php $attr6_empty='template_url'; ?><?php @@ -951,75 +396,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } <?php unset($attr6_empty); ?><?php $attr7_file='icon_template'; $attr7_align='left'; ?><?php $attr7_tmp_image_file = $image_dir.$attr7_fileext; $attr7_tmp_image_file = $image_dir.$attr7_file.IMG_ICON_EXT; -?><img src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_file);unset($attr7_align); ?><?php $attr7_class='text'; $attr7_var='template_name'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_file);unset($attr7_align); ?><?php $attr7_class='text'; $attr7_var='template_name'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -1038,80 +421,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_key='element'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1126,11 +442,6 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_present='element_url'; ?><?php $attr6_tmp_exec = isset($$attr6_present); $attr6_tmp_last_exec = $attr6_tmp_exec; @@ -1139,96 +450,17 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?> <?php unset($attr6_present); ?><?php $attr7_title=''; $attr7_target='cms_main_main'; $attr7_url=$element_url; $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)) - $attr7_title = ''; - if(!empty($attr7_url)) $tmp_url = $attr7_url; - else - $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr7_name)) echo ' name="'.$attr7_name.'"'; else echo ' href="'.$tmp_url.($attr7_anchor?'#'.$attr7_anchor:'').'"' ?> class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo encodeHtml($attr7_title) ?>"><?php unset($attr7_title);unset($attr7_target);unset($attr7_url);unset($attr7_class); ?><?php $attr8_align='left'; $attr8_elementtype=$element_type; ?><?php $attr8_tmp_image_file = $image_dir.'icon_el_'.$attr8_elementtype.IMG_ICON_EXT; $attr8_size = '16x16'; -?><img src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_elementtype); ?><?php $attr8_class='text'; $attr8_var='element_name'; $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($attr8_title)) - $attr8_title = ''; - if (empty($attr8_type)) +?><img alt="<?php echo basename($attr8_tmp_image_file); echo ' ('; if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo $attr8_tmp_width.'x'.$attr8_tmp_height; echo')';} ?>" src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_elementtype); ?><?php $attr8_class='text'; $attr8_var='element_name'; $attr8_escape=true; ?><?php + $attr8_title = ''; $tmp_tag = 'span'; - else - switch( $attr8_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php - $attr8_title = ''; - if ( $attr8_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr8_array)) - { - $tmpArray = $$attr8_array; - if (!empty($attr8_var)) - $tmp_text = $tmpArray[$attr8_var]; - else - $tmp_text = $langF($tmpArray[$attr8_text]); - } - elseif (!empty($attr8_text)) - $tmp_text = $langF($attr8_text); - elseif (!empty($attr8_textvar)) - $tmp_text = $langF($$attr8_textvar); - elseif (!empty($attr8_key)) - $tmp_text = $langF($attr8_key); - elseif (!empty($attr8_var)) - $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; - elseif (!empty($attr8_raw)) - $tmp_text = str_replace('_',' ',$attr8_raw); - elseif (!empty($attr8_value)) - $tmp_text = $attr8_value; - else - $tmp_text = ' '; - if ( !empty($attr8_maxlength) && intval($attr8_maxlength)!=0 ) - $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); - if (isset($attr8_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); - } + $langF = $attr8_escape?'langHtml':'lang'; + $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php $attr6_empty='element_url'; ?><?php @@ -1247,75 +479,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } <?php unset($attr6_empty); ?><?php $attr7_icon='element'; $attr7_align='left'; ?><?php $attr7_tmp_image_file = $image_dir.'icon_'.$attr7_icon.IMG_ICON_EXT; $attr7_size = '16x16'; -?><img src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_icon);unset($attr7_align); ?><?php $attr7_class='text'; $attr7_var='element_name'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_icon);unset($attr7_align); ?><?php $attr7_class='text'; $attr7_var='element_name'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_present='text'; ?><?php @@ -1340,11 +510,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_title=lang('DOCUMENT_TREE'); ?><fieldset><?php if(isset($attr7_title)) { ?><legend><?php echo encodeHtml($attr7_title) ?></legend><?php } ?><?php unset($attr7_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr5_tmp_class=''; $attr5_last_class = $attr5_tmp_class; @@ -1361,15 +527,11 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr6_rowspan) ) $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr6_width )) { ?> width="<?php echo $attr6_width ?>" <?php } -if ( isset($attr6_style )) { ?> style="<?php echo $attr6_style ?>" <?php } -if ( isset($attr6_class )) { ?> class="<?php echo $attr6_class ?>" <?php } -if ( isset($attr6_colspan)) { ?> colspan="<?php echo $attr6_colspan ?>" <?php } -if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } +?> colspan="<?php echo $attr6_colspan ?>" <?php ?>><?php unset($attr6_colspan); ?><?php $attr7_name='text'; $attr7_type='dom'; ?><?php function checkbox( $name,$value=false,$writable=true,$params=Array() ) { - $src = '<input type="checkbox" name="'.$name.'"'; + $src = '<input type="checkbox" id="id_'.$name.'" name="'.$name.'"'; foreach( $params as $name=>$val ) $src .= " $name=\"$val\""; if ( !$writable ) @@ -1397,6 +559,11 @@ if ( isset($attr6_rowspan)) { ?> rowspan="<?php echo $attr6_rowspan ?>" <?php } $src .= '</select>'; return $src; } + function add_control($type,$image) + { + global $image_dir; + echo '<td><noscript>'.checkbox($type).'</noscript><label for="id_'.$type.'"><a href="javascript:'.$type.'();" title="'.langHtml('PAGE_EDITOR_ADD_'.$type).'"><img src="'.$image_dir.'/editor/'.$image.'" border"0" /></a></label>'; + } ?><?php switch( $attr7_type ) { @@ -1455,7 +622,7 @@ function list() insert('<?php echo $attr7_name ?>',"","\n"); while( true ) { - t = window.prompt('<?php echo lang('EDITOR_PROMPT_LIST_ENTRY') ?>',''); + t = window.prompt('<?php echo langHtml('EDITOR_PROMPT_LIST_ENTRY') ?>',''); if ( t != '' && t != null ) insert('<?php echo $attr7_name ?>',"<?php echo $conf_tags['list-unnumbered'] ?> "+t+"\n",""); else @@ -1472,9 +639,9 @@ function table() while( true ) { if ( column==1 ) - text='<?php echo lang('EDITOR_PROMPT_TABLE_CELL_FIRST_COLUMN') ?>'; + text='<?php echo langHtml('EDITOR_PROMPT_TABLE_CELL_FIRST_COLUMN') ?>'; else - text='<?php echo lang('EDITOR_PROMPT_TABLE_CELL') ?>'; + text='<?php echo langHtml('EDITOR_PROMPT_TABLE_CELL') ?>'; t = window.prompt(text,''); if ( t != '' && t != null ) { @@ -1496,26 +663,27 @@ function table() } } </script> + <fieldset><legend><?php echo langHtml('EDITOR') ?></legend></fieldset> <table> <tr> - <noscript><input type="text" name="addtext" size="10" /></noscript> - <td><noscript><?php echo checkbox('strong') ?></noscript><a href="javascript:strong();" title="<?php echo lang('PAGE_EDITOR_ADD_STRONG') ?>"><img src="<?php echo $image_dir ?>/editor/bold.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('emphatic') ?></noscript><a href="javascript:emphatic();" title="<?php echo lang('PAGE_EDITOR_ADD_EMPHATIC') ?>"><img src="<?php echo $image_dir ?>/editor/italic.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('table') ?></noscript><a href="javascript:table();" title="<?php echo lang('PAGE_EDITOR_ADD_TABLE') ?>"><img src="<?php echo $image_dir ?>/editor/table.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('list') ?></noscript><a href="javascript:list();" title="<?php echo lang('PAGE_EDITOR_ADD_LIST') ?>"><img src="<?php echo $image_dir ?>/editor/list.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('numlist') ?></noscript><a href="javascript:numlist();" title="<?php echo lang('PAGE_EDITOR_ADD_NUMLIST') ?>"><img src="<?php echo $image_dir ?>/editor/numlist.png" border"0" /></a></td> - <td> </td> - <td><noscript><?php echo checkbox('image') ?></noscript><a href="javascript:image();" title="<?php echo lang('PAGE_EDITOR_ADD_IMAGE') ?>"><img src="<?php echo $image_dir ?>/editor/image.png" border"0" /></a></td> - <td><noscript><?php echo checkbox('link') ?></noscript><a href="javascript:link();" title="<?php echo lang('PAGE_EDITOR_ADD_LINK') ?>"><img src="<?php echo $image_dir ?>/editor/link.png" border"0" /></a></td> - <td><?php echo selectBox('objectid',$objects) ?><noscript> <input type="submit" class="submit" name="addmarkup" value="<?php echo lang('GLOBAL_ADD') ?>"/></noscript></td> - <td> <input type="submit" class="submit" name="preview" value="<?php echo lang('PAGE_PREVIEW') ?>" style="width:200px;"/></td> + <td><noscript><input type="text" name="addtext" size="30" /></noscript></td> + <td><?php add_control('strong' ,'bold.png' )?></td> + <td><?php add_control('emphatic','italic.png') ?></td> + <td> </td> + <td><?php add_control('table','table.png') ?></td> + <td> </td> + <td><?php add_control('list' ,'list.png') ; ?></td> + <td><?php add_control('numlist','numlist.png') ?></td> + <td> </td> + <td><?php add_control('image','image.png') ?></td> + <td><?php add_control('link' ,'link.png' ) ?></td> + <td><input name="objectid" size="6" title="<?php echo langHtml('LINK_TO') ?>"></td> + <td><noscript> <input type="submit" class="submit" name="addmarkup" value="<?php echo langHtml('ADD') ?>"/></noscript></td> </tr> </table> - <?php ?> + <fieldset><legend><?php echo langHtml('CONTENT') ?></legend></fieldset> + <textarea name="<?php echo $attr7_name ?>" class="editor" style="width:100%;height:300px;"><?php echo $$attr7_name ?></textarea> <?php - echo '<textarea name="'.$attr7_name.'" class="editor" style="width:100%;height:300px;">'.$$attr7_name.'</textarea>'; } else { @@ -1560,11 +728,7 @@ function table() if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('prop_userinfo'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -1581,80 +745,14 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='lastchange'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -1669,39 +767,13 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_width='100%'; $attr6_space='0px'; $attr6_padding='0px'; ?><?php - $coloumn_widths=array(); - $row_classes = array(''); - $column_classes= array(''); - if(empty($attr6_class)) + $coloumn_widths = array(); + $row_classes = array(); + $column_classes = array(); $attr6_class=''; - if (!empty($attr6_widths)) - { $column_widths = explode(',',$attr6_widths); unset($attr6['widths']); - } - if (!empty($attr6_classes)) - { - $row_classes = explode(',',$attr6_rowclasses); - $row_class_idx = 999; - unset($attr6['rowclasses']); - } - if (!empty($attr6_rowclasses)) - { - $row_classes = explode(',',$attr6_rowclasses); - $row_class_idx = 999; - unset($attr6['rowclasses']); - } - if (!empty($attr6_columnclasses)) - { - $column_classes = explode(',',$attr6_columnclasses); - unset($attr6['columnclasses']); - } ?><table class="<?php echo $attr6_class ?>" cellspacing="<?php echo $attr6_space ?>" width="<?php echo $attr6_width ?>" cellpadding="<?php echo $attr6_padding ?>"><?php unset($attr6_width);unset($attr6_space);unset($attr6_padding); ?><?php ?><?php $attr7_tmp_class=''; $attr7_last_class = $attr7_tmp_class; @@ -1718,15 +790,10 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr8_width )) { ?> width="<?php echo $attr8_width ?>" <?php } -if ( isset($attr8_style )) { ?> style="<?php echo $attr8_style ?>" <?php } -if ( isset($attr8_class )) { ?> class="<?php echo $attr8_class ?>" <?php } -if ( isset($attr8_colspan)) { ?> colspan="<?php echo $attr8_colspan ?>" <?php } -if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } ?>><?php ?><?php $attr9_icon='el_date'; $attr9_align='left'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_icon.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_date=$lastchange_date; ?><?php +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_date=$lastchange_date; ?><?php global $conf; $time = $attr9_date; if ( $time==0) @@ -1794,15 +861,10 @@ if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr8_rowspan) ) $attr8_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr8_width )) { ?> width="<?php echo $attr8_width ?>" <?php } -if ( isset($attr8_style )) { ?> style="<?php echo $attr8_style ?>" <?php } -if ( isset($attr8_class )) { ?> class="<?php echo $attr8_class ?>" <?php } -if ( isset($attr8_colspan)) { ?> colspan="<?php echo $attr8_colspan ?>" <?php } -if ( isset($attr8_rowspan)) { ?> rowspan="<?php echo $attr8_rowspan ?>" <?php } ?>><?php ?><?php $attr9_icon='user'; $attr9_align='left'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_icon.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_user=$lastchange_user; ?><?php +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_icon);unset($attr9_align); ?><?php $attr9_user=$lastchange_user; ?><?php if ( is_object($attr9_user) ) $user = $attr9_user; else diff --git a/themes/default/pages/html/profile/edit.tpl.php b/themes/default/pages/html/profile/edit.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/profile/groups.tpl.php b/themes/default/pages/html/profile/groups.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='user_groups'; $attr2_icon='user'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='user_groups'; $attr2_icon='user'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { diff --git a/themes/default/pages/html/profile/mail.tpl.php b/themes/default/pages/html/profile/mail.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/project/add.tpl.php b/themes/default/pages/html/project/add.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); @@ -395,16 +395,9 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?> class="<?php echo $attr5_class ?>" <?php ?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/project/edit.tpl.php b/themes/default/pages/html/project/edit.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/project/listing.tpl.php b/themes/default/pages/html/project/listing.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_PROJECTS'; $attr2_icon='project'; $attr2_width='70%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_PROJECTS'; $attr2_icon='project'; $attr2_width='70%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { diff --git a/themes/default/pages/html/search/content.tpl.php b/themes/default/pages/html/search/content.tpl.php @@ -1,54 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } -?><script type="text/javascript" src="themes/default/js/jquery.js"></script> - <script type="text/javascript" src="themes/default/js/jquery-lightbox.js"></script> - <link rel="stylesheet" type="text/css" href="themes/default/js/lightbox/css/jquery-lightbox.css" media="screen" /> - <script type="text/javascript"> - $(function() { - $('a.image').lightBox(); - }); - </script> -<?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $root_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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -56,7 +45,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_debug_info = 'a:4:{s:4:"icon";s:6:"search";s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('icon'=>'search','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_icon='search' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_icon='search'; $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -89,9 +78,9 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="themes/default/images/readonly.png" style="vertical-align:top; " border="0" /></a> <?php } + <?php if ($this->isEditMode()) { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) @@ -149,11 +138,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -169,114 +158,60 @@ <?php } ?> <tr> <td> - <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_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_icon);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:15:"lastchange_user";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?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='' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='lastchange_user'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) $attr6_tmp_default = $$attr6_name; elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; - ?><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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?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_debug_info = 'a:2:{s:3:"for";s:4:"type";s:5:"value";s:15:"lastchange_user";}' ?><?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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:20:"user_lastchange_user";s:6:"escape";s:4:"true";}' ?><?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)) - $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr7_title)) - $attr7_title = ''; - if (empty($attr7_type)) + ?><input onclick="<?php echo $attr6_name.'_'.$attr6_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr6_readonly);unset($attr6_name);unset($attr6_value);unset($attr6_default);unset($attr6_prefix);unset($attr6_suffix);unset($attr6_class);unset($attr6_onchange); ?><?php $attr6_for='type'; $attr6_value='lastchange_user'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for);unset($attr6_value); ?><?php $attr7_class='text'; $attr7_key='user_lastchange_user'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:10:{s:4:"list";s:5:"users";s:4:"name";s:6:"userid";s:7:"default";s:14:"var:act_userid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'users','name'=>'userid','default'=>$act_userid,'onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr6_list='users' ?><?php $attr6_name='userid' ?><?php $attr6_default=$act_userid ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php $attr6_lang=false ?><?php -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_list='users'; $attr6_name='userid'; $attr6_default=$act_userid; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php +$attr6_tmp_list = $$attr6_list; +if ($this->isEditable() && !$this->isEditMode()) +{ + echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; +} +else +{ if ( $attr6_addempty!==FALSE ) { if ($attr6_addempty===TRUE) @@ -290,7 +225,6 @@ if ($attr6_multiple) echo ' multiple="multiple"'; if (in_array($attr6_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"'; echo ' size="'.intval($attr6_size).'"'; ?>><?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) ) @@ -321,154 +255,85 @@ echo ' size="'.intval($attr6_size).'"'; } ?></select><?php if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; -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 unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" value="'.$box_key.'" />'; +} +?><?php unset($attr6_list);unset($attr6_name);unset($attr6_default);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:5:"value";s:7:"default";s:4:"true";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?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='' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='value'; $attr6_default=true; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) $attr6_tmp_default = $$attr6_name; elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; - ?><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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?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_debug_info = 'a:2:{s:3:"for";s:4:"type";s:5:"value";s:5:"value";}' ?><?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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:5:"value";s:6:"escape";s:4:"true";}' ?><?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)) - $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr7_title)) - $attr7_title = ''; - if (empty($attr7_type)) + ?><input onclick="<?php echo $attr6_name.'_'.$attr6_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr6_readonly);unset($attr6_name);unset($attr6_value);unset($attr6_default);unset($attr6_prefix);unset($attr6_suffix);unset($attr6_class);unset($attr6_onchange); ?><?php $attr6_for='type'; $attr6_value='value'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for);unset($attr6_value); ?><?php $attr7_class='text'; $attr7_key='value'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"text";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'text','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr6_class='' ?><?php $attr6_default='' ?><?php $attr6_type='text' ?><?php $attr6_name='text' ?><?php $attr6_size='40' ?><?php $attr6_maxlength='256' ?><?php $attr6_onchange='' ?><?php $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='text'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; -?><?php if (!$attr6_readonly) { +?><?php if (!$attr6_readonly || $attr6_type=='hidden') { ?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" 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 ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php if ($attr6_readonly) { ?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php - } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?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 unset($attr6_readonly) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php + } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6_class);unset($attr6_default);unset($attr6_type);unset($attr6_name);unset($attr6_size);unset($attr6_maxlength);unset($attr6_onchange);unset($attr6_readonly); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; $attr5_colspan='2'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:9:"button_ok";}' ?><?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') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -480,12 +345,12 @@ if ($attr6_readonly) { <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:5:"field";s:4:"name";}' ?><?php $attr2 = array('field'=>'name') ?><?php $attr2_field='name' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='name'; ?><?php if (isset($errors[0])) $attr2_field = $errors[0]; ?><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_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php unset($attr2_field); ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/search/prop.tpl.php b/themes/default/pages/html/search/prop.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/search/result.tpl.php b/themes/default/pages/html/search/result.tpl.php @@ -1,32 +1,32 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.lang('CHARSET')) +<?php $attr1_class='main'; ?><?php + if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_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" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } -?> -<?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $root_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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:5:{s:4:"icon";s:6:"search";s:6:"widths";s:7:"50%,50%";s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr2 = array('icon'=>'search','widths'=>'50%,50%','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr2_icon='search' ?><?php $attr2_widths='50%,50%' ?><?php $attr2_width='93%' ?><?php $attr2_rowclasses='odd,even' ?><?php $attr2_columnclasses='1,2,3' ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_icon='search'; $attr2_widths='50%,50%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -57,17 +57,22 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr><td class="menu">'; - if ( !empty($attr2_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr2_icon.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + if ($this->isEditable()) { ?> + <?php if ($this->isEditMode()) { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { + ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } + ?><?php } + echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) { extract($pathElement); - echo '<a href="'.$url.'" class="path">'.lang($name).'</a>'; + echo '<a href="'.$url.'" class="path">'.langHtml($name).'</a>'; echo ' » '; } - echo '<span class="title">'.lang($windowTitle).'</span>'; + echo '<span class="title">'.langHtml($windowTitle).'</span>'; ?> </td> <?php @@ -76,7 +81,7 @@ <?php ?> <!--<td class="menu" style="align:right;"> <?php if (isset($windowIcons)) foreach( $windowIcons as $icon ) { - ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.lang($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php + ?><a href="<?php echo $icon['url'] ?>" title="<?php echo 'ICON_'.langHtml($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php } ?> </td>--> @@ -86,41 +91,41 @@ $windowMenu = array(); foreach( $windowMenu as $menu ) { - $tmp_text = lang($menu['text']); - $tmp_key = strtoupper(lang($menu['key' ])); + $tmp_text = langHtml($menu['text']); + $tmp_key = strtoupper(langHtml($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> <?php + ?><a href="<?php echo Html::url($actionName,$menu['subaction'],$this->getRequestId() ) ?>" accesskey="<?php echo $tmp_key ?>" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu<?php echo $this->subActionName==$menu['subaction']?'_highlight':'' ?>"><?php echo $tmp_text ?></a> <?php } else { - ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php + ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span> <?php } } if (@$conf['help']['enabled'] ) { - ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':lang('MENU_HELP') ?></a><?php + ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo langHtml('MENU_HELP_DESC') ?>" class="menu" style="cursor:help;"><?php echo @$conf['help']['only_question_mark']?'?':langHtml('MENU_HELP') ?></a><?php } ?></td> </tr> <?php if (isset($notices) && count($notices)>0 ) { ?> <tr> - <td align="center" style="margin-top:10px; margin-bottom:10px;padding:5px; text-align:center;"> + <td align="center" class="notice"> <?php foreach( $notices as $notice_idx=>$notice ) { ?> - <br><table class="notice" width="100%"> + <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> - <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo $notice['text'] ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> + <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> </td> </tr> @@ -134,7 +139,8 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"><?php unset($attr2) ?><?php unset($attr2_icon) ?><?php unset($attr2_widths) ?><?php unset($attr2_width) ?><?php unset($attr2_rowclasses) ?><?php unset($attr2_columnclasses) ?><?php $attr3_debug_info = 'a:4:{s:4:"list";s:6:"result";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr3 = array('list'=>'result','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr3_list='result' ?><?php $attr3_extract=true ?><?php $attr3_key='list_key' ?><?php $attr3_value='list_value' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr2_icon);unset($attr2_widths);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php $attr3_list='result'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php $attr3_list_tmp_key = $attr3_key; $attr3_list_tmp_value = $attr3_value; $attr3_list_extract = $attr3_extract; @@ -153,140 +159,49 @@ } extract($$attr3_list_tmp_value); } -?><?php unset($attr3) ?><?php unset($attr3_list) ?><?php unset($attr3_extract) ?><?php unset($attr3_key) ?><?php unset($attr3_value) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?><?php unset($attr3_list);unset($attr3_extract);unset($attr3_key);unset($attr3_value); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:4:{s:5:"title";s:0:"";s:6:"target";s:8:"cms_main";s:3:"url";s:7:"var:url";s:5:"class";s:0:"";}' ?><?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 + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_title=''; $attr6_target='cms_main'; $attr6_url=$url; $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)) - $attr6_title = ''; - if(!empty($attr6_url)) $tmp_url = $attr6_url; - else - $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_debug_info = 'a:2:{s:5:"align";s:4:"left";s:4:"type";s:8:"var:type";}' ?><?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 -} elseif (isset($attr7_type)) { -?><img src="<?php echo $image_dir.'icon_'.$attr7_type.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php -} elseif (isset($attr7_icon)) { -?><img src="<?php echo $image_dir.'icon_'.$attr7_icon.IMG_ICON_EXT ?>" border="0" align="<?php echo $attr7_align ?>"><?php -} elseif (isset($attr7_url)) { -?><img src="<?php echo $attr7_url ?>" border="0" align="<?php echo $attr7_align ?>"><?php -} 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_debug_info = 'a:4:{s:5:"title";s:8:"var:desc";s:5:"class";s:4:"text";s:4:"text";s:8:"var:name";s:6:"escape";s:4:"true";}' ?><?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)) - $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); - else - $attr7_title = ''; - if (empty($attr7_type)) +?><a<?php if (isset($attr6_name)) echo ' name="'.$attr6_name.'"'; else echo ' href="'.$tmp_url.($attr6_anchor?'#'.$attr6_anchor:'').'"' ?> class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo encodeHtml($attr6_title) ?>"><?php unset($attr6_title);unset($attr6_target);unset($attr6_url);unset($attr6_class); ?><?php $attr7_align='left'; $attr7_type=$type; ?><?php + $attr7_tmp_image_file = $image_dir.'icon_'.$attr7_type.IMG_ICON_EXT; + $attr7_size = '16x16'; +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_title=$desc; $attr7_class='text'; $attr7_text=$name; $attr7_escape=true; ?><?php $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $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_var:'?'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!=' ' ) - $tmp_text = htmlentities($tmp_text); - 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); - } + $langF = $attr7_escape?'langHtml':'lang'; + $tmp_text = $langF($$attr7_textvar); + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_text) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></a><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_title);unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:1:{s:4:"date";s:19:"var:lastchange_date";}' ?><?php $attr6 = array('date'=>$lastchange_date) ?><?php $attr6_date=$lastchange_date ?><?php + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_date=$lastchange_date; ?><?php global $conf; $time = $attr6_date; if ( $time==0) @@ -342,7 +257,7 @@ if (isset($attr7_elementtype)) { echo $jahre.' '.lang('GLOBAL_YEARS'); echo '</span>'; } -?><?php unset($attr6) ?><?php unset($attr6_date) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?><?php } ?><?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?> </table> +?><?php unset($attr6_date); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?> </table> </td> </tr> </table> @@ -354,5 +269,5 @@ if (isset($attr7_elementtype)) { <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr1) ?><?php $attr0_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/template/add.tpl.php b/themes/default/pages/html/template/add.tpl.php @@ -1,46 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -48,7 +45,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_debug_info = 'a:5:{s:4:"name";s:16:"GLOBAL_TEMPLATES";s:6:"widths";s:9:"10px,40px";s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('name'=>'GLOBAL_TEMPLATES','widths'=>'10px,40px','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='GLOBAL_TEMPLATES' ?><?php $attr3_widths='10px,40px' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='GLOBAL_TEMPLATES'; $attr3_widths='10px,40px'; $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -81,7 +78,7 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { + <?php if ($this->isEditMode()) { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } @@ -141,11 +138,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -161,356 +158,174 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"> -<?php unset($attr3) ?><?php unset($attr3_name) ?><?php unset($attr3_widths) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('colspan'=>'2') ?><?php $attr5_colspan='2' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_name);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_colspan='2'; ?><?php $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; + $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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"message:name";s:6:"escape";s:4:"true";}' ?><?php $attr6 = array('class'=>'text','text'=>lang('name'),'escape'=>true) ?><?php $attr6_class='text' ?><?php $attr6_text=lang('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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_class='text'; $attr6_text=lang('name'); $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?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 $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='name'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; ?><?php if (!$attr6_readonly || $attr6_type=='hidden') { ?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" 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 ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php if ($attr6_readonly) { ?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php - } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?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 unset($attr6_readonly) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:7:"colspan";s:1:"3";}' ?><?php $attr5 = array('colspan'=>'3') ?><?php $attr5_colspan='3' ?><?php + } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6_class);unset($attr6_default);unset($attr6_type);unset($attr6_name);unset($attr6_size);unset($attr6_maxlength);unset($attr6_onchange);unset($attr6_readonly); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_colspan='3'; ?><?php $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; + $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_debug_info = 'a:1:{s:5:"title";s:15:"message:options";}' ?><?php $attr6 = array('title'=>lang('options')) ?><?php $attr6_title=lang('options') ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6) ?><?php unset($attr6_title) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></fieldset><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('options'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:5:"empty";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'empty','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='empty' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='empty'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) $attr6_tmp_default = $$attr6_name; elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; - ?><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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?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 $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + ?><input onclick="<?php echo $attr6_name.'_'.$attr6_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr6_readonly);unset($attr6_name);unset($attr6_value);unset($attr6_default);unset($attr6_prefix);unset($attr6_suffix);unset($attr6_class);unset($attr6_onchange); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:1:{s:3:"for";s:10:"type_empty";}' ?><?php $attr6 = array('for'=>'type_empty') ?><?php $attr6_for='type_empty' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:5:"empty";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','key'=>'empty','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='empty' ?><?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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_for='type_empty'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_key='empty'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:4:"copy";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'copy','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='copy' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='copy'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) $attr6_tmp_default = $$attr6_name; elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; - ?><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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?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 $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + ?><input onclick="<?php echo $attr6_name.'_'.$attr6_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr6_readonly);unset($attr6_name);unset($attr6_value);unset($attr6_default);unset($attr6_prefix);unset($attr6_suffix);unset($attr6_class);unset($attr6_onchange); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:1:{s:3:"for";s:9:"type_copy";}' ?><?php $attr6 = array('for'=>'type_copy') ?><?php $attr6_for='type_copy' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:4:"copy";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','key'=>'copy','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='copy' ?><?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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_for='type_copy'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_key='copy'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:9:{s:4:"list";s:9:"templates";s:4:"name";s:10:"templateid";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'templates','name'=>'templateid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr6_list='templates' ?><?php $attr6_name='templateid' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php $attr6_lang=false ?><?php + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_list='templates'; $attr6_name='templateid'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') +if ($this->isEditable() && !$this->isEditMode()) { echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; } @@ -561,125 +376,66 @@ echo ' size="'.intval($attr6_size).'"'; if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; 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_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?><?php unset($attr6_list);unset($attr6_name);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:8:"readonly";s:5:"false";s:4:"name";s:4:"type";s:5:"value";s:7:"example";s:7:"default";s:5:"false";s:6:"prefix";s:0:"";s:6:"suffix";s:0:"";s:5:"class";s:0:"";s:8:"onchange";s:0:"";}' ?><?php $attr6 = array('readonly'=>false,'name'=>'type','value'=>'example','default'=>false,'prefix'=>'','suffix'=>'','class'=>'','onchange'=>'') ?><?php $attr6_readonly=false ?><?php $attr6_name='type' ?><?php $attr6_value='example' ?><?php $attr6_default=false ?><?php $attr6_prefix='' ?><?php $attr6_suffix='' ?><?php $attr6_class='' ?><?php $attr6_onchange='' ?><?php - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='type'; $attr6_value='example'; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php + if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) $attr6_tmp_default = $$attr6_name; elseif ( isset($attr6_default) ) $attr6_tmp_default = $attr6_default; else $attr6_tmp_default = ''; - ?><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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /><?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 $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php + ?><input onclick="<?php echo $attr6_name.'_'.$attr6_value ?>_valueChanged(this);" class="radio" 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_tmp_default) echo 'checked="checked"' ?><?php if (in_array($attr6_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> +<?php /* #END-IF# */ ?><?php unset($attr6_readonly);unset($attr6_name);unset($attr6_value);unset($attr6_default);unset($attr6_prefix);unset($attr6_suffix);unset($attr6_class);unset($attr6_onchange); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:1:{s:3:"for";s:12:"type_example";}' ?><?php $attr6 = array('for'=>'type_example') ?><?php $attr6_for='type_example' ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6) ?><?php unset($attr6_for) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"key";s:7:"example";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','key'=>'example','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_key='example' ?><?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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_for='type_example'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_key='example'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) - $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_key) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></label><?php unset($attr5) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:9:{s:4:"list";s:8:"examples";s:4:"name";s:7:"example";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'examples','name'=>'example','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr6_list='examples' ?><?php $attr6_name='example' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php $attr6_lang=false ?><?php + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_list='examples'; $attr6_name='example'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') +if ($this->isEditable() && !$this->isEditMode()) { echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; } @@ -730,41 +486,31 @@ echo ' size="'.intval($attr6_size).'"'; if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; 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_onchange) ?><?php unset($attr6_title) ?><?php unset($attr6_class) ?><?php unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"3";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'3') ?><?php $attr5_class='act' ?><?php $attr5_colspan='3' ?><?php +?><?php unset($attr6_list);unset($attr6_name);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; $attr5_colspan='3'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:9:"button_ok";}' ?><?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') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -776,12 +522,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr2_debug_info = 'a:1:{s:5:"field";s:4:"name";}' ?><?php $attr2 = array('field'=>'name') ?><?php $attr2_field='name' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='name'; ?><?php if (isset($errors[0])) $attr2_field = $errors[0]; ?><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_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php unset($attr2_field); ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/template/addel.tpl.php b/themes/default/pages/html/template/addel.tpl.php @@ -1,46 +1,43 @@ -<?php $attr1_debug_info = 'a:1:{s:5:"class";s:4:"main";}' ?><?php $attr1 = array('class'=>'main') ?><?php $attr1_class='main' ?><?php +<?php $attr1_class='main'; ?><?php if (!headers_sent()) header('Content-Type: text/html; charset='.$charset) ?><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1) ?><?php unset($attr1_class) ?><?php $attr2_debug_info = 'a:4:{s:4:"name";s:0:"";s:6:"target";s:5:"_self";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?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)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); - if ($this->isEditable() && $this->getRequestVar('mode')!='edit') + if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; ?><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 ?>" style="margin:0px;padding:0px;"> -<?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') { ?> +<?php if ($this->isEditable() && !$this->isEditMode()) { ?> <input type="hidden" name="mode" value="edit" /> <?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> @@ -48,7 +45,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_debug_info = 'a:4:{s:4:"name";s:16:"GLOBAL_TEMPLATES";s:5:"width";s:3:"93%";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('name'=>'GLOBAL_TEMPLATES','width'=>'93%','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='GLOBAL_TEMPLATES' ?><?php $attr3_width='93%' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='1,2,3' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='GLOBAL_TEMPLATES'; $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -81,7 +78,7 @@ echo '<tr><td class="menu">'; echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; if ($this->isEditable()) { ?> - <?php if ($this->getRequestVar('mode')=='edit') { + <?php if ($this->isEditMode()) { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId() ) ?>" accesskey="1" title="<?php echo langHtml('MODE_EDIT_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>mode-edit.png" style="vertical-align:top; " border="0" /></a> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } @@ -141,11 +138,11 @@ <br><table class="notice" width="80%"> <?php if ($notice['name']!='') { ?> <tr> - <td colspan="2" class="subaction" style="padding:2px; white-space:nowrap; border-bottom:1px solid black;"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> - </td> + <th colspan="2"><img src="<?php echo $image_dir.'icon_'.$notice['type'].IMG_ICON_EXT ?>" align="left" /><?php echo $notice['name'] ?> + </th> </tr> <?php } ?> - <tr class="notice_<?php echo $notice['status'] ?>"> + <tr class="<?php echo $notice['status'] ?>"> <td style="padding:10px;" width="30px"><img src="<?php echo $image_dir.'notice_'.$notice['status'].IMG_ICON_EXT ?>" style="padding:10px" /></td> <td style="padding:10px;padding-right:10px;padding-bottom:10px;"><?php if ($notice['status']=='error') { ?><strong><?php } ?><?php echo langHtml($notice['key'],$notice['vars']) ?><?php if ($notice['status']=='error') { ?></strong><?php } ?> <?php if (!empty($notice['log'])) { ?><pre><?php echo htmlentities(implode("\n",$notice['log'])) ?></pre><?php } ?> @@ -161,218 +158,96 @@ <?php } ?> <tr> <td> - <table class="n" cellspacing="0" width="100%" cellpadding="4"> -<?php unset($attr3) ?><?php unset($attr3_name) ?><?php unset($attr3_width) ?><?php unset($attr3_rowclasses) ?><?php unset($attr3_columnclasses) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:11:"global_name";s:6:"escape";s:4:"true";}' ?><?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; - if(empty($attr6_title)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_text='global_name'; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:8:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:4:"name";s:4:"size";s:2:"40";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr6 = array('class'=>'','default'=>'','type'=>'text','name'=>'name','size'=>'40','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?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 $attr6_readonly=false ?><?php if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr6_readonly=true; + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_default=''; $attr6_type='text'; $attr6_name='name'; $attr6_size='40'; $attr6_maxlength='256'; $attr6_onchange=''; $attr6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ($attr6_readonly && empty($$attr6_name)) $$attr6_name = '- '.lang('EMPTY').' -'; if(!isset($attr6_default)) $attr6_default=''; ?><?php if (!$attr6_readonly || $attr6_type=='hidden') { ?><input<?php if ($attr6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" name="<?php echo $attr6_name ?><?php if ($attr6_readonly) echo '_disabled' ?>" 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 ?>" <?php if (in_array($attr6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php if ($attr6_readonly) { ?><input type="hidden" id="id_<?php echo $attr6_name ?>" name="<?php echo $attr6_name ?>" value="<?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?>" /><?php - } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?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 unset($attr6_readonly) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php + } } else { ?><span class="<?php echo $attr6_class ?>"><?php echo isset($$attr6_name)?$$attr6_name:$attr6_default ?></span><?php } ?><?php unset($attr6_class);unset($attr6_default);unset($attr6_type);unset($attr6_name);unset($attr6_size);unset($attr6_maxlength);unset($attr6_onchange);unset($attr6_readonly); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php ?><?php $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; + $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_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:12:"element_type";s:6:"escape";s:4:"true";}' ?><?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)) - $attr6_key = $attr6_key.$attr6_suffix; - if(empty($attr6_title)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_class='text'; $attr6_text='element_type'; $attr6_escape=true; ?><?php + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($attr6) ?><?php unset($attr6_class) ?><?php unset($attr6_text) ?><?php unset($attr6_escape) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr5_debug_info = 'a:1:{s:5:"class";s:2:"fx";}' ?><?php $attr5 = array('class'=>'fx') ?><?php $attr5_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php $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; + $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_debug_info = 'a:2:{s:3:"var";s:4:"text";s:5:"value";s:4:"text";}' ?><?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)) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr6_var='text'; $attr6_value='text'; ?><?php + if (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_debug_info = 'a:10:{s:4:"list";s:5:"types";s:4:"name";s:4:"type";s:7:"default";s:4:"text";s:8:"onchange";s:0:"";s:5:"title";s:0:"";s:5:"class";s:0:"";s:8:"addempty";s:5:"false";s:8:"multiple";s:5:"false";s:4:"size";s:1:"1";s:4:"lang";s:5:"false";}' ?><?php $attr6 = array('list'=>'types','name'=>'type','default'=>'text','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr6_list='types' ?><?php $attr6_name='type' ?><?php $attr6_default='text' ?><?php $attr6_onchange='' ?><?php $attr6_title='' ?><?php $attr6_class='' ?><?php $attr6_addempty=false ?><?php $attr6_multiple=false ?><?php $attr6_size='1' ?><?php $attr6_lang=false ?><?php +?><?php unset($attr6_var);unset($attr6_value); ?><?php $attr6_list='types'; $attr6_name='type'; $attr6_default='text'; $attr6_onchange=''; $attr6_title=''; $attr6_class=''; $attr6_addempty=false; $attr6_multiple=false; $attr6_size='1'; $attr6_lang=false; ?><?php $attr6_tmp_list = $$attr6_list; -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') +if ($this->isEditable() && !$this->isEditMode()) { echo empty($$attr6_name)?'- '.lang('EMPTY').' -':$attr6_tmp_list[$$attr6_name]; } @@ -423,41 +298,31 @@ echo ' size="'.intval($attr6_size).'"'; if (count($$attr6_list)==0) echo '<input type="hidden" name="'.$attr6_name.'" value="" />'; 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 unset($attr6_addempty) ?><?php unset($attr6_multiple) ?><?php unset($attr6_size) ?><?php unset($attr6_lang) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr4_debug_info = 'a:0:{}' ?><?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_debug_info = 'a:2:{s:5:"class";s:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'act','colspan'=>'2') ?><?php $attr5_class='act' ?><?php $attr5_colspan='2' ?><?php +?><?php unset($attr6_list);unset($attr6_name);unset($attr6_default);unset($attr6_onchange);unset($attr6_title);unset($attr6_class);unset($attr6_addempty);unset($attr6_multiple);unset($attr6_size);unset($attr6_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr4_tmp_class=''; + $attr4_last_class = $attr4_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); +?><?php ?><?php $attr5_class='act'; $attr5_colspan='2'; ?><?php $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; + $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 unset($attr5_colspan) ?><?php $attr6_debug_info = 'a:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:9:"button_ok";}' ?><?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') - { + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php -?><?php unset($attr6) ?><?php unset($attr6_type) ?><?php unset($attr6_class) ?><?php unset($attr6_value) ?><?php unset($attr6_text) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?php $attr3_debug_info = 'a:0:{}' ?><?php $attr3 = array() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -469,12 +334,12 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va <?php $dur = time()-START_TIME; echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> <?php } ?> -<?php unset($attr2) ?><?php $attr3_debug_info = 'a:1:{s:5:"field";s:4:"name";}' ?><?php $attr3 = array('field'=>'name') ?><?php $attr3_field='name' ?><?php +<?php ?><?php $attr3_field='name'; ?><?php if (isset($errors[0])) $attr3_field = $errors[0]; ?><script name="JavaScript" type="text/javascript"><!-- document.forms[0].<?php echo $attr3_field ?>.focus(); document.forms[0].<?php echo $attr3_field ?>.select(); </script> -<?php unset($attr3) ?><?php unset($attr3_field) ?><?php $attr1_debug_info = 'a:0:{}' ?><?php $attr1 = array() ?></form> -<?php unset($attr1) ?><?php $attr0_debug_info = 'a:0:{}' ?><?php $attr0 = array() ?></body> -</html><?php unset($attr0) ?>- \ No newline at end of file +<?php unset($attr3_field); ?><?php ?></form> +<?php ?><?php ?></body> +</html><?php ?>+ \ No newline at end of file diff --git a/themes/default/pages/html/template/el.tpl.php b/themes/default/pages/html/template/el.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='TEMPLATE_ELEMENTS'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='TEMPLATE_ELEMENTS'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { diff --git a/themes/default/pages/html/template/extension.tpl.php b/themes/default/pages/html/template/extension.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/template/listing.tpl.php b/themes/default/pages/html/template/listing.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_TEMPLATES'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_TEMPLATES'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { diff --git a/themes/default/pages/html/template/name.tpl.php b/themes/default/pages/html/template/name.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/template/remove.tpl.php b/themes/default/pages/html/template/remove.tpl.php @@ -4,34 +4,31 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; - if (empty($attr2_subaction)) $attr2_subaction = $targetSubActionName; - if (empty($attr2_id)) $attr2_id = $this->getRequestId(); if ($this->isEditable() && !$this->isEditMode()) $attr2_subaction = $subActionName; @@ -178,80 +175,13 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_text='GLOBAL_NAME'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) + $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr6_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?><?php @@ -266,80 +196,12 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } ?>><?php ?><?php $attr6_class='text'; $attr6_var='name'; $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)) - $attr6_title = ''; - if (empty($attr6_type)) + $attr6_title = ''; $tmp_tag = 'span'; - else - switch( $attr6_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $attr6_title = ''; - if ( $attr6_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr6_array)) - { - $tmpArray = $$attr6_array; - if (!empty($attr6_var)) - $tmp_text = $tmpArray[$attr6_var]; - else - $tmp_text = $langF($tmpArray[$attr6_text]); - } - elseif (!empty($attr6_text)) - $tmp_text = $langF($attr6_text); - elseif (!empty($attr6_textvar)) - $tmp_text = $langF($$attr6_textvar); - elseif (!empty($attr6_key)) - $tmp_text = $langF($attr6_key); - elseif (!empty($attr6_var)) - $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; - elseif (!empty($attr6_raw)) - $tmp_text = str_replace('_',' ',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = ' '; - 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); - } + $langF = $attr6_escape?'langHtml':'lang'; + $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -358,11 +220,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('options'); ?><fieldset><?php if(isset($attr6_title)) { ?><legend><?php echo encodeHtml($attr6_title) ?></legend><?php } ?><?php unset($attr6_title); ?><?php ?></fieldset><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; @@ -379,11 +237,7 @@ if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_colspan); ?><?php $attr6_default=false; $attr6_readonly=false; $attr6_name='delete'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) @@ -396,74 +250,12 @@ if ( $attr6_readonly && $checked ) ?><input type="hidden" name="<?php echo $attr6_name ?>" value="1" /><?php } ?><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6_default);unset($attr6_readonly);unset($attr6_name); ?><?php $attr6_for='delete'; ?><label for="id_<?php echo $attr6_for ?><?php if (!empty($attr6_value)) echo '_'.$attr6_value ?>"><?php unset($attr6_for); ?><?php $attr7_class='text'; $attr7_text='CONFIRM_DELETE'; $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)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr7_title = ''; $tmp_tag = 'span'; - else - switch( $attr7_type ) - { - case 'emphatic': - case 'italic': - $tmp_tag = 'em'; - break; - case 'strong': - case 'bold': - $tmp_tag = 'strong'; - break; - case 'tt': - case 'teletype': - $tmp_tag = 'tt'; - break; - case 'preformatted'; - $tmp_tag = 'pre'; - break; - case 'code'; - $tmp_tag = 'code'; - break; - default: - $tmp_tag = 'span'; - } ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php - $attr7_title = ''; - if ( $attr7_escape ) - $langF = 'langHtml'; - else - $langF = 'lang'; - if (!empty($attr7_array)) - { - $tmpArray = $$attr7_array; - if (!empty($attr7_var)) - $tmp_text = $tmpArray[$attr7_var]; - else - $tmp_text = $langF($tmpArray[$attr7_text]); - } - elseif (!empty($attr7_text)) - $tmp_text = $langF($attr7_text); - elseif (!empty($attr7_textvar)) + $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = $langF($$attr7_textvar); - elseif (!empty($attr7_key)) - $tmp_text = $langF($attr7_key); - elseif (!empty($attr7_var)) - $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; - elseif (!empty($attr7_raw)) - $tmp_text = str_replace('_',' ',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = ' '; - 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); - } + $tmp_text = $langF($attr7_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -482,22 +274,12 @@ if ( $attr6_readonly && $checked ) if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -if ( isset($attr5_width )) { ?> width="<?php echo $attr5_width ?>" <?php } -if ( isset($attr5_style )) { ?> style="<?php echo $attr5_style ?>" <?php } -if ( isset($attr5_class )) { ?> class="<?php echo $attr5_class ?>" <?php } -if ( isset($attr5_colspan)) { ?> colspan="<?php echo $attr5_colspan ?>" <?php } -if ( isset($attr5_rowspan)) { ?> rowspan="<?php echo $attr5_rowspan ?>" <?php } +?> class="<?php echo $attr5_class ?>" <?php +?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/template/src.tpl.php b/themes/default/pages/html/template/src.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/template/srcelement.tpl.php b/themes/default/pages/html/template/srcelement.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); diff --git a/themes/default/pages/html/title/show.tpl.php b/themes/default/pages/html/title/show.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_width='100%'; $attr2_space='0'; $attr2_padding='5'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_width='100%'; $attr2_space='0'; $attr2_padding='5'; ?><?php $coloumn_widths = array(); $row_classes = array(); $column_classes = array(); @@ -59,6 +59,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = isset($$attr5_var)?$$attr5_var:'?unset:'.$attr5_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_title);unset($attr5_class);unset($attr5_var);unset($attr5_escape); ?><?php $attr5_class='text'; $attr5_raw='_-_'; $attr5_escape=true; ?><?php @@ -67,6 +68,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr5_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_raw);unset($attr5_escape); ?><?php $attr5_class='text'; $attr5_var='cms_title'; $attr5_escape=true; ?><?php @@ -75,6 +77,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; $tmp_text = isset($$attr5_var)?$$attr5_var:'?unset:'.$attr5_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_var);unset($attr5_escape); ?><?php ?></td><?php ?><?php $attr4_width='40%'; $attr4_style='text-align:center;'; $attr4_class='title'; ?><?php @@ -103,6 +106,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_title);unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?><?php } ?><?php ?><?php $attr5_present='modelname'; ?><?php @@ -117,6 +121,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_title=lang('model'); $attr6_class='text'; $attr6_var='modelname'; $attr6_escape=true; ?><?php @@ -124,6 +129,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_title);unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_raw=','; $attr6_escape=true; ?><?php @@ -132,6 +138,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_title=lang('language'); $attr6_class='text'; $attr6_var='languagename'; $attr6_escape=true; ?><?php @@ -139,6 +146,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_title);unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_raw=')'; $attr6_escape=true; ?><?php @@ -147,6 +155,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php $attr4_width='20%'; $attr4_style='text-align:right;'; $attr4_class='title'; ?><?php @@ -176,6 +185,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php $attr4_width='10%'; $attr4_style='text-align:right;'; $attr4_class='title'; ?><?php @@ -205,6 +215,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = $langF($attr6_key); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?></table><?php ?><?php ?></body> diff --git a/themes/default/pages/html/tree/show.tpl.php b/themes/default/pages/html/tree/show.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_class='tree'; $attr2_width='100%'; $attr2_space='0'; $attr2_padding='0'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_class='tree'; $attr2_width='100%'; $attr2_space='0'; $attr2_padding='0'; ?><?php $coloumn_widths = array(); $row_classes = array(); $column_classes = array(); @@ -164,6 +164,7 @@ unset($attr6_tmp_last_exec) ?><?php ?><?php ?></td><?php ?><?php ?><?php } ? ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr6_tmp_last_exec) { ?> @@ -176,6 +177,7 @@ unset($attr6_tmp_last_exec) ?><?php ?><?php ?></td><?php ?><?php ?><?php } ? ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_escape); ?><?php ?><?php } diff --git a/themes/default/pages/html/treetitle/show.tpl.php b/themes/default/pages/html/treetitle/show.tpl.php @@ -26,7 +26,7 @@ <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_width='100%'; $attr2_space='0'; $attr2_padding='5'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_width='100%'; $attr2_space='0'; $attr2_padding='5'; ?><?php $coloumn_widths = array(); $row_classes = array(); $column_classes = array(); @@ -91,6 +91,7 @@ $langF = $attr8_escape?'langHtml':'lang'; $tmp_text = isset($$attr8_var)?$$attr8_var:'?unset:'.$attr8_var.'?'; $tmp_text = Text::maxLength( $tmp_text,intval($attr8_maxlength) ); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_var);unset($attr8_maxlength);unset($attr8_escape); ?><?php ?></a><?php ?><?php $attr7_type='filesep'; ?><?php @@ -103,6 +104,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = isset($$attr6_var)?$$attr6_var:'?unset:'.$attr6_var.'?'; + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_title);unset($attr6_class);unset($attr6_var);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php @@ -167,6 +169,7 @@ $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); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_key);unset($attr8_accesskey);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><?php } ?><?php ?><?php ?><?php if (!$attr6_tmp_last_exec) { ?> @@ -179,6 +182,7 @@ $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); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_accesskey);unset($attr7_escape); ?><?php ?><?php } @@ -188,6 +192,7 @@ unset($attr5_tmp_last_exec) ?><?php ?><?php $attr6_class='text'; $attr6_raw=' ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_',' ',$attr6_raw); + $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); ?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_var='url'; $attr6_value=''; ?><?php diff --git a/themes/default/pages/html/user/add.tpl.php b/themes/default/pages/html/user/add.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); @@ -222,16 +222,9 @@ if ($attr6_readonly) { ?> class="<?php echo $attr5_class ?>" <?php ?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); @@ -623,16 +623,9 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?> class="<?php echo $attr5_class ?>" <?php ?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/user/groups.tpl.php b/themes/default/pages/html/user/groups.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_self'; $attr2_method='post'; $attr2_enctype='application/x-www-form-urlencoded'; ?><?php $attr2_action = $actionName; $attr2_subaction = $targetSubActionName; $attr2_id = $this->getRequestId(); @@ -227,7 +227,7 @@ if ( $attr7_readonly && $checked ) ?>><?php ?><?php $attr7_for=$var; ?><label for="id_<?php echo $attr7_for ?><?php if (!empty($attr7_value)) echo '_'.$attr7_value ?>"><?php unset($attr7_for); ?><?php $attr8_file='icon_group'; $attr8_align='left'; ?><?php $attr8_tmp_image_file = $image_dir.$attr8_fileext; $attr8_tmp_image_file = $image_dir.$attr8_file.IMG_ICON_EXT; -?><img src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_file);unset($attr8_align); ?><?php $attr8_class='text'; $attr8_var='name'; $attr8_escape=true; ?><?php +?><img alt="<?php echo basename($attr8_tmp_image_file); echo ' ('; if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo $attr8_tmp_width.'x'.$attr8_tmp_height; echo')';} ?>" src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_file);unset($attr8_align); ?><?php $attr8_class='text'; $attr8_var='name'; $attr8_escape=true; ?><?php $attr8_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php @@ -254,16 +254,9 @@ if ( $attr7_readonly && $checked ) ?> class="<?php echo $attr5_class ?>" <?php ?> colspan="<?php echo $attr5_colspan ?>" <?php ?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?php - if ($attr6_type=='ok') - { if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; - } - if ($attr6_type=='ok') - $attr6_type = 'submit'; - if (isset($attr6_src)) - $attr6_type = 'image'; - else + $attr6_type = 'submit'; $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=" <?php echo langHtml($attr6_text) ?> " /><?php unset($attr6_src) ?><?php ?><?php unset($attr6_type);unset($attr6_class);unset($attr6_value);unset($attr6_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/user/listing.tpl.php b/themes/default/pages/html/user/listing.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_USERS'; $attr2_icon='user'; $attr2_width='70%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name='GLOBAL_USERS'; $attr2_icon='user'; $attr2_width='70%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -184,28 +184,11 @@ ?><td<?php ?>><?php ?><?php $attr6_title='desc'; $attr6_target='cms_main'; $attr6_url=$url; $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)) - $attr6_title = ''; - if(!empty($attr6_url)) $tmp_url = $attr6_url; - else - $tmp_url = Html::url($attr6_action,$attr6_subaction,!empty($attr6_id)?$attr6_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr6_name)) echo ' name="'.$attr6_name.'"'; else echo ' href="'.$tmp_url.($attr6_anchor?'#'.$attr6_anchor:'').'"' ?> class="<?php echo $attr6_class ?>" target="<?php echo $attr6_target ?>"<?php if (isset($attr6_accesskey)) echo ' accesskey="'.$attr6_accesskey.'"' ?> title="<?php echo encodeHtml($attr6_title) ?>"><?php unset($attr6_title);unset($attr6_target);unset($attr6_url);unset($attr6_class); ?><?php $attr7_align='left'; $attr7_type='user'; ?><?php $attr7_tmp_image_file = $image_dir.'icon_'.$attr7_type.IMG_ICON_EXT; $attr7_size = '16x16'; -?><img src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_class='text'; $attr7_var='name'; $attr7_escape=true; ?><?php +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_class='text'; $attr7_var='name'; $attr7_escape=true; ?><?php $attr7_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php diff --git a/themes/default/pages/html/user/rights.tpl.php b/themes/default/pages/html/user/rights.tpl.php @@ -4,29 +4,29 @@ <html> <head> <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?lang($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" /> - <meta name="MSSmartTagsPreventParsing" content="true" /> - <meta name="robots" content="noindex,nofollow" /> + <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > + <meta name="MSSmartTagsPreventParsing" content="true" > + <meta name="robots" content="noindex,nofollow" > <?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']) ?>" /> + <link rel="section" href="<?php echo Html::url($actionName,@$menu['subaction'],$this->getRequestId() ) ?>" title="<?php echo lang($menu['text']) ?>" > <?php } ?><?php if (isset($metaList) && is_array($metaList)) foreach( $metaList as $meta ) { ?> - <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" /><?php + <link rel="<?php echo $meta['name'] ?>" href="<?php echo $meta['url'] ?>" title="<?php echo lang($meta['title']) ?>" ><?php } ?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $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 ?>" /> + <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > <?php } ?> </head> <body class="<?php echo $attr1_class ?>" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php unset($attr1_class); ?><?php $attr2_title='ACL'; $attr2_name='x'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_title='ACL'; $attr2_name='x'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -390,7 +390,7 @@ <?php unset($attr7_present); ?><?php $attr8_align='left'; $attr8_type='user'; ?><?php $attr8_tmp_image_file = $image_dir.'icon_'.$attr8_type.IMG_ICON_EXT; $attr8_size = '16x16'; -?><img src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='username'; $attr8_maxlength='20'; $attr8_escape=true; ?><?php +?><img alt="<?php echo basename($attr8_tmp_image_file); echo ' ('; if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo $attr8_tmp_width.'x'.$attr8_tmp_height; echo')';} ?>" src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='username'; $attr8_maxlength='20'; $attr8_escape=true; ?><?php $attr8_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php @@ -408,7 +408,7 @@ <?php unset($attr7_present); ?><?php $attr8_align='left'; $attr8_type='group'; ?><?php $attr8_tmp_image_file = $image_dir.'icon_'.$attr8_type.IMG_ICON_EXT; $attr8_size = '16x16'; -?><img src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='groupname'; $attr8_maxlength='20'; $attr8_escape=true; ?><?php +?><img alt="<?php echo basename($attr8_tmp_image_file); echo ' ('; if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo $attr8_tmp_width.'x'.$attr8_tmp_height; echo')';} ?>" src="<?php echo $attr8_tmp_image_file ?>" border="0"<?php if(isset($attr8_align)) echo ' align="'.$attr8_align.'"' ?><?php if (isset($attr8_size)) { list($attr8_tmp_width,$attr8_tmp_height)=explode('x',$attr8_size);echo ' width="'.$attr8_tmp_width.'" height="'.$attr8_tmp_height.'"';} ?>><?php unset($attr8_align);unset($attr8_type); ?><?php $attr8_class='text'; $attr8_var='groupname'; $attr8_maxlength='20'; $attr8_escape=true; ?><?php $attr8_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php @@ -434,7 +434,7 @@ <?php unset($attr8_not);unset($attr8_present); ?><?php $attr9_align='left'; $attr9_type='group'; ?><?php $attr9_tmp_image_file = $image_dir.'icon_'.$attr9_type.IMG_ICON_EXT; $attr9_size = '16x16'; -?><img src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_align);unset($attr9_type); ?><?php $attr9_class='text'; $attr9_key='global_all'; $attr9_escape=true; ?><?php +?><img alt="<?php echo basename($attr9_tmp_image_file); echo ' ('; if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo $attr9_tmp_width.'x'.$attr9_tmp_height; echo')';} ?>" src="<?php echo $attr9_tmp_image_file ?>" border="0"<?php if(isset($attr9_align)) echo ' align="'.$attr9_align.'"' ?><?php if (isset($attr9_size)) { list($attr9_tmp_width,$attr9_tmp_height)=explode('x',$attr9_size);echo ' width="'.$attr9_tmp_width.'" height="'.$attr9_tmp_height.'"';} ?>><?php unset($attr9_align);unset($attr9_type); ?><?php $attr9_class='text'; $attr9_key='global_all'; $attr9_escape=true; ?><?php $attr9_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php @@ -445,17 +445,9 @@ ?></<?php echo $tmp_tag ?>><?php unset($attr9_class);unset($attr9_key);unset($attr9_escape); ?><?php ?><?php } ?><?php ?><?php ?><?php } ?><?php ?><?php $attr7_var='username'; ?><?php if (!isset($attr7_value)) unset($$attr7_var); - elseif (isset($attr7_key)) - $$attr7_var = $attr7_value[$attr7_key]; - else - $$attr7_var = $attr7_value; ?><?php unset($attr7_var); ?><?php $attr7_var='groupname'; ?><?php if (!isset($attr7_value)) unset($$attr7_var); - elseif (isset($attr7_key)) - $$attr7_var = $attr7_value[$attr7_key]; - else - $$attr7_var = $attr7_value; ?><?php unset($attr7_var); ?><?php ?></td><?php ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) @@ -471,25 +463,8 @@ ?>><?php ?><?php $attr7_align='left'; $attr7_type=$objecttype; ?><?php $attr7_tmp_image_file = $image_dir.'icon_'.$attr7_type.IMG_ICON_EXT; $attr7_size = '16x16'; -?><img src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_title=''; $attr7_target='_top'; $attr7_class=''; $attr7_action='index'; $attr7_subaction='object'; $attr7_id=$objectid; ?><?php +?><img alt="<?php echo basename($attr7_tmp_image_file); echo ' ('; if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo $attr7_tmp_width.'x'.$attr7_tmp_height; echo')';} ?>" src="<?php echo $attr7_tmp_image_file ?>" border="0"<?php if(isset($attr7_align)) echo ' align="'.$attr7_align.'"' ?><?php if (isset($attr7_size)) { list($attr7_tmp_width,$attr7_tmp_height)=explode('x',$attr7_size);echo ' width="'.$attr7_tmp_width.'" height="'.$attr7_tmp_height.'"';} ?>><?php unset($attr7_align);unset($attr7_type); ?><?php $attr7_title=''; $attr7_target='_top'; $attr7_class=''; $attr7_action='index'; $attr7_subaction='object'; $attr7_id=$objectid; ?><?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)) - $attr7_title = ''; - if(!empty($attr7_url)) - $tmp_url = $attr7_url; - else $tmp_url = Html::url($attr7_action,$attr7_subaction,!empty($attr7_id)?$attr7_id:$this->getRequestId(),$params); ?><a<?php if (isset($attr7_name)) echo ' name="'.$attr7_name.'"'; else echo ' href="'.$tmp_url.($attr7_anchor?'#'.$attr7_anchor:'').'"' ?> class="<?php echo $attr7_class ?>" target="<?php echo $attr7_target ?>"<?php if (isset($attr7_accesskey)) echo ' accesskey="'.$attr7_accesskey.'"' ?> title="<?php echo encodeHtml($attr7_title) ?>"><?php unset($attr7_title);unset($attr7_target);unset($attr7_class);unset($attr7_action);unset($attr7_subaction);unset($attr7_id); ?><?php $attr8_title=lang('select'); $attr8_class='text'; $attr8_var='objectname'; $attr8_maxlength='20'; $attr8_escape=true; ?><?php $tmp_tag = 'span'; @@ -552,9 +527,7 @@ $attr7_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?>><?php ?><?php $attr8_var=$list_value; $attr8_value=$bits; $attr8_key=$list_value; ?><?php - if (!isset($attr8_value)) - unset($$attr8_var); - elseif (isset($attr8_key)) + if (isset($attr8_key)) $$attr8_var = $attr8_value[$attr8_key]; else $$attr8_var = $attr8_value;