openrat-cms

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

commit f14eb743804078fc219d664b261998570eed5867
parent 50f9238b6b0a3df980f07227d4bb32b856d95a9f
Author: dankert <devnull@localhost>
Date:   Thu,  8 Oct 2009 23:12:37 +0200

Pro Subaction eine Unterscheidung zwischen View und Action machen.

Diffstat:
MactionClasses/PageAction.class.php | 6+++---
MactionClasses/PageAction.ini.php | 6++----
Mdo.php | 39++++++++++++++++++++++++++++++---------
Mthemes/default/pages/html/element/name.tpl.php | 4++--
Mthemes/default/pages/html/element/properties.tpl.php | 4++--
Mthemes/default/pages/html/element/remove.tpl.php | 4++--
Mthemes/default/pages/html/element/type.tpl.php | 4++--
Mthemes/default/pages/html/empty/blank.tpl.php | 2+-
Mthemes/default/pages/html/empty/border.tpl.php | 2+-
Mthemes/default/pages/html/file/compress.tpl.php | 57++++++++++++++++++++++++++++++++++-----------------------
Mthemes/default/pages/html/file/edit.tpl.php | 6+++---
Mthemes/default/pages/html/file/prop.tpl.php | 77++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------
Mthemes/default/pages/html/file/pub.tpl.php | 20++++++++++++++++++--
Mthemes/default/pages/html/file/size.tpl.php | 12+++++++++++-
Mthemes/default/pages/html/folder/create.tpl.php | 4++--
Mthemes/default/pages/html/folder/createfile.tpl.php | 2+-
Mthemes/default/pages/html/folder/createfolder.tpl.php | 2+-
Mthemes/default/pages/html/folder/createpage.tpl.php | 4++--
Mthemes/default/pages/html/folder/order.tpl.php | 51+++++++++++++++++++++++++++------------------------
Mthemes/default/pages/html/folder/prop.tpl.php | 4++--
Mthemes/default/pages/html/folder/pub.tpl.php | 4++--
Mthemes/default/pages/html/folder/select.tpl.php | 35++++++++++++++++++++---------------
Mthemes/default/pages/html/folder/show.tpl.php | 36++++++++++++++++++++----------------
Mthemes/default/pages/html/group/edit.tpl.php | 4++--
Mthemes/default/pages/html/group/remove.tpl.php | 8++++++--
Mthemes/default/pages/html/group/rights.tpl.php | 9+++++++++
Mthemes/default/pages/html/index/applications.tpl.php | 7+++++--
Mthemes/default/pages/html/index/password.tpl.php | 386++++++++++++++++++++++++++++++-------------------------------------------------
Mthemes/default/pages/html/index/passwordinputcode.tpl.php | 243++++++++++++++++++++++++++++++-------------------------------------------------
Mthemes/default/pages/html/index/projectmenu.tpl.php | 6+++---
Mthemes/default/pages/html/index/register.tpl.php | 245++++++++++++++++++++++++++++++-------------------------------------------------
Mthemes/default/pages/html/index/registeruserdata.tpl.php | 593++++++++++++++++++++++++++-----------------------------------------------------
Mthemes/default/pages/html/index/showlogin.tpl.php | 4++--
Mthemes/default/pages/html/language/edit.tpl.php | 4++--
Mthemes/default/pages/html/link/edit.tpl.php | 6++++--
Mthemes/default/pages/html/link/prop.tpl.php | 4++--
Mthemes/default/pages/html/mainmenu/show.tpl.php | 2+-
Mthemes/default/pages/html/object/aclform.tpl.php | 11+++++++++--
Mthemes/default/pages/html/object/rights.tpl.php | 53+++++++++++++++++++++++++++++++++++++----------------
Mthemes/default/pages/html/page/changetemplate.tpl.php | 11+++++++----
Mthemes/default/pages/html/page/changetemplateselectelements.tpl.php | 211++++++++++++++++++++++++++-----------------------------------------------------
Mthemes/default/pages/html/page/el.tpl.php | 15+++++++++++----
Mthemes/default/pages/html/page/prop.tpl.php | 4++--
Mthemes/default/pages/html/page/pub.tpl.php | 43+++++++++++++++++++++++++------------------
Mthemes/default/pages/html/page/src.tpl.php | 4++--
Mthemes/default/pages/html/pageelement/archive.tpl.php | 4++--
Mthemes/default/pages/html/pageelement/diff.tpl.php | 4++--
Mthemes/default/pages/html/pageelement/edit.tpl.php | 4++--
Mthemes/default/pages/html/pageelement/prop.tpl.php | 4++--
Mthemes/default/pages/html/profile/edit.tpl.php | 4++--
Mthemes/default/pages/html/profile/groups.tpl.php | 1+
Mthemes/default/pages/html/profile/mail.tpl.php | 5+++--
Mthemes/default/pages/html/profile/settings.tpl.php | 4++--
Mthemes/default/pages/html/project/add.tpl.php | 4++--
Mthemes/default/pages/html/project/edit.tpl.php | 38++++++++++++++++++++++++++++++++++++--
Mthemes/default/pages/html/project/export.tpl.php | 21+++++++++++----------
Mthemes/default/pages/html/project/listing.tpl.php | 4++--
Mthemes/default/pages/html/project/maintenance.tpl.php | 20++++++++++----------
Mthemes/default/pages/html/project/remove.tpl.php | 23+++++++++++++----------
Mthemes/default/pages/html/search/content.tpl.php | 42+++++++++++++++++++++++++++++++++++++++---
Mthemes/default/pages/html/search/prop.tpl.php | 4++--
Mthemes/default/pages/html/search/result.tpl.php | 75+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------
Mthemes/default/pages/html/template/addel.tpl.php | 4++--
Mthemes/default/pages/html/template/el.tpl.php | 4++--
Mthemes/default/pages/html/template/extension.tpl.php | 5+++--
Mthemes/default/pages/html/template/listing.tpl.php | 4++--
Mthemes/default/pages/html/template/name.tpl.php | 4++--
Mthemes/default/pages/html/template/pages.tpl.php | 7++++---
Mthemes/default/pages/html/template/src.tpl.php | 4++--
Mthemes/default/pages/html/template/srcelement.tpl.php | 4++--
Mthemes/default/pages/html/title/show.tpl.php | 2+-
Mthemes/default/pages/html/tree/show.tpl.php | 2+-
Mthemes/default/pages/html/treetitle/show.tpl.php | 2+-
Mthemes/default/pages/html/user/edit.tpl.php | 19++++++++++++++++++-
Mthemes/default/pages/html/user/listing.tpl.php | 2+-
Mthemes/default/pages/html/user/remove.tpl.php | 300++++++++++++++-----------------------------------------------------------------
76 files changed, 1251 insertions(+), 1631 deletions(-)

diff --git a/actionClasses/PageAction.class.php b/actionClasses/PageAction.class.php @@ -303,7 +303,7 @@ class PageAction extends ObjectAction /** * Eigenschaften der Seite speichern */ - function saveprop() + function propAction() { if ( $this->getRequestVar('name')!='' ) { @@ -616,7 +616,7 @@ class PageAction extends ObjectAction /** * Die Eigenschaften der Seite anzeigen */ - function prop() + function propView() { $this->setTemplateVar('id',$this->page->objectid); @@ -762,7 +762,7 @@ class PageAction extends ObjectAction { case 'changetemplate': // Template nur austauschbar, wenn es mind. 2 gibt. - return (count($this->page->template->getAll()) > 1); + return (count(Template::getAll()) > 1); default: return true; diff --git a/actionClasses/PageAction.ini.php b/actionClasses/PageAction.ini.php @@ -29,15 +29,13 @@ target=pubnow [pubnow] goto=pub -[saveprop] -goto=prop - [saveform] goto=el [prop] menu=prop -target=saveprop +write=true +target=prop editable=true [changetemplate] diff --git a/do.php b/do.php @@ -279,21 +279,42 @@ if ( isset($do->actionConfig[$do->subActionName]['alias']) ) $subaction = $do->actionConfig[$do->subActionName]['alias']; // $do->subActionName = $subaction; } - - -// Aufruf der Subaction -$do->$subaction(); + + +// Alias-Methode aufrufen. +if ( isset($do->actionConfig[$do->subActionName]['write']) ) +{ + //Html::debug($_SERVER); + if ( $_SERVER['REQUEST_METHOD'] == 'POST' ) + { + $subactionAction = $subaction.'Action'; + $do->$subactionAction(); + } + $subactionView = $subaction.'View'; + $do->$subactionView(); +} +else +{ + // Aufruf der Subaction + $do->$subaction(); +} + // Aufruf der n�chsten Subaction (falls vorhanden) if ( isset($do->actionConfig[$do->subActionName]['goto']) ) { if ( $conf['interface']['redirect'] ) { - $subActionName = $do->actionConfig[$do->subActionName]['goto']; - header( 'HTTP/1.0 303 See other'); - // Absoluten Pfad kann auch der Client erg�nzen. - header( 'Location: '.Html::url($action,$do->actionConfig[$do->subActionName]['goto'],$do->getRequestId()) ); - exit; + // Wenn Validierungsfehler aufgetrete sind, auf keinen Fall einen Redirect machen, da sonst + // im nächste Request die Eingabedaten fehlen. + if ( empty($do->templateVars['errors']) ) + { + $subActionName = $do->actionConfig[$do->subActionName]['goto']; + header( 'HTTP/1.0 303 See other'); + // Absoluten Pfad kann auch der Client erg�nzen. + header( 'Location: '.Html::url($action,$do->actionConfig[$do->subActionName]['goto'],$do->getRequestId()) ); + exit; + } } $subActionName = $do->actionConfig[$do->subActionName]['goto']; diff --git a/themes/default/pages/html/element/name.tpl.php b/themes/default/pages/html/element/name.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/element/properties.tpl.php b/themes/default/pages/html/element/properties.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_name);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php $attr4_present='subtype'; ?><?php $attr4_tmp_exec = isset($$attr4_present); diff --git a/themes/default/pages/html/element/remove.tpl.php b/themes/default/pages/html/element/remove.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/element/type.tpl.php b/themes/default/pages/html/element/type.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/empty/blank.tpl.php b/themes/default/pages/html/empty/blank.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > diff --git a/themes/default/pages/html/empty/border.tpl.php b/themes/default/pages/html/empty/border.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > diff --git a/themes/default/pages/html/file/compress.tpl.php b/themes/default/pages/html/file/compress.tpl.php @@ -155,7 +155,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -257,6 +257,23 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $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; + 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 +?> 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)) @@ -281,12 +298,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 -?>><?php ?><?php $attr6_var='field'; $attr6_value='replace'; ?><?php - if (isset($attr6_key)) - $$attr6_var = $attr6_value[$attr6_key]; - else - $$attr6_var = $attr6_value; -?><?php unset($attr6_var);unset($attr6_value); ?><?php $attr6_readonly=false; $attr6_name='field'; $attr6_value=true; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php +?>><?php ?><?php $attr6_readonly=false; $attr6_name='replace'; $attr6_value='1'; $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; @@ -295,17 +307,16 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va else $attr6_tmp_default = ''; ?><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_class='text'; $attr6_text='replace'; $attr6_escape=true; ?><?php - $attr6_title = ''; +<?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='replace'; $attr6_value='1'; ?><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='replace'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); +?><<?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($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?><br/><?php ?><?php $attr6_readonly=false; $attr6_name='field'; $attr6_value=false; $attr6_default=false; $attr6_prefix=''; $attr6_suffix=''; $attr6_class=''; $attr6_onchange=''; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?><br/><?php ?><?php $attr6_readonly=false; $attr6_name='replace'; $attr6_value='nix'; $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; @@ -314,21 +325,20 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va else $attr6_tmp_default = ''; ?><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_class='text'; $attr6_text='createnew'; $attr6_escape=true; ?><?php - $attr6_title = ''; +<?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='replace'; $attr6_value='nix'; ?><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='new'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); +?><<?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($attr6_class);unset($attr6_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?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 $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; @@ -340,8 +350,9 @@ 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 +?> class="<?php echo $attr5_class ?>" <?php ?> colspan="<?php echo $attr5_colspan ?>" <?php -?>><?php unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_ok'; ?><?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'; $attr6_type = 'submit'; diff --git a/themes/default/pages/html/file/edit.tpl.php b/themes/default/pages/html/file/edit.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -155,7 +155,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -173,7 +173,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?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 +?>><?php ?><?php ?><br/><?php ?><?php ?><br/><?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 ?><br/><?php ?><?php ?><br/><?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)); diff --git a/themes/default/pages/html/file/prop.tpl.php b/themes/default/pages/html/file/prop.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_icon);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -740,41 +740,64 @@ if ($attr6_readonly) { if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?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; - $attr6_list_extract = $attr6_extract; - unset($attr6_key); - unset($attr6_value); - if ( !isset($$attr6_list) || !is_array($$attr6_list) ) - $$attr6_list = array(); - foreach( $$attr6_list as $$attr6_list_tmp_key => $$attr6_list_tmp_value ) +?>><?php ?><?php $attr6_width='100%'; $attr6_space='0px'; $attr6_padding='0px'; ?><?php + $coloumn_widths = array(); + $row_classes = array(); + $column_classes = array(); + $attr6_class=''; + $column_widths = explode(',',$attr6_widths); + unset($attr6['widths']); +?><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 $attr7_list='pages'; $attr7_extract=true; $attr7_key='list_key'; $attr7_value='list_value'; ?><?php + $attr7_list_tmp_key = $attr7_key; + $attr7_list_tmp_value = $attr7_value; + $attr7_list_extract = $attr7_extract; + unset($attr7_key); + unset($attr7_value); + if ( !isset($$attr7_list) || !is_array($$attr7_list) ) + $$attr7_list = array(); + foreach( $$attr7_list as $$attr7_list_tmp_key => $$attr7_list_tmp_value ) { - if ( $attr6_list_extract ) + if ( $attr7_list_extract ) { - if ( !is_array($$attr6_list_tmp_value) ) + if ( !is_array($$attr7_list_tmp_value) ) { - print_r($$attr6_list_tmp_value); - die( 'not an array at key: '.$$attr6_list_tmp_key ); + print_r($$attr7_list_tmp_value); + die( 'not an array at key: '.$$attr7_list_tmp_key ); } - extract($$attr6_list_tmp_value); + extract($$attr7_list_tmp_value); } -?><?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 +?><?php unset($attr7_list);unset($attr7_extract);unset($attr7_key);unset($attr7_value); ?><?php ?><?php + $attr8_tmp_class=''; + $attr8_last_class = $attr8_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr8_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($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 +?>><?php ?><?php $attr10_title=''; $attr10_target='cms_main'; $attr10_url=$url; $attr10_class=''; ?><?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); ?><?php $attr8_align='left'; $attr8_type='page'; ?><?php - $attr8_tmp_image_file = $image_dir.'icon_'.$attr8_type.IMG_ICON_EXT; - $attr8_size = '16x16'; -?><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_url = $attr10_url; +?><a<?php if (isset($attr10_name)) echo ' name="'.$attr10_name.'"'; else echo ' href="'.$tmp_url.($attr10_anchor?'#'.$attr10_anchor:'').'"' ?> class="<?php echo $attr10_class ?>" target="<?php echo $attr10_target ?>"<?php if (isset($attr10_accesskey)) echo ' accesskey="'.$attr10_accesskey.'"' ?> title="<?php echo encodeHtml($attr10_title) ?>"><?php unset($attr10_title);unset($attr10_target);unset($attr10_url);unset($attr10_class); ?><?php $attr11_align='left'; $attr11_type='page'; ?><?php + $attr11_tmp_image_file = $image_dir.'icon_'.$attr11_type.IMG_ICON_EXT; + $attr11_size = '16x16'; +?><img alt="<?php echo basename($attr11_tmp_image_file); echo ' ('; if (isset($attr11_size)) { list($attr11_tmp_width,$attr11_tmp_height)=explode('x',$attr11_size);echo $attr11_tmp_width.'x'.$attr11_tmp_height; echo')';} ?>" src="<?php echo $attr11_tmp_image_file ?>" border="0"<?php if(isset($attr11_align)) echo ' align="'.$attr11_align.'"' ?><?php if (isset($attr11_size)) { list($attr11_tmp_width,$attr11_tmp_height)=explode('x',$attr11_size);echo ' width="'.$attr11_tmp_width.'" height="'.$attr11_tmp_height.'"';} ?>><?php unset($attr11_align);unset($attr11_type); ?><?php $attr11_class='text'; $attr11_var='name'; $attr11_escape=true; ?><?php + $attr11_title = ''; $tmp_tag = 'span'; -?><<?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.'?'; +?><<?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($attr8_class);unset($attr8_var);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?><br/><?php ?><?php ?><?php } ?><?php ?><?php $attr6_empty='pages'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr11_class);unset($attr11_var);unset($attr11_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?></table><?php ?><?php $attr6_empty='pages'; ?><?php if ( !isset($$attr6_empty) ) $attr6_tmp_exec = empty($attr6_empty); elseif ( is_array($$attr6_empty) ) diff --git a/themes/default/pages/html/file/pub.tpl.php b/themes/default/pages/html/file/pub.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,12 +157,28 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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; + 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 +?>><?php ?><?php ?><br/><?php ?><?php ?><br/><?php ?><?php ?><br/><?php ?><?php ?><br/><?php ?><?php ?><br/><?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 $attr5_class='act'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) diff --git a/themes/default/pages/html/file/size.tpl.php b/themes/default/pages/html/file/size.tpl.php @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -183,6 +183,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 ?><?php @@ -203,6 +204,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 @@ -211,6 +213,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('_','&nbsp;',$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_var='height'; $attr6_escape=true; ?><?php @@ -219,6 +222,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 ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_true=$mode=="edit"; ?><?php @@ -291,6 +295,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 ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -407,6 +412,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va $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 ?></td><?php ?><?php ?><?php @@ -434,6 +440,7 @@ if ($attr7_readonly) { ?><<?php echo $tmp_tag ?> class="<?php echo $attr7_class ?>" title="<?php echo $attr7_title ?>"><?php $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = str_replace('_','&nbsp;',$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_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; @@ -484,6 +491,7 @@ if ($attr7_readonly) { $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 ?></td><?php ?><?php ?><?php @@ -575,6 +583,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va $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 ?></td><?php ?><?php ?><?php @@ -681,6 +690,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 = $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 ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php diff --git a/themes/default/pages/html/folder/create.tpl.php b/themes/default/pages/html/folder/create.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/folder/createfile.tpl.php b/themes/default/pages/html/folder/createfile.tpl.php @@ -164,7 +164,7 @@ else </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/folder/createfolder.tpl.php b/themes/default/pages/html/folder/createfolder.tpl.php @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/folder/createpage.tpl.php b/themes/default/pages/html/folder/createpage.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/folder/order.tpl.php b/themes/default/pages/html/folder/order.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php ?><?php $attr3_tmp_class=''; @@ -168,11 +168,18 @@ $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 +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_text);unset($attr5_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr3_class='headline'; ?><?php $attr3_tmp_class=''; + $attr3_tmp_class_list = explode(',',$attr3_classes); + $last_pos = array_search($attr3_last_class,$attr3_tmp_class_list); + if ( $last_pos === FALSE || $last_pos == count($attr3_tmp_class_list)-1) + $attr3_tmp_class = $attr3_tmp_class_list[0]; + else + $attr3_tmp_class = $attr3_tmp_class_list[++$last_pos]; + $attr3_tmp_class=$attr3_class; $attr3_last_class = $attr3_tmp_class; echo Html::open_tag('tr',array('class'=>$attr3_tmp_class)); -?><?php ?><?php $attr4_class='help'; $attr4_colspan='4'; ?><?php +?><?php unset($attr3_class); ?><?php $attr4_class='help'; $attr4_colspan='4'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -186,20 +193,19 @@ ?><td<?php ?> class="<?php echo $attr4_class ?>" <?php ?> colspan="<?php echo $attr4_colspan ?>" <?php -?>><?php unset($attr4_class);unset($attr4_colspan); ?><?php $attr5_title='FOLDER_FLIP'; $attr5_target='_self'; $attr5_url=$flip_url; $attr5_class=''; ?><?php +?>><?php unset($attr4_class);unset($attr4_colspan); ?><?php $attr5_title=lang('FOLDER_FLIP'); $attr5_target='_self'; $attr5_url=$flip_url; $attr5_class=''; ?><?php $params = array(); $tmp_url = $attr5_url; -?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_text='FOLDER_ORDER'; $attr6_escape=true; ?><?php +?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_key='FOLDER_ORDER'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); + $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_text);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php $attr4_class='help'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php $attr4_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -212,20 +218,19 @@ $attr4_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr4_class ?>" <?php -?>><?php unset($attr4_class); ?><?php $attr5_title='FOLDER_ORDERBYTYPE'; $attr5_target='_self'; $attr5_url=$orderbytype_url; $attr5_class=''; ?><?php +?>><?php unset($attr4_class); ?><?php $attr5_title=lang('FOLDER_ORDERBYTYPE'); $attr5_target='_self'; $attr5_url=$orderbytype_url; $attr5_class=''; ?><?php $params = array(); $tmp_url = $attr5_url; -?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_text='GLOBAL_TYPE'; $attr6_escape=true; ?><?php +?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_key='GLOBAL_TYPE'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); + $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_text);unset($attr6_escape); ?><?php ?></a><?php ?><?php $attr5_class='text'; $attr5_raw='_/_'; $attr5_escape=true; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></a><?php ?><?php $attr5_class='text'; $attr5_raw='_/_'; $attr5_escape=true; ?><?php $attr5_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php @@ -234,20 +239,19 @@ $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_title='FOLDER_ORDERBYNAME'; $attr5_target='_self'; $attr5_url=$orderbyname_url; $attr5_class=''; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_raw);unset($attr5_escape); ?><?php $attr5_title=lang('FOLDER_ORDERBYNAME'); $attr5_target='_self'; $attr5_url=$orderbyname_url; $attr5_class=''; ?><?php $params = array(); $tmp_url = $attr5_url; -?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_text='GLOBAL_NAME'; $attr6_escape=true; ?><?php +?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_key='GLOBAL_NAME'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); + $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_text);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php $attr4_class='help'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php $attr4_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -260,20 +264,19 @@ $attr4_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr4_class ?>" <?php -?>><?php unset($attr4_class); ?><?php $attr5_title='FOLDER_ORDERBYLASTCHANGE'; $attr5_target='_self'; $attr5_url=$orderbylastchange_url; $attr5_class=''; ?><?php +?>><?php unset($attr4_class); ?><?php $attr5_title=lang('FOLDER_ORDERBYLASTCHANGE'); $attr5_target='_self'; $attr5_url=$orderbylastchange_url; $attr5_class=''; ?><?php $params = array(); $tmp_url = $attr5_url; -?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_text='GLOBAL_LASTCHANGE'; $attr6_escape=true; ?><?php +?><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_url);unset($attr5_class); ?><?php $attr6_class='text'; $attr6_key='GLOBAL_LASTCHANGE'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); + $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_text);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr3_list='object'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr3_list='object'; $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; diff --git a/themes/default/pages/html/folder/prop.tpl.php b/themes/default/pages/html/folder/prop.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/folder/select.tpl.php b/themes/default/pages/html/folder/select.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -155,13 +155,20 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> -<?php unset($attr3_title);unset($attr3_name);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php +<?php unset($attr3_title);unset($attr3_name);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php $attr4_class='headline'; ?><?php $attr4_tmp_class=''; + $attr4_tmp_class_list = explode(',',$attr4_classes); + $last_pos = array_search($attr4_last_class,$attr4_tmp_class_list); + if ( $last_pos === FALSE || $last_pos == count($attr4_tmp_class_list)-1) + $attr4_tmp_class = $attr4_tmp_class_list[0]; + else + $attr4_tmp_class = $attr4_tmp_class_list[++$last_pos]; + $attr4_tmp_class=$attr4_class; $attr4_last_class = $attr4_tmp_class; echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); -?><?php ?><?php $attr5_class='help'; ?><?php +?><?php unset($attr4_class); ?><?php $attr5_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -174,16 +181,16 @@ $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr5_class ?>" <?php -?>><?php unset($attr5_class); ?><?php $attr6_class='text'; $attr6_raw='_'; $attr6_escape=true; ?><?php +?>><?php unset($attr5_class); ?><?php $attr6_class='text'; $attr6_key='SELECT'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_','&nbsp;',$attr6_raw); + $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_raw);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='help'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></td><?php ?><?php $attr5_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -196,17 +203,16 @@ $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr5_class ?>" <?php -?>><?php unset($attr5_class); ?><?php $attr6_class='text'; $attr6_text='GLOBAL_TYPE'; $attr6_escape=true; ?><?php +?>><?php unset($attr5_class); ?><?php $attr6_class='text'; $attr6_key='GLOBAL_TYPE'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); + $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_text);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_raw='_/_'; $attr6_escape=true; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_raw='_/_'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php @@ -215,17 +221,16 @@ $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_NAME'; $attr6_escape=true; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_raw);unset($attr6_escape); ?><?php $attr6_class='text'; $attr6_key='GLOBAL_NAME'; $attr6_escape=true; ?><?php $attr6_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); + $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_text);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_list='object'; $attr4_extract=true; $attr4_key='list_key'; $attr4_value='list_value'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr6_class);unset($attr6_key);unset($attr6_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr4_list='object'; $attr4_extract=true; $attr4_key='list_key'; $attr4_value='list_value'; ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; $attr4_list_extract = $attr4_extract; diff --git a/themes/default/pages/html/folder/show.tpl.php b/themes/default/pages/html/folder/show.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_widths);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php $attr3_present='up_url'; ?><?php $attr3_tmp_exec = isset($$attr3_present); @@ -179,11 +179,18 @@ $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 +?></<?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 $attr3_class='headline'; ?><?php $attr3_tmp_class=''; + $attr3_tmp_class_list = explode(',',$attr3_classes); + $last_pos = array_search($attr3_last_class,$attr3_tmp_class_list); + if ( $last_pos === FALSE || $last_pos == count($attr3_tmp_class_list)-1) + $attr3_tmp_class = $attr3_tmp_class_list[0]; + else + $attr3_tmp_class = $attr3_tmp_class_list[++$last_pos]; + $attr3_tmp_class=$attr3_class; $attr3_last_class = $attr3_tmp_class; echo Html::open_tag('tr',array('class'=>$attr3_tmp_class)); -?><?php ?><?php $attr4_class='help'; ?><?php +?><?php unset($attr3_class); ?><?php $attr4_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -196,17 +203,16 @@ $attr4_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr4_class ?>" <?php -?>><?php unset($attr4_class); ?><?php $attr5_class='text'; $attr5_text='GLOBAL_TYPE'; $attr5_escape=true; ?><?php +?>><?php unset($attr4_class); ?><?php $attr5_class='text'; $attr5_key='GLOBAL_TYPE'; $attr5_escape=true; ?><?php $attr5_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr5_textvar); - $tmp_text = $langF($attr5_text); + $tmp_text = $langF($attr5_key); $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 +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_key);unset($attr5_escape); ?><?php $attr5_class='text'; $attr5_raw='_/_'; $attr5_escape=true; ?><?php $attr5_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php @@ -215,17 +221,16 @@ $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 +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_raw);unset($attr5_escape); ?><?php $attr5_class='text'; $attr5_key='GLOBAL_NAME'; $attr5_escape=true; ?><?php $attr5_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr5_textvar); - $tmp_text = $langF($attr5_text); + $tmp_text = $langF($attr5_key); $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 +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_key);unset($attr5_escape); ?><?php ?></td><?php ?><?php $attr4_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -238,17 +243,16 @@ $attr4_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr4_class ?>" <?php -?>><?php unset($attr4_class); ?><?php $attr5_class='text'; $attr5_text='GLOBAL_LASTCHANGE'; $attr5_escape=true; ?><?php +?>><?php unset($attr4_class); ?><?php $attr5_class='text'; $attr5_key='GLOBAL_LASTCHANGE'; $attr5_escape=true; ?><?php $attr5_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php $langF = $attr5_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr5_textvar); - $tmp_text = $langF($attr5_text); + $tmp_text = $langF($attr5_key); $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 +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_key);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 $attr3_list_tmp_key = $attr3_key; $attr3_list_tmp_value = $attr3_value; $attr3_list_extract = $attr3_extract; diff --git a/themes/default/pages/html/group/edit.tpl.php b/themes/default/pages/html/group/edit.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/group/remove.tpl.php b/themes/default/pages/html/group/remove.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; @@ -182,6 +182,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 ?><?php @@ -202,6 +203,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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -256,6 +258,7 @@ if ( $attr6_readonly && $checked ) $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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -283,6 +286,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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php diff --git a/themes/default/pages/html/group/rights.tpl.php b/themes/default/pages/html/group/rights.tpl.php @@ -212,6 +212,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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr4_not=true; $attr4_empty='acls'; ?><?php @@ -252,6 +253,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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_class='help'; ?><?php @@ -274,6 +276,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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_class='help'; ?><?php @@ -296,6 +299,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_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 @@ -337,6 +341,7 @@ ?><<?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_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 @@ -397,6 +402,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 ?><?php } ?><?php ?><?php $attr7_not=true; $attr7_present='username'; ?><?php @@ -422,6 +428,7 @@ ?><<?php echo $tmp_tag ?> class="<?php echo $attr9_class ?>" title="<?php echo $attr9_title ?>"><?php $langF = $attr9_escape?'langHtml':'lang'; $tmp_text = $langF($attr9_key); + $tmp_text = nl2br($tmp_text); 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 @@ -454,6 +461,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_title);unset($attr8_class);unset($attr8_var);unset($attr8_maxlength);unset($attr8_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php @@ -475,6 +483,7 @@ $langF = $attr7_escape?'langHtml':'lang'; $tmp_text = isset($$attr7_var)?$$attr7_var:'?unset:'.$attr7_var.'?'; $tmp_text = Text::maxLength( $tmp_text,intval($attr7_maxlength) ); + $tmp_text = nl2br($tmp_text); 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 diff --git a/themes/default/pages/html/index/applications.tpl.php b/themes/default/pages/html/index/applications.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_icon);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php ?><?php $attr3_tmp_class=''; @@ -166,6 +166,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('_','&nbsp;',$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 ?></a><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php $attr3_list='applications'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php @@ -212,6 +213,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 @@ -232,6 +234,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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/index/password.tpl.php b/themes/default/pages/html/index/password.tpl.php @@ -1,49 +1,51 @@ -<?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:4:{s:4:"name";s:0:"";s:6:"target";s:4:"_top";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?php $attr2 = array('name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_top' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_top'; $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; ?><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->isEditMode()) { ?> +<input type="hidden" name="mode" value="edit" /> +<?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($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:15:"GLOBAL_password";s:4:"name";s:5:"login";s:4:"icon";s:4:"user";s:6:"widths";s:7:"50%,50%";s:5:"width";s:3:"400";s:10:"rowclasses";s:7:"fx1,fx2";s:13:"columnclasses";s:3:"x,y";}' ?><?php $attr3 = array('title'=>'GLOBAL_password','name'=>'login','icon'=>'user','widths'=>'50%,50%','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr3_title='GLOBAL_password' ?><?php $attr3_name='login' ?><?php $attr3_icon='user' ?><?php $attr3_widths='50%,50%' ?><?php $attr3_width='400' ?><?php $attr3_rowclasses='fx1,fx2' ?><?php $attr3_columnclasses='x,y' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_title='GLOBAL_password'; $attr3_name='login'; $attr3_icon='user'; $attr3_widths='50%,50%'; $attr3_width='400'; $attr3_rowclasses='fx1,fx2'; $attr3_columnclasses='x,y'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -74,17 +76,22 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr><td class="menu">'; - if ( !empty($attr3_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr3_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>&nbsp;<strong>&raquo;</strong>&nbsp;'; 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 '&nbsp;&raquo;&nbsp;'; } - echo '<span class="title">'.lang($windowTitle).'</span>'; + echo '<span class="title">'.langHtml($windowTitle).'</span>'; ?> </td> <?php @@ -93,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>&nbsp;<?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>&nbsp;<?php } ?> </td>--> @@ -103,41 +110,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>&nbsp;&nbsp;&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?php } else { - ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php } } if (@$conf['help']['enabled'] ) { - ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('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> @@ -151,242 +158,133 @@ <?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:2:{s:5:"class";s:4:"logo";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'logo','colspan'=>'2') ?><?php $attr5_class='logo' ?><?php $attr5_colspan='2' ?><?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 $attr5_class='logo'; $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:1:{s:4:"name";s:8:"password";}' ?><?php $attr6 = array('name'=>'password') ?><?php $attr6_name='password' ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6) ?><?php unset($attr6_name) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?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:1:{s:5:"width";s:3:"50%";}' ?><?php $attr6 = array('width'=>'50%') ?><?php $attr6_width='50%' ?><?php + $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_name='password'; ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo langHtml('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo langHtml('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6_name); ?><?php ?></td><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:13:"USER_USERNAME";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'USER_USERNAME','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='USER_USERNAME' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $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)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_text='USER_USERNAME'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:1:{s:5:"width";s:3:"50%";}' ?><?php $attr6 = array('width'=>'50%') ?><?php $attr6_width='50%' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php $attr7_debug_info = 'a:9:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:8:"username";s:5:"value";s:0:"";s:4:"size";s:2:"30";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'username','value'=>'','size'=>'30','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='username' ?><?php $attr7_value='' ?><?php $attr7_size='30' ?><?php $attr7_maxlength='256' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if(!isset($attr7_default)) $attr7_default=''; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='username'; $attr7_value=''; $attr7_size='30'; $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=''; +?><?php if (!$attr7_readonly || $attr7_type=='hidden') { ?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?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 - } ?><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_default) ?><?php unset($attr7_type) ?><?php unset($attr7_name) ?><?php unset($attr7_value) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_onchange) ?><?php unset($attr7_readonly) ?><?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 $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:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?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_value);unset($attr7_size);unset($attr7_maxlength);unset($attr7_onchange);unset($attr7_readonly); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:15:"GLOBAL_DATABASE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_DATABASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_DATABASE' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $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)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_DATABASE'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:9:{s:4:"list";s:5:"dbids";s:4:"name";s:4:"dbid";s:7:"default";s:7:"actdbid";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";}' ?><?php $attr7 = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr7_list='dbids' ?><?php $attr7_name='dbid' ?><?php $attr7_default='actdbid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_addempty=false ?><?php $attr7_multiple=false ?><?php $attr7_size='1' ?><?php -if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_list; -?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_list='dbids'; $attr7_name='dbid'; $attr7_default='actdbid'; $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()) +{ + echo empty($$attr7_name)?'- '.lang('EMPTY').' -':$attr7_tmp_list[$$attr7_name]; +} +else +{ +if ( $attr7_addempty!==FALSE ) +{ + if ($attr7_addempty===TRUE) + $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_list; + else + $$attr7_list = array(''=>'- '.lang($attr7_addempty).' -')+$$attr7_list; +} +?><select<?php if ($attr7_readonly) echo ' disabled="disabled"' ?> id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php if (count($$attr7_list)<=1) echo ' disabled="disabled"'; if ($attr7_multiple) echo ' multiple="multiple"'; if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"'; echo ' size="'.intval($attr7_size).'"'; ?>><?php - $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; elseif ( isset($attr7_default) ) @@ -395,43 +293,55 @@ echo ' size="'.intval($attr7_size).'"'; $attr7_tmp_default = ''; foreach( $attr7_tmp_list as $box_key=>$box_value ) { - echo '<option class="'.$attr7_class.'" value="'.$box_key.'"'; + if ( is_array($box_value) ) + { + $box_key = $box_value['key' ]; + $box_title = $box_value['title']; + $box_value = $box_value['value']; + } + elseif( $attr7_lang ) + { + $box_title = lang( $box_value.'_DESC'); + $box_value = lang( $box_value ); + } + else + { + $box_title = ''; + } + echo '<option class="'.$attr7_class.'" value="'.$box_key.'" title="'.$box_title.'"'; if ($box_key==$attr7_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr7_list)==0) echo '<input type="hidden" name="'.$attr7_name.'" value="" />'; -if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" value="'.$box_key.'" />' -?><?php unset($attr7) ?><?php unset($attr7_list) ?><?php unset($attr7_name) ?><?php unset($attr7_default) ?><?php unset($attr7_onchange) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_addempty) ?><?php unset($attr7_multiple) ?><?php unset($attr7_size) ?><?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 $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:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr6 = array('class'=>'act','colspan'=>'2') ?><?php $attr6_class='act' ?><?php $attr6_colspan='2' ?><?php +if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" value="'.$box_key.'" />'; +} +?><?php unset($attr7_list);unset($attr7_name);unset($attr7_default);unset($attr7_onchange);unset($attr7_title);unset($attr7_class);unset($attr7_addempty);unset($attr7_multiple);unset($attr7_size);unset($attr7_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_class='act'; $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:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:11:"button_next";}' ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_next') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_next' ?><?php - if ($attr7_type=='ok') - $attr7_type = 'submit'; - if (isset($attr7_src)) - $attr7_type = 'image'; - else + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr6_class ?>" <?php +?> colspan="<?php echo $attr6_colspan ?>" <?php +?>><?php unset($attr6_class);unset($attr6_colspan); ?><?php $attr7_type='ok'; $attr7_class='ok'; $attr7_value='ok'; $attr7_text='button_next'; ?><?php + if ($this->isEditable() && !$this->isEditMode()) + $attr7_text = 'MODE_EDIT'; + $attr7_type = 'submit'; $attr7_src = ''; -?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5_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() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo langHtml($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php +?><?php unset($attr7_type);unset($attr7_class);unset($attr7_value);unset($attr7_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -443,12 +353,12 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_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:8:"username";}' ?><?php $attr2 = array('field'=>'username') ?><?php $attr2_field='username' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='username'; ?><?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/index/passwordinputcode.tpl.php b/themes/default/pages/html/index/passwordinputcode.tpl.php @@ -1,49 +1,51 @@ -<?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:4:{s:4:"name";s:0:"";s:6:"target";s:4:"_top";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?php $attr2 = array('name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_top' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_top'; $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; ?><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->isEditMode()) { ?> +<input type="hidden" name="mode" value="edit" /> +<?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3_debug_info = 'a:6:{s:4:"name";s:8:"password";s:4:"icon";s:4:"user";s:6:"widths";s:7:"50%,50%";s:5:"width";s:5:"400px";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:5:"1,2,3";}' ?><?php $attr3 = array('name'=>'password','icon'=>'user','widths'=>'50%,50%','width'=>'400px','rowclasses'=>'odd,even','columnclasses'=>'1,2,3') ?><?php $attr3_name='password' ?><?php $attr3_icon='user' ?><?php $attr3_widths='50%,50%' ?><?php $attr3_width='400px' ?><?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='password'; $attr3_icon='user'; $attr3_widths='50%,50%'; $attr3_width='400px'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -74,17 +76,22 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr><td class="menu">'; - if ( !empty($attr3_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr3_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>&nbsp;<strong>&raquo;</strong>&nbsp;'; 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 '&nbsp;&raquo;&nbsp;'; } - echo '<span class="title">'.lang($windowTitle).'</span>'; + echo '<span class="title">'.langHtml($windowTitle).'</span>'; ?> </td> <?php @@ -93,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>&nbsp;<?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>&nbsp;<?php } ?> </td>--> @@ -103,41 +110,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>&nbsp;&nbsp;&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?php } else { - ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php } } if (@$conf['help']['enabled'] ) { - ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('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> @@ -151,161 +158,95 @@ <?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_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:2:{s:5:"class";s:4:"logo";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'logo','colspan'=>'2') ?><?php $attr5_class='logo' ?><?php $attr5_colspan='2' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php 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 $attr5_class='logo'; $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:1:{s:4:"name";s:8:"password";}' ?><?php $attr6 = array('name'=>'password') ?><?php $attr6_name='password' ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6) ?><?php unset($attr6_name) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?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:0:{}' ?><?php $attr6 = array() ?><?php + $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_name='password'; ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo langHtml('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo langHtml('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6_name); ?><?php ?></td><?php ?><?php ?><?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; $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 $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:9:"mail_code";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'mail_code','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='mail_code' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); - else - $attr7_title = ''; - if (empty($attr7_type)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr7_class='text'; $attr7_text='mail_code'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_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($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 $attr7_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:"code";s:4:"size";s:2:"30";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'code','size'=>'30','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='code' ?><?php $attr7_size='30' ?><?php $attr7_maxlength='256' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if(!isset($attr7_default)) $attr7_default=''; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='code'; $attr7_size='30'; $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=''; +?><?php if (!$attr7_readonly || $attr7_type=='hidden') { ?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?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 - } ?><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_default) ?><?php unset($attr7_type) ?><?php unset($attr7_name) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_onchange) ?><?php unset($attr7_readonly) ?><?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 $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:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr6 = array('class'=>'act','colspan'=>'2') ?><?php $attr6_class='act' ?><?php $attr6_colspan='2' ?><?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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_class='act'; $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: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 $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_ok' ?><?php - if ($attr7_type=='ok') - $attr7_type = 'submit'; - if (isset($attr7_src)) - $attr7_type = 'image'; - else + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr6_class ?>" <?php +?> colspan="<?php echo $attr6_colspan ?>" <?php +?>><?php unset($attr6_class);unset($attr6_colspan); ?><?php $attr7_type='ok'; $attr7_class='ok'; $attr7_value='ok'; $attr7_text='button_ok'; ?><?php + if ($this->isEditable() && !$this->isEditMode()) + $attr7_text = 'MODE_EDIT'; + $attr7_type = 'submit'; $attr7_src = ''; -?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5_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() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo langHtml($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php +?><?php unset($attr7_type);unset($attr7_class);unset($attr7_value);unset($attr7_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -317,12 +258,12 @@ if ($attr7_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:"code";}' ?><?php $attr2 = array('field'=>'code') ?><?php $attr2_field='code' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='code'; ?><?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/index/projectmenu.tpl.php b/themes/default/pages/html/index/projectmenu.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_title);unset($attr2_name);unset($attr2_icon);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php ?><?php $attr3_tmp_class=''; @@ -335,7 +335,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr9_rowspan) ) $attr9_width=$column_widths[$cell_column_nr-1]; ?><td<?php -?>><?php ?><?php $attr10_type='ok'; $attr10_class='ok'; $attr10_value='ok'; $attr10_text='button_ok'; ?><?php +?>><?php ?><?php $attr10_type='ok'; $attr10_class='ok'; $attr10_value='ok'; $attr10_text=lang('start'); ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr10_text = 'MODE_EDIT'; $attr10_type = 'submit'; diff --git a/themes/default/pages/html/index/register.tpl.php b/themes/default/pages/html/index/register.tpl.php @@ -1,49 +1,51 @@ -<?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:4:{s:4:"name";s:0:"";s:6:"target";s:4:"_top";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?php $attr2 = array('name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_top' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_top'; $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; ?><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->isEditMode()) { ?> +<input type="hidden" name="mode" value="edit" /> +<?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3_debug_info = 'a:6:{s:5:"title";s:15:"GLOBAL_REGISTER";s:4:"name";s:5:"login";s:4:"icon";s:4:"user";s:5:"width";s:3:"400";s:10:"rowclasses";s:8:"odd,even";s:13:"columnclasses";s:1:"x";}' ?><?php $attr3 = array('title'=>'GLOBAL_REGISTER','name'=>'login','icon'=>'user','width'=>'400','rowclasses'=>'odd,even','columnclasses'=>'x') ?><?php $attr3_title='GLOBAL_REGISTER' ?><?php $attr3_name='login' ?><?php $attr3_icon='user' ?><?php $attr3_width='400' ?><?php $attr3_rowclasses='odd,even' ?><?php $attr3_columnclasses='x' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_title='GLOBAL_REGISTER'; $attr3_name='login'; $attr3_icon='user'; $attr3_width='400'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='x'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -74,17 +76,22 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr><td class="menu">'; - if ( !empty($attr3_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr3_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>&nbsp;<strong>&raquo;</strong>&nbsp;'; 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 '&nbsp;&raquo;&nbsp;'; } - echo '<span class="title">'.lang($windowTitle).'</span>'; + echo '<span class="title">'.langHtml($windowTitle).'</span>'; ?> </td> <?php @@ -93,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>&nbsp;<?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>&nbsp;<?php } ?> </td>--> @@ -103,41 +110,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>&nbsp;&nbsp;&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?php } else { - ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php } } if (@$conf['help']['enabled'] ) { - ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('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> @@ -151,161 +158,97 @@ <?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_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:"logo";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'logo','colspan'=>'2') ?><?php $attr5_class='logo' ?><?php $attr5_colspan='2' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_title);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 $attr5_class='logo'; $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:1:{s:4:"name";s:8:"register";}' ?><?php $attr6 = array('name'=>'register') ?><?php $attr6_name='register' ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6) ?><?php unset($attr6_name) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?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:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php + $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_name='register'; ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo langHtml('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo langHtml('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6_name); ?><?php ?></td><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:9:"USER_MAIL";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'USER_MAIL','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='USER_MAIL' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $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)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_text='USER_MAIL'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_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:"mail";s:4:"size";s:2:"25";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'mail','size'=>'25','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='mail' ?><?php $attr7_size='25' ?><?php $attr7_maxlength='256' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if(!isset($attr7_default)) $attr7_default=''; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='mail'; $attr7_size='25'; $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=''; +?><?php if (!$attr7_readonly || $attr7_type=='hidden') { ?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?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 - } ?><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_default) ?><?php unset($attr7_type) ?><?php unset($attr7_name) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_onchange) ?><?php unset($attr7_readonly) ?><?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 $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:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr6 = array('class'=>'act','colspan'=>'2') ?><?php $attr6_class='act' ?><?php $attr6_colspan='2' ?><?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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_class='act'; $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:4:{s:4:"type";s:2:"ok";s:5:"class";s:2:"ok";s:5:"value";s:2:"ok";s:4:"text";s:11:"button_next";}' ?><?php $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_next') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_next' ?><?php - if ($attr7_type=='ok') - $attr7_type = 'submit'; - if (isset($attr7_src)) - $attr7_type = 'image'; - else + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr6_class ?>" <?php +?> colspan="<?php echo $attr6_colspan ?>" <?php +?>><?php unset($attr6_class);unset($attr6_colspan); ?><?php $attr7_type='ok'; $attr7_class='ok'; $attr7_value='ok'; $attr7_text='button_next'; ?><?php + if ($this->isEditable() && !$this->isEditMode()) + $attr7_text = 'MODE_EDIT'; + $attr7_type = 'submit'; $attr7_src = ''; -?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5_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() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo langHtml($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php +?><?php unset($attr7_type);unset($attr7_class);unset($attr7_value);unset($attr7_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -317,12 +260,12 @@ if ($attr7_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:"mail";}' ?><?php $attr2 = array('field'=>'mail') ?><?php $attr2_field='mail' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='mail'; ?><?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/index/registeruserdata.tpl.php b/themes/default/pages/html/index/registeruserdata.tpl.php @@ -1,49 +1,51 @@ -<?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:4:{s:4:"name";s:0:"";s:6:"target";s:4:"_top";s:6:"method";s:4:"post";s:7:"enctype";s:33:"application/x-www-form-urlencoded";}' ?><?php $attr2 = array('name'=>'','target'=>'_top','method'=>'post','enctype'=>'application/x-www-form-urlencoded') ?><?php $attr2_name='' ?><?php $attr2_target='_top' ?><?php $attr2_method='post' ?><?php $attr2_enctype='application/x-www-form-urlencoded' ?><?php - if (empty($attr2_action)) +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_name=''; $attr2_target='_top'; $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; ?><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->isEditMode()) { ?> +<input type="hidden" name="mode" value="edit" /> +<?php } ?> <input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $attr2_action ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $attr2_subaction ?>" /> <input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $attr2_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($attr2) ?><?php unset($attr2_name) ?><?php unset($attr2_target) ?><?php unset($attr2_method) ?><?php unset($attr2_enctype) ?><?php $attr3_debug_info = 'a:6:{s:5:"title";s:15:"GLOBAL_REGISTER";s:4:"name";s:5:"login";s:4:"icon";s:4:"user";s:5:"width";s:3:"400";s:10:"rowclasses";s:7:"fx1,fx2";s:13:"columnclasses";s:3:"x,y";}' ?><?php $attr3 = array('title'=>'GLOBAL_REGISTER','name'=>'login','icon'=>'user','width'=>'400','rowclasses'=>'fx1,fx2','columnclasses'=>'x,y') ?><?php $attr3_title='GLOBAL_REGISTER' ?><?php $attr3_name='login' ?><?php $attr3_icon='user' ?><?php $attr3_width='400' ?><?php $attr3_rowclasses='fx1,fx2' ?><?php $attr3_columnclasses='x,y' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_title='GLOBAL_REGISTER'; $attr3_name='login'; $attr3_icon='user'; $attr3_width='400'; $attr3_rowclasses='fx1,fx2'; $attr3_columnclasses='x,y'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -74,17 +76,22 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr><td class="menu">'; - if ( !empty($attr3_icon) ) - echo '<img src="'.$image_dir.'icon_'.$attr3_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>&nbsp;<strong>&raquo;</strong>&nbsp;'; 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 '&nbsp;&raquo;&nbsp;'; } - echo '<span class="title">'.lang($windowTitle).'</span>'; + echo '<span class="title">'.langHtml($windowTitle).'</span>'; ?> </td> <?php @@ -93,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>&nbsp;<?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>&nbsp;<?php } ?> </td>--> @@ -103,41 +110,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>&nbsp;&nbsp;&nbsp;<?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>&nbsp;&nbsp;&nbsp;<?php } else { - ?><span class="menu_disabled" title="<?php echo lang($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php + ?><span class="menu_disabled" title="<?php echo langHtml($menu['text'].'_DESC') ?>" class="menu_disabled"><?php echo $tmp_text ?></span>&nbsp;&nbsp;&nbsp;<?php } } if (@$conf['help']['enabled'] ) { - ?><a href="<?php echo $conf['help']['url'].$actionName.'/'.$subActionName.@$conf['help']['suffix'] ?> " target="_new" title="<?php echo lang('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> @@ -151,448 +158,220 @@ <?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_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:"logo";s:7:"colspan";s:1:"2";}' ?><?php $attr5 = array('class'=>'logo','colspan'=>'2') ?><?php $attr5_class='logo' ?><?php $attr5_colspan='2' ?><?php + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_title);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 $attr5_class='logo'; $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:1:{s:4:"name";s:8:"register";}' ?><?php $attr6 = array('name'=>'register') ?><?php $attr6_name='register' ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo lang('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo lang('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6) ?><?php unset($attr6_name) ?><?php $attr4_debug_info = 'a:0:{}' ?><?php $attr4 = array() ?></td><?php unset($attr4) ?><?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:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php + $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_name='register'; ?><img src="<?php echo $image_dir.'logo_'.$attr6_name.IMG_ICON_EXT ?>" border="0" align="left"><h2 class="logo"><?php echo langHtml('logo_'.$attr6_name) ?></h2><p class="logo"><?php echo langHtml('logo_'.$attr6_name.'_text') ?></p><?php unset($attr6_name); ?><?php ?></td><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:18:"USER_REGISTER_CODE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'USER_REGISTER_CODE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='USER_REGISTER_CODE' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr7_title)) - if (!empty($attr7_key)) - $attr7_title = lang($attr7_key.'_HELP'); - else - $attr7_title = ''; - if (empty($attr7_type)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_text='USER_REGISTER_CODE'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_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:"code";s:4:"size";s:2:"25";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'code','size'=>'25','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='code' ?><?php $attr7_size='25' ?><?php $attr7_maxlength='256' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if(!isset($attr7_default)) $attr7_default=''; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='code'; $attr7_size='25'; $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=''; +?><?php if (!$attr7_readonly || $attr7_type=='hidden') { ?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?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 - } ?><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_default) ?><?php unset($attr7_type) ?><?php unset($attr7_name) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_onchange) ?><?php unset($attr7_readonly) ?><?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 $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:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:13:"USER_USERNAME";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'USER_USERNAME','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='USER_USERNAME' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $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)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_text='USER_USERNAME'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:9:{s:5:"class";s:0:"";s:7:"default";s:0:"";s:4:"type";s:4:"text";s:4:"name";s:8:"username";s:5:"value";s:0:"";s:4:"size";s:2:"25";s:9:"maxlength";s:3:"256";s:8:"onchange";s:0:"";s:8:"readonly";s:5:"false";}' ?><?php $attr7 = array('class'=>'','default'=>'','type'=>'text','name'=>'username','value'=>'','size'=>'25','maxlength'=>'256','onchange'=>'','readonly'=>false) ?><?php $attr7_class='' ?><?php $attr7_default='' ?><?php $attr7_type='text' ?><?php $attr7_name='username' ?><?php $attr7_value='' ?><?php $attr7_size='25' ?><?php $attr7_maxlength='256' ?><?php $attr7_onchange='' ?><?php $attr7_readonly=false ?><?php if(!isset($attr7_default)) $attr7_default=''; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_default=''; $attr7_type='text'; $attr7_name='username'; $attr7_value=''; $attr7_size='25'; $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=''; +?><?php if (!$attr7_readonly || $attr7_type=='hidden') { ?><input<?php if ($attr7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" name="<?php echo $attr7_name ?><?php if ($attr7_readonly) echo '_disabled' ?>" type="<?php echo $attr7_type ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?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 - } ?><?php unset($attr7) ?><?php unset($attr7_class) ?><?php unset($attr7_default) ?><?php unset($attr7_type) ?><?php unset($attr7_name) ?><?php unset($attr7_value) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php unset($attr7_onchange) ?><?php unset($attr7_readonly) ?><?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 $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:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?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_value);unset($attr7_size);unset($attr7_maxlength);unset($attr7_onchange);unset($attr7_readonly); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:13:"USER_PASSWORD";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'USER_PASSWORD','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='USER_PASSWORD' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $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)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_text='USER_PASSWORD'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:5:{s:4:"name";s:8:"password";s:7:"default";s:0:"";s:5:"class";s:0:"";s:4:"size";s:2:"25";s:9:"maxlength";s:3:"256";}' ?><?php $attr7 = array('name'=>'password','default'=>'','class'=>'','size'=>'25','maxlength'=>'256') ?><?php $attr7_name='password' ?><?php $attr7_default='' ?><?php $attr7_class='' ?><?php $attr7_size='25' ?><?php $attr7_maxlength='256' ?><input type="password" name="<?php echo $attr7_name ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php if (count($errors)==0) echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php unset($attr7) ?><?php unset($attr7_name) ?><?php unset($attr7_default) ?><?php unset($attr7_class) ?><?php unset($attr7_size) ?><?php unset($attr7_maxlength) ?><?php $attr5_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 $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:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_name='password'; $attr7_default=''; $attr7_class=''; $attr7_size='25'; $attr7_maxlength='256'; ?><input type="password" name="<?php echo $attr7_name ?>" size="<?php echo $attr7_size ?>" maxlength="<?php echo $attr7_maxlength ?>" class="<?php echo $attr7_class ?>" value="<?php if (count($errors)==0) echo isset($$attr7_name)?$$attr7_name:$attr7_default ?>" <?php if (in_array($attr7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php unset($attr7_name);unset($attr7_default);unset($attr7_class);unset($attr7_size);unset($attr7_maxlength); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:4:"text";s:15:"GLOBAL_DATABASE";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','text'=>'GLOBAL_DATABASE','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_text='GLOBAL_DATABASE' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $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)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_DATABASE'; $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 (!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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - if ( $attr7_escape && empty($attr7_raw) && $tmp_text!='&nbsp;' ) - $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); + $tmp_text = nl2br($tmp_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() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:2:{s:5:"width";s:3:"50%";s:5:"class";s:2:"fx";}' ?><?php $attr6 = array('width'=>'50%','class'=>'fx') ?><?php $attr6_width='50%' ?><?php $attr6_class='fx' ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_width='50%'; ?><?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_width) ?><?php unset($attr6_class) ?><?php $attr7_debug_info = 'a:9:{s:4:"list";s:5:"dbids";s:4:"name";s:4:"dbid";s:7:"default";s:7:"actdbid";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";}' ?><?php $attr7 = array('list'=>'dbids','name'=>'dbid','default'=>'actdbid','onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1') ?><?php $attr7_list='dbids' ?><?php $attr7_name='dbid' ?><?php $attr7_default='actdbid' ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_addempty=false ?><?php $attr7_multiple=false ?><?php $attr7_size='1' ?><?php -if ($attr7_addempty) $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_list; -?><select id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> width="<?php echo $attr6_width ?>"<?php +?>><?php unset($attr6_width); ?><?php $attr7_list='dbids'; $attr7_name='dbid'; $attr7_default='actdbid'; $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()) +{ + echo empty($$attr7_name)?'- '.lang('EMPTY').' -':$attr7_tmp_list[$$attr7_name]; +} +else +{ +if ( $attr7_addempty!==FALSE ) +{ + if ($attr7_addempty===TRUE) + $$attr7_list = array(''=>lang('LIST_ENTRY_EMPTY'))+$$attr7_list; + else + $$attr7_list = array(''=>'- '.lang($attr7_addempty).' -')+$$attr7_list; +} +?><select<?php if ($attr7_readonly) echo ' disabled="disabled"' ?> id="id_<?php echo $attr7_name ?>" name="<?php echo $attr7_name; if ($attr7_multiple) echo '[]'; ?>" onchange="<?php echo $attr7_onchange ?>" title="<?php echo $attr7_title ?>" class="<?php echo $attr7_class ?>"<?php if (count($$attr7_list)<=1) echo ' disabled="disabled"'; if ($attr7_multiple) echo ' multiple="multiple"'; if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"'; echo ' size="'.intval($attr7_size).'"'; ?>><?php - $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; elseif ( isset($attr7_default) ) @@ -601,43 +380,55 @@ echo ' size="'.intval($attr7_size).'"'; $attr7_tmp_default = ''; foreach( $attr7_tmp_list as $box_key=>$box_value ) { - echo '<option class="'.$attr7_class.'" value="'.$box_key.'"'; + if ( is_array($box_value) ) + { + $box_key = $box_value['key' ]; + $box_title = $box_value['title']; + $box_value = $box_value['value']; + } + elseif( $attr7_lang ) + { + $box_title = lang( $box_value.'_DESC'); + $box_value = lang( $box_value ); + } + else + { + $box_title = ''; + } + echo '<option class="'.$attr7_class.'" value="'.$box_key.'" title="'.$box_title.'"'; if ($box_key==$attr7_tmp_default) echo ' selected="selected"'; echo '>'.$box_value.'</option>'; } ?></select><?php if (count($$attr7_list)==0) echo '<input type="hidden" name="'.$attr7_name.'" value="" />'; -if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" value="'.$box_key.'" />' -?><?php unset($attr7) ?><?php unset($attr7_list) ?><?php unset($attr7_name) ?><?php unset($attr7_default) ?><?php unset($attr7_onchange) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_addempty) ?><?php unset($attr7_multiple) ?><?php unset($attr7_size) ?><?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 $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:3:"act";s:7:"colspan";s:1:"2";}' ?><?php $attr6 = array('class'=>'act','colspan'=>'2') ?><?php $attr6_class='act' ?><?php $attr6_colspan='2' ?><?php +if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" value="'.$box_key.'" />'; +} +?><?php unset($attr7_list);unset($attr7_name);unset($attr7_default);unset($attr7_onchange);unset($attr7_title);unset($attr7_class);unset($attr7_addempty);unset($attr7_multiple);unset($attr7_size);unset($attr7_lang); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php + $attr5_tmp_class=''; + $attr5_last_class = $attr5_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr5_tmp_class)); +?><?php ?><?php $attr6_class='act'; $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: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 $attr7 = array('type'=>'ok','class'=>'ok','value'=>'ok','text'=>'button_ok') ?><?php $attr7_type='ok' ?><?php $attr7_class='ok' ?><?php $attr7_value='ok' ?><?php $attr7_text='button_ok' ?><?php - if ($attr7_type=='ok') - $attr7_type = 'submit'; - if (isset($attr7_src)) - $attr7_type = 'image'; - else + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr6_class ?>" <?php +?> colspan="<?php echo $attr6_colspan ?>" <?php +?>><?php unset($attr6_class);unset($attr6_colspan); ?><?php $attr7_type='ok'; $attr7_class='ok'; $attr7_value='ok'; $attr7_text='button_ok'; ?><?php + if ($this->isEditable() && !$this->isEditMode()) + $attr7_text = 'MODE_EDIT'; + $attr7_type = 'submit'; $attr7_src = ''; -?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo lang($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php unset($attr7) ?><?php unset($attr7_type) ?><?php unset($attr7_class) ?><?php unset($attr7_value) ?><?php unset($attr7_text) ?><?php $attr5_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() ?></tr><?php unset($attr3) ?><?php $attr2_debug_info = 'a:0:{}' ?><?php $attr2 = array() ?> </table> +?><input type="<?php echo $attr7_type ?>"<?php if(isset($attr7_src)) { ?> src="<?php echo $image_dir.'icon_'.$attr7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $attr7_value ?>" class="<?php echo $attr7_class ?>" title="<?php echo lang($attr7_text.'_DESC') ?>" value="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo langHtml($attr7_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?php unset($attr7_src) ?><?php +?><?php unset($attr7_type);unset($attr7_class);unset($attr7_value);unset($attr7_text); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?></tr><?php ?><?php ?> </table> </td> </tr> </table> @@ -649,12 +440,12 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_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:"code";}' ?><?php $attr2 = array('field'=>'code') ?><?php $attr2_field='code' ?><?php +<?php ?><?php ?></form> +<?php ?><?php $attr2_field='code'; ?><?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/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -155,7 +155,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_icon);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php $attr4_present=@$conf['login']['logo']['file']; ?><?php $attr4_tmp_exec = isset($$attr4_present); diff --git a/themes/default/pages/html/language/edit.tpl.php b/themes/default/pages/html/language/edit.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/link/edit.tpl.php b/themes/default/pages/html/link/edit.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; @@ -203,6 +203,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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -268,6 +269,7 @@ if ($attr6_readonly) { $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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php diff --git a/themes/default/pages/html/link/prop.tpl.php b/themes/default/pages/html/link/prop.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > diff --git a/themes/default/pages/html/object/aclform.tpl.php b/themes/default/pages/html/object/aclform.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -221,6 +221,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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -241,6 +242,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('_','&nbsp;',$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 ?></tr><?php ?><?php ?><?php @@ -288,6 +290,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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -406,6 +409,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $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 ?></td><?php ?><?php ?><?php @@ -513,6 +517,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va ?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php $langF = $attr6_escape?'langHtml':'lang'; $tmp_text = str_replace('_','&nbsp;',$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 @@ -534,6 +539,7 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" va $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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -714,6 +720,7 @@ unset($attr6_tmp_last_exec) ?><?php ?><?php ?></td><?php ?><?php $attr6_cols ?><<?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_prefix);unset($attr8_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?><?php diff --git a/themes/default/pages/html/object/rights.tpl.php b/themes/default/pages/html/object/rights.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_title);unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php $attr4_empty='acls'; ?><?php if ( !isset($$attr4_empty) ) @@ -212,11 +212,18 @@ if ( $attr4_tmp_exec ) { ?> -<?php unset($attr4_not);unset($attr4_empty); ?><?php ?><?php +<?php unset($attr4_not);unset($attr4_empty); ?><?php $attr5_class='headline'; ?><?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 ?><?php $attr6_class='help'; ?><?php +?><?php unset($attr5_class); ?><?php $attr6_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -229,17 +236,16 @@ $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr6_class ?>" <?php -?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_NAME'; $attr7_escape=true; ?><?php +?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_key='GLOBAL_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 $langF = $attr7_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr7_textvar); - $tmp_text = $langF($attr7_text); + $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_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_class='help'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -252,17 +258,16 @@ $attr6_width=$column_widths[$cell_column_nr-1]; ?><td<?php ?> class="<?php echo $attr6_class ?>" <?php -?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_text='GLOBAL_LANGUAGE'; $attr7_escape=true; ?><?php +?>><?php unset($attr6_class); ?><?php $attr7_class='text'; $attr7_key='GLOBAL_LANGUAGE'; $attr7_escape=true; ?><?php $attr7_title = ''; $tmp_tag = 'span'; ?><<?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 = $langF($attr7_text); + $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_text);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_list='show'; $attr6_extract=false; $attr6_key='list_key'; $attr6_value='t'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_key);unset($attr7_escape); ?><?php ?></td><?php ?><?php $attr6_list='show'; $attr6_extract=false; $attr6_key='list_key'; $attr6_value='t'; ?><?php $attr6_list_tmp_key = $attr6_key; $attr6_list_tmp_value = $attr6_value; $attr6_list_extract = $attr6_extract; @@ -327,17 +332,16 @@ if ( $attr7_tmp_exec ) { ?> -<?php unset($attr7_true); ?><?php $attr8_class='text'; $attr8_text='global_delete'; $attr8_escape=true; ?><?php +<?php unset($attr7_true); ?><?php $attr8_class='text'; $attr8_key='global_delete'; $attr8_escape=true; ?><?php $attr8_title = ''; $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $attr8_class ?>" title="<?php echo $attr8_title ?>"><?php $langF = $attr8_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr8_textvar); - $tmp_text = $langF($attr8_text); + $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_text);unset($attr8_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr4_list='acls'; $attr4_extract=true; $attr4_key='aclid'; $attr4_value='acl'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr8_class);unset($attr8_key);unset($attr8_escape); ?><?php ?><?php } ?><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php $attr4_list='acls'; $attr4_extract=true; $attr4_key='aclid'; $attr4_value='acl'; ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; $attr4_list_extract = $attr4_extract; @@ -575,6 +579,23 @@ if ( $attr8_readonly && $checked ) $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 + $attr6_tmp_class=''; + $attr6_last_class = $attr6_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr6_tmp_class)); +?><?php ?><?php $attr7_colspan='15'; ?><?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; + 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 +?> colspan="<?php echo $attr7_colspan ?>" <?php ?>><?php unset($attr7_colspan); ?><?php $attr8_var='inherit'; $attr8_value='1'; ?><?php if (isset($attr8_key)) $$attr8_var = $attr8_value[$attr8_key]; diff --git a/themes/default/pages/html/page/changetemplate.tpl.php b/themes/default/pages/html/page/changetemplate.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -182,6 +182,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 ?><?php @@ -196,7 +197,7 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php -?>><?php ?><?php $attr6_title=''; $attr6_target='_self'; $attr6_url='template_url'; $attr6_class=''; ?><?php +?>><?php ?><?php $attr6_title=''; $attr6_target='cms_main'; $attr6_url=$template_url; $attr6_class=''; ?><?php $params = array(); $tmp_url = $attr6_url; ?><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 @@ -208,6 +209,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 ?></tr><?php ?><?php ?><?php @@ -233,6 +235,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 ?><?php @@ -318,7 +321,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><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 +?>><?php unset($attr5_class);unset($attr5_colspan); ?><?php $attr6_type='ok'; $attr6_class='ok'; $attr6_value='ok'; $attr6_text='button_next'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_text = 'MODE_EDIT'; $attr6_type = 'submit'; diff --git a/themes/default/pages/html/page/changetemplateselectelements.tpl.php b/themes/default/pages/html/page/changetemplateselectelements.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" /> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > <?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,14 +45,14 @@ <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:2:{s:4:"name";s:13:"newTemplateId";s:7:"default";s:13:"newTemplateId";}' ?><?php $attr3 = array('name'=>'newTemplateId','default'=>'newTemplateId') ?><?php $attr3_name='newTemplateId' ?><?php $attr3_default='newTemplateId' ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='newTemplateId'; $attr3_default='newTemplateId'; ?><?php if (isset($$attr3_name)) $attr3_tmp_value = $$attr3_name; elseif ( isset($attr3_default) ) $attr3_tmp_value = $attr3_default; else $attr3_tmp_value = ""; -?><input type="hidden" name="<?php echo $attr3_name ?>" value="<?php echo $attr3_tmp_value ?>" /><?php unset($attr3) ?><?php unset($attr3_name) ?><?php unset($attr3_default) ?><?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 +?><input type="hidden" name="<?php echo $attr3_name ?>" value="<?php echo $attr3_tmp_value ?>" /><?php unset($attr3_name);unset($attr3_default); ?><?php $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -96,9 +85,9 @@ else 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>&nbsp;<strong>&raquo;</strong>&nbsp;'; if ( !isset($path) || is_array($path) ) @@ -156,11 +145,11 @@ else <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 } ?> @@ -175,9 +164,9 @@ else </tr> <?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:4:{s:4:"list";s:8:"elements";s:7:"extract";s:4:"true";s:3:"key";s:8:"list_key";s:5:"value";s:10:"list_value";}' ?><?php $attr4 = array('list'=>'elements','extract'=>true,'key'=>'list_key','value'=>'list_value') ?><?php $attr4_list='elements' ?><?php $attr4_extract=true ?><?php $attr4_key='list_key' ?><?php $attr4_value='list_value' ?><?php + <td class="window"> + <table cellspacing="0" width="100%" cellpadding="4"> +<?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php $attr4_list='elements'; $attr4_extract=true; $attr4_key='list_key'; $attr4_value='list_value'; ?><?php $attr4_list_tmp_key = $attr4_key; $attr4_list_tmp_value = $attr4_value; $attr4_list_extract = $attr4_extract; @@ -196,105 +185,51 @@ else } extract($$attr4_list_tmp_value); } -?><?php unset($attr4) ?><?php unset($attr4_list) ?><?php unset($attr4_extract) ?><?php unset($attr4_key) ?><?php unset($attr4_value) ?><?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:0:{}' ?><?php $attr6 = array() ?><?php +?><?php unset($attr4_list);unset($attr4_extract);unset($attr4_key);unset($attr4_value); ?><?php ?><?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; $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 $attr7_debug_info = 'a:3:{s:5:"class";s:4:"text";s:3:"var";s:4:"name";s:6:"escape";s:4:"true";}' ?><?php $attr7 = array('class'=>'text','var'=>'name','escape'=>true) ?><?php $attr7_class='text' ?><?php $attr7_var='name' ?><?php $attr7_escape=true ?><?php - if ( isset($attr7_prefix)&& isset($attr7_key)) - $attr7_key = $attr7_prefix.$attr7_key; - if ( isset($attr7_suffix)&& isset($attr7_key)) - $attr7_key = $attr7_key.$attr7_suffix; - if(empty($attr7_title)) - $attr7_title = ''; - if (empty($attr7_type)) + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr7_class='text'; $attr7_var='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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - 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) ?><?php unset($attr7_class) ?><?php unset($attr7_var) ?><?php unset($attr7_escape) ?><?php $attr5_debug_info = 'a:0:{}' ?><?php $attr5 = array() ?></td><?php unset($attr5) ?><?php $attr6_debug_info = 'a:0:{}' ?><?php $attr6 = array() ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_var);unset($attr7_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($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 $attr7_debug_info = 'a:9:{s:4:"list";s:15:"newElementsList";s:4:"name";s:19:"var:newElementsName";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 $attr7 = array('list'=>'newElementsList','name'=>$newElementsName,'onchange'=>'','title'=>'','class'=>'','addempty'=>false,'multiple'=>false,'size'=>'1','lang'=>false) ?><?php $attr7_list='newElementsList' ?><?php $attr7_name=$newElementsName ?><?php $attr7_onchange='' ?><?php $attr7_title='' ?><?php $attr7_class='' ?><?php $attr7_addempty=false ?><?php $attr7_multiple=false ?><?php $attr7_size='1' ?><?php $attr7_lang=false ?><?php -if ($this->isEditable() && $this->getRequestVar('mode')!='edit') $attr7_readonly=true; + $attr6_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?>><?php ?><?php $attr7_list='newElementsList'; $attr7_name=$newElementsName; $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()) +{ + echo empty($$attr7_name)?'- '.lang('EMPTY').' -':$attr7_tmp_list[$$attr7_name]; +} +else +{ if ( $attr7_addempty!==FALSE ) { if ($attr7_addempty===TRUE) @@ -308,7 +243,6 @@ if ($attr7_multiple) echo ' multiple="multiple"'; if (in_array($attr7_name,$errors)) echo ' style="background-color:red; border:2px dashed red;"'; echo ' size="'.intval($attr7_size).'"'; ?>><?php - $attr7_tmp_list = $$attr7_list; if ( isset($$attr7_name) && isset($attr7_tmp_list[$$attr7_name]) ) $attr7_tmp_default = $$attr7_name; elseif ( isset($attr7_default) ) @@ -339,42 +273,33 @@ echo ' size="'.intval($attr7_size).'"'; } ?></select><?php if (count($$attr7_list)==0) echo '<input type="hidden" name="'.$attr7_name.'" value="" />'; -if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_name.'" value="'.$box_key.'" />' -?><?php unset($attr7) ?><?php unset($attr7_list) ?><?php unset($attr7_name) ?><?php unset($attr7_onchange) ?><?php unset($attr7_title) ?><?php unset($attr7_class) ?><?php unset($attr7_addempty) ?><?php unset($attr7_multiple) ?><?php unset($attr7_size) ?><?php unset($attr7_lang) ?><?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 +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 ?></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="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo langHtml($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?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> @@ -386,6 +311,6 @@ if (count($$attr7_list)==1) echo '<input type="hidden" name="'.$attr7_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/page/el.tpl.php b/themes/default/pages/html/page/el.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_title);unset($attr2_name);unset($attr2_widths);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php $attr3_not=''; $attr3_empty='el'; ?><?php if ( !isset($$attr3_empty) ) @@ -154,11 +154,18 @@ if ( $attr3_tmp_exec ) { ?> -<?php unset($attr3_not);unset($attr3_empty); ?><?php ?><?php +<?php unset($attr3_not);unset($attr3_empty); ?><?php $attr4_class='headline'; ?><?php $attr4_tmp_class=''; + $attr4_tmp_class_list = explode(',',$attr4_classes); + $last_pos = array_search($attr4_last_class,$attr4_tmp_class_list); + if ( $last_pos === FALSE || $last_pos == count($attr4_tmp_class_list)-1) + $attr4_tmp_class = $attr4_tmp_class_list[0]; + else + $attr4_tmp_class = $attr4_tmp_class_list[++$last_pos]; + $attr4_tmp_class=$attr4_class; $attr4_last_class = $attr4_tmp_class; echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); -?><?php ?><?php $attr5_class='help'; ?><?php +?><?php unset($attr4_class); ?><?php $attr5_class='help'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; diff --git a/themes/default/pages/html/page/prop.tpl.php b/themes/default/pages/html/page/prop.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_icon);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/page/pub.tpl.php b/themes/default/pages/html/page/pub.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -175,6 +175,22 @@ if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) $attr5_width=$column_widths[$cell_column_nr-1]; ?><td<?php +?>><?php ?><?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; + 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 ?>><?php ?><?php $attr6_default=false; $attr6_readonly=false; $attr6_name='files'; ?><?php if ($this->isEditable() && !$this->isEditMode()) $attr6_readonly=true; if ( isset($$attr6_name) ) @@ -186,26 +202,17 @@ 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_class='text'; $attr6_raw='_'; $attr6_escape=true; ?><?php - $attr6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_','&nbsp;',$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 - $attr6_title = ''; +?><?php unset($attr6_name); unset($attr6_readonly); unset($attr6_default); ?><?php unset($attr6_default);unset($attr6_readonly);unset($attr6_name); ?><?php $attr6_for='files'; ?><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_files'; $attr7_escape=true; ?><?php + $attr7_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $attr6_class ?>" title="<?php echo $attr6_title ?>"><?php - $langF = $attr6_escape?'langHtml':'lang'; - $tmp_text = $langF($$attr6_textvar); - $tmp_text = $langF($attr6_text); +?><<?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 = $langF($attr7_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 +?></<?php echo $tmp_tag ?>><?php unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?><br/><?php ?><?php ?><br/><?php ?><?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)); diff --git a/themes/default/pages/html/page/src.tpl.php b/themes/default/pages/html/page/src.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_icon);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php ?><?php $attr3_tmp_class=''; diff --git a/themes/default/pages/html/pageelement/archive.tpl.php b/themes/default/pages/html/pageelement/archive.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/pageelement/diff.tpl.php b/themes/default/pages/html/pageelement/diff.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/pageelement/edit.tpl.php b/themes/default/pages/html/pageelement/edit.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -171,7 +171,7 @@ if ($attr3_readonly) { </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/pageelement/prop.tpl.php b/themes/default/pages/html/pageelement/prop.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_icon);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/profile/edit.tpl.php b/themes/default/pages/html/profile/edit.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/profile/groups.tpl.php b/themes/default/pages/html/profile/groups.tpl.php @@ -181,6 +181,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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/profile/mail.tpl.php b/themes/default/pages/html/profile/mail.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; @@ -217,6 +217,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 ?><?php diff --git a/themes/default/pages/html/profile/settings.tpl.php b/themes/default/pages/html/profile/settings.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/project/add.tpl.php b/themes/default/pages/html/project/add.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_name);unset($attr3_icon);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; diff --git a/themes/default/pages/html/project/edit.tpl.php b/themes/default/pages/html/project/edit.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,12 +157,29 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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 $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; + 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 +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('NAME'); ?><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)) @@ -208,6 +225,23 @@ 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 + $column_class_idx++; + if ($column_class_idx > count($column_classes)) + $column_class_idx=1; + $column_class=$column_classes[$column_class_idx-1]; + if (empty($attr5_class)) + $attr5_class=$column_class; + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr5_rowspan) ) + $attr5_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('PUBLISH'); ?><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)) diff --git a/themes/default/pages/html/project/export.tpl.php b/themes/default/pages/html/project/export.tpl.php @@ -3,30 +3,30 @@ ?><!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" /> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > <?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(); @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_name);unset($attr3_icon);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -182,6 +182,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 ?></td><?php ?><?php $attr5_width='50%'; ?><?php diff --git a/themes/default/pages/html/project/listing.tpl.php b/themes/default/pages/html/project/listing.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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='el'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php $attr3_list_tmp_key = $attr3_key; diff --git a/themes/default/pages/html/project/maintenance.tpl.php b/themes/default/pages/html/project/maintenance.tpl.php @@ -3,30 +3,30 @@ ?><!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" /> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > <?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(); @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/project/remove.tpl.php b/themes/default/pages/html/project/remove.tpl.php @@ -3,30 +3,30 @@ ?><!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" /> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > <?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(); @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_name);unset($attr3_icon);unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php $attr4_tmp_class=''; @@ -182,6 +182,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 ?><?php @@ -202,6 +203,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 ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php @@ -256,6 +258,7 @@ if ( $attr6_readonly && $checked ) $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_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></label><?php ?><?php ?></td><?php ?><?php ?></tr><?php ?><?php ?><?php diff --git a/themes/default/pages/html/search/content.tpl.php b/themes/default/pages/html/search/content.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,12 +157,29 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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 $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; + 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 +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('global_user'); ?><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)) @@ -184,12 +201,13 @@ else $attr6_tmp_default = ''; ?><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 +<?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='lastchange_user'; $attr7_escape=true; ?><?php $attr7_title = ''; $tmp_tag = 'span'; ?><<?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 ?></label><?php ?><?php ?></td><?php ?><?php ?><?php @@ -261,6 +279,23 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va $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; + 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 +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('SEARCH_CONTENT'); ?><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)) @@ -288,6 +323,7 @@ if (count($$attr6_list)==1) echo '<input type="hidden" name="'.$attr6_name.'" va ?><<?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 ?></label><?php ?><?php ?></td><?php ?><?php ?><?php diff --git a/themes/default/pages/html/search/prop.tpl.php b/themes/default/pages/html/search/prop.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/search/result.tpl.php b/themes/default/pages/html/search/result.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -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 /* 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 +<?php /* Debug-Information */ if ($showDuration) { echo "<!--\n";print_r($this->templateVars);echo "\n-->";} ?><?php unset($attr1_class); ?><?php $attr2_icon='search'; $attr2_widths='70%,30%'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -138,9 +138,57 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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 +<?php unset($attr2_icon);unset($attr2_widths);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php ?><?php + $attr3_tmp_class=''; + $attr3_last_class = $attr3_tmp_class; + echo Html::open_tag('tr',array('class'=>$attr3_tmp_class)); +?><?php ?><?php $attr4_class='help'; ?><?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($attr4_class)) + $attr4_class=$column_class; + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) + $attr4_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr4_class ?>" <?php +?>><?php unset($attr4_class); ?><?php $attr5_class='text'; $attr5_key='GLOBAL_NAME'; $attr5_escape=true; ?><?php + $attr5_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php + $langF = $attr5_escape?'langHtml':'lang'; + $tmp_text = $langF($attr5_key); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_key);unset($attr5_escape); ?><?php ?></td><?php ?><?php $attr4_class='help'; ?><?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($attr4_class)) + $attr4_class=$column_class; + global $cell_column_nr; + $cell_column_nr++; + if ( isset($column_widths[$cell_column_nr-1]) && !isset($attr4_rowspan) ) + $attr4_width=$column_widths[$cell_column_nr-1]; +?><td<?php +?> class="<?php echo $attr4_class ?>" <?php +?>><?php unset($attr4_class); ?><?php $attr5_class='text'; $attr5_key='GLOBAL_LASTCHANGE'; $attr5_escape=true; ?><?php + $attr5_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $attr5_class ?>" title="<?php echo $attr5_title ?>"><?php + $langF = $attr5_escape?'langHtml':'lang'; + $tmp_text = $langF($attr5_key); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($attr5_class);unset($attr5_key);unset($attr5_escape); ?><?php ?></td><?php ?><?php ?></tr><?php ?><?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; @@ -159,11 +207,18 @@ } extract($$attr3_list_tmp_value); } -?><?php unset($attr3_list);unset($attr3_extract);unset($attr3_key);unset($attr3_value); ?><?php ?><?php +?><?php unset($attr3_list);unset($attr3_extract);unset($attr3_key);unset($attr3_value); ?><?php $attr4_class='data'; ?><?php $attr4_tmp_class=''; + $attr4_tmp_class_list = explode(',',$attr4_classes); + $last_pos = array_search($attr4_last_class,$attr4_tmp_class_list); + if ( $last_pos === FALSE || $last_pos == count($attr4_tmp_class_list)-1) + $attr4_tmp_class = $attr4_tmp_class_list[0]; + else + $attr4_tmp_class = $attr4_tmp_class_list[++$last_pos]; + $attr4_tmp_class=$attr4_class; $attr4_last_class = $attr4_tmp_class; echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); -?><?php ?><?php ?><?php +?><?php unset($attr4_class); ?><?php ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -181,15 +236,15 @@ ?><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 +?><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_var='name'; $attr7_escape=true; ?><?php $tmp_tag = 'span'; ?><<?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 = $langF($attr7_text); + $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_title);unset($attr7_class);unset($attr7_text);unset($attr7_escape); ?><?php ?></a><?php ?><?php ?></td><?php ?><?php ?><?php +?></<?php echo $tmp_tag ?>><?php unset($attr7_title);unset($attr7_class);unset($attr7_var);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; diff --git a/themes/default/pages/html/template/addel.tpl.php b/themes/default/pages/html/template/addel.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/template/el.tpl.php b/themes/default/pages/html/template/el.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_name);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php $attr3_list='el'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php $attr3_list_tmp_key = $attr3_key; diff --git a/themes/default/pages/html/template/extension.tpl.php b/themes/default/pages/html/template/extension.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; @@ -182,6 +182,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 ?><?php diff --git a/themes/default/pages/html/template/listing.tpl.php b/themes/default/pages/html/template/listing.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr2_name);unset($attr2_width);unset($attr2_rowclasses);unset($attr2_columnclasses); ?><?php $attr3_list='templates'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php $attr3_list_tmp_key = $attr3_key; diff --git a/themes/default/pages/html/template/name.tpl.php b/themes/default/pages/html/template/name.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/template/pages.tpl.php b/themes/default/pages/html/template/pages.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -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='pages'; $attr2_icon='template'; $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='pages'; $attr2_icon='template'; $attr2_width='93%'; $attr2_rowclasses='odd,even'; $attr2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr2_widths)) { @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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='pages'; $attr3_extract=false; $attr3_key='pageid'; $attr3_value='name'; ?><?php $attr3_list_tmp_key = $attr3_key; @@ -187,6 +187,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 ?></tr><?php ?><?php ?><?php } ?><?php ?><?php ?> </table> diff --git a/themes/default/pages/html/template/src.tpl.php b/themes/default/pages/html/template/src.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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=''; diff --git a/themes/default/pages/html/template/srcelement.tpl.php b/themes/default/pages/html/template/srcelement.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > @@ -157,7 +157,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> <?php unset($attr3_widths);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php $attr4_present='elements'; ?><?php $attr4_tmp_exec = isset($$attr4_present); diff --git a/themes/default/pages/html/title/show.tpl.php b/themes/default/pages/html/title/show.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > diff --git a/themes/default/pages/html/tree/show.tpl.php b/themes/default/pages/html/tree/show.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > diff --git a/themes/default/pages/html/treetitle/show.tpl.php b/themes/default/pages/html/treetitle/show.tpl.php @@ -3,7 +3,7 @@ ?><!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> + <title><?php echo isset($attr1_title)?$attr1_title.' - ':(isset($windowTitle)?langHtml($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" > diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php @@ -157,12 +157,29 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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; + 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 +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('NAME'); ?><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)) diff --git a/themes/default/pages/html/user/listing.tpl.php b/themes/default/pages/html/user/listing.tpl.php @@ -138,7 +138,7 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <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='el'; $attr3_extract=true; $attr3_key='list_key'; $attr3_value='list_value'; ?><?php $attr3_list_tmp_key = $attr3_key; diff --git a/themes/default/pages/html/user/remove.tpl.php b/themes/default/pages/html/user/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; @@ -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_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='GLOBAL_USER'; $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php +?><?php unset($attr2_name);unset($attr2_target);unset($attr2_method);unset($attr2_enctype); ?><?php $attr3_name='GLOBAL_USER'; $attr3_widths='30%,70%'; $attr3_width='93%'; $attr3_rowclasses='odd,even'; $attr3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); if (!empty($attr3_widths)) { @@ -160,9 +157,26 @@ </tr> <?php } ?> <tr> - <td> + <td class="window"> <table cellspacing="0" width="100%" cellpadding="4"> -<?php unset($attr3_name);unset($attr3_width);unset($attr3_rowclasses);unset($attr3_columnclasses); ?><?php ?><?php +<?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; + 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 +?> colspan="<?php echo $attr5_colspan ?>" <?php +?>><?php unset($attr5_colspan); ?><?php $attr6_title=lang('NAME'); ?><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)); @@ -178,80 +192,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='user_username'; $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('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = '&nbsp;'; - 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 @@ -266,87 +214,20 @@ 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)) +?>><?php ?><?php $attr6_class='name'; $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('_','&nbsp;',$attr6_raw); - elseif (!empty($attr6_value)) - $tmp_text = $attr6_value; - else - $tmp_text = '&nbsp;'; - 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 $attr4_tmp_class=''; $attr4_last_class = $attr4_tmp_class; echo Html::open_tag('tr',array('class'=>$attr4_tmp_class)); -?><?php ?><?php ?><?php +?><?php ?><?php $attr5_colspan='2'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -358,12 +239,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 ?></td><?php ?><?php ?><?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 $attr5_colspan='2'; ?><?php $column_class_idx++; if ($column_class_idx > count($column_classes)) $column_class_idx=1; @@ -375,12 +256,8 @@ 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_default=false; $attr6_readonly=false; $attr6_name='confirm'; ?><?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) ) $checked = $$attr6_name; @@ -392,74 +269,13 @@ 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='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('_','&nbsp;',$attr7_raw); - elseif (!empty($attr7_value)) - $tmp_text = $attr7_value; - else - $tmp_text = '&nbsp;'; - 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); + $tmp_text = nl2br($tmp_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 @@ -478,22 +294,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="&nbsp;&nbsp;&nbsp;&nbsp;<?php echo langHtml($attr6_text) ?>&nbsp;&nbsp;&nbsp;&nbsp;" /><?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>