commit 349ce6bc3e019d67f9874d5eac1eedf3190448d5 parent 01d4d30c036b121aa34535ab8617528d2c49d735 Author: dankert <devnull@localhost> Date: Sat, 27 Mar 2010 00:48:21 +0100 Alle Seiten umgewandelt. Diffstat:
97 files changed, 592 insertions(+), 1054 deletions(-)
diff --git a/themes/default/pages/html/element/name.tpl.php b/themes/default/pages/html/element/name.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_NAME';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/element/properties.tpl.php b/themes/default/pages/html/element/properties.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PREFS';$a3_widths='30%,70%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) @@ -636,6 +637,7 @@ if (count($$a7_list)==1) echo '<input type="hidden" name="'.$a7_name.'" value="' $a7_tmp_default = ''; foreach( $a7_tmp_list as $box_key=>$box_value ) { + $box_value = is_array($box_value)?(isset($box_value['lang'])?langHtml($box_value['lang']):$box_value['value']):$box_value; $id = 'id_'.$a7_name.'_'.$box_key; echo '<input id="'.$id.'" name="'.$a7_name.'" type="radio" class="'.$a7_class.'" value="'.$box_key.'"'; if ($box_key==$a7_tmp_default) diff --git a/themes/default/pages/html/element/remove.tpl.php b/themes/default/pages/html/element/remove.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/element/type.tpl.php b/themes/default/pages/html/element/type.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_NAME';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/compress.tpl.php b/themes/default/pages/html/file/compress.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='asdfdfs';$a3_name='asdf';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/edit.tpl.php b/themes/default/pages/html/file/edit.tpl.php @@ -60,6 +60,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_action,$a2_subaction,$a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='asdfdfs';$a3_name='asdf';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -78,7 +79,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -86,7 +87,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/extract.tpl.php b/themes/default/pages/html/file/extract.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='asdfdfs';$a3_name='asdf';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/prop.tpl.php b/themes/default/pages/html/file/prop.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_icon='folder';$a3_widths='40%,60%';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/pub.tpl.php b/themes/default/pages/html/file/pub.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/remove.tpl.php b/themes/default/pages/html/file/remove.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/size.tpl.php b/themes/default/pages/html/file/size.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_widths='5%,40%,55%';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/file/uncompress.tpl.php b/themes/default/pages/html/file/uncompress.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='asdfdfs';$a3_name='asdf';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/filemanager/browse.tpl.php b/themes/default/pages/html/filemanager/browse.tpl.php @@ -39,32 +39,52 @@ $row_classes = array(); $column_classes = array(); ?><table class="main" cellspacing="0px" width="100%" cellpadding="0px"> -<?php unset($a2_class,$a2_width,$a2_space,$a2_padding) ?><?php $a3_list='notices';$a3_extract=true;$a3_key='list_key';$a3_value='list_value'; ?><?php - $a3_list_tmp_key = $a3_key; - $a3_list_tmp_value = $a3_value; - $a3_list_extract = $a3_extract; - unset($a3_key); - unset($a3_value); - if ( !isset($$a3_list) || !is_array($$a3_list) ) - $$a3_list = array(); - foreach( $$a3_list as $$a3_list_tmp_key => $$a3_list_tmp_value ) +<?php unset($a2_class,$a2_width,$a2_space,$a2_padding) ?><?php + $row_idx++; + $column_idx = 0; +?> +<tr +> +<?php $a4_class='window'; ?><?php $column_idx++; ?><td +<?php if (!empty($column_widths)) { ?> + width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" +<?php } ?> + class="window" +><?php unset($a4_class) ?><?php $a5_width='100%';$a5_space='0px';$a5_padding='0px'; ?><?php + $last_row_idx = @$row_idx; + $last_column_idx = @$column_idx; + $row_idx = 0; + $column_idx = 0; + $coloumn_widths = array(); + $row_classes = array(); + $column_classes = array(); +?><table class="%class%" cellspacing="0px" width="100%" cellpadding="0px"> +<?php unset($a5_width,$a5_space,$a5_padding) ?><?php $a6_list='notices';$a6_extract=true;$a6_key='list_key';$a6_value='list_value'; ?><?php + $a6_list_tmp_key = $a6_key; + $a6_list_tmp_value = $a6_value; + $a6_list_extract = $a6_extract; + unset($a6_key); + unset($a6_value); + if ( !isset($$a6_list) || !is_array($$a6_list) ) + $$a6_list = array(); + foreach( $$a6_list as $$a6_list_tmp_key => $$a6_list_tmp_value ) { - if ( $a3_list_extract ) + if ( $a6_list_extract ) { - if ( !is_array($$a3_list_tmp_value) ) + if ( !is_array($$a6_list_tmp_value) ) { - print_r($$a3_list_tmp_value); - die( 'not an array at key: '.$$a3_list_tmp_key ); + print_r($$a6_list_tmp_value); + die( 'not an array at key: '.$$a6_list_tmp_key ); } - extract($$a3_list_tmp_value); + extract($$a6_list_tmp_value); } -?><?php unset($a3_list,$a3_extract,$a3_key,$a3_value) ?><?php +?><?php unset($a6_list,$a6_extract,$a6_key,$a6_value) ?><?php $row_idx++; $column_idx = 0; ?> <tr > -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td +<?php $a8_colspan='2'; ?><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> @@ -72,172 +92,172 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_class='text';$a6_key=$key;$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; +><?php unset($a8_colspan) ?><?php $a9_class='text';$a9_key=$key;$a9_escape=true;$a9_cut='both'; ?><?php + $a9_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = $langF($a6_key); +?><<?php echo $tmp_tag ?> class="<?php echo $a9_class ?>" title="<?php echo $a9_title ?>"><?php + $langF = $a9_escape?'langHtml':'lang'; + $tmp_text = $langF($a9_key); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_key,$a6_escape,$a6_cut) ?><br/></td></tr><?php } ?><?php $a3_present='up_url'; ?><?php - $a3_tmp_exec = isset($$a3_present); - $a3_tmp_last_exec = $a3_tmp_exec; - if ( $a3_tmp_exec ) +?></<?php echo $tmp_tag ?>><?php unset($a9_class,$a9_key,$a9_escape,$a9_cut) ?><br/></td></tr><?php } ?><?php $a6_present='up_url'; ?><?php + $a6_tmp_exec = isset($$a6_present); + $a6_tmp_last_exec = $a6_tmp_exec; + if ( $a6_tmp_exec ) { ?> -<?php unset($a3_present) ?><?php +<?php unset($a6_present) ?><?php $row_idx++; $column_idx = 0; ?> <tr > -<?php $a5_width='50%';$a5_colspan='8'; ?><?php $column_idx++; ?><td +<?php $a8_width='50%';$a8_colspan='8'; ?><?php $column_idx++; ?><td width="50%" <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="8" -><?php unset($a5_width,$a5_colspan) ?><?php $a6_title='';$a6_target='_self';$a6_url=$up_url;$a6_class=''; ?><?php +><?php unset($a8_width,$a8_colspan) ?><?php $a9_title='';$a9_target='_self';$a9_url=$up_url;$a9_class=''; ?><?php $params = array(); $tmp_url = ''; - $tmp_url = $a6_url; -?><a<?php if (isset($a6_name)) echo ' name="'.$a6_name.'"'; else echo ' href="'.$tmp_url.(isset($a6_anchor)?'#'.$a6_anchor:'').'"' ?> class="<?php echo $a6_class ?>" target="<?php echo $a6_target ?>"<?php if (isset($a6_accesskey)) echo ' accesskey="'.$a6_accesskey.'"' ?> title="<?php echo encodeHtml($a6_title) ?>"><?php unset($a6_title,$a6_target,$a6_url,$a6_class) ?><?php $a7_align='left';$a7_type='folder'; ?><?php - $a7_tmp_image_file = $image_dir.'icon_'.$a7_type.IMG_ICON_EXT; - $a7_size = '16x16'; - $a7_tmp_title = basename($a7_tmp_image_file); -?><img alt="<?php echo $a7_tmp_title; if (isset($a7_size)) { echo ' ('; list($a7_tmp_width,$a7_tmp_height)=explode('x',$a7_size);echo $a7_tmp_width.'x'.$a7_tmp_height; echo')';} ?>" src="<?php echo $a7_tmp_image_file ?>" border="0"<?php if(isset($a7_align)) echo ' align="'.$a7_align.'"' ?><?php if (isset($a7_size)) { list($a7_tmp_width,$a7_tmp_height)=explode('x',$a7_size);echo ' width="'.$a7_tmp_width.'" height="'.$a7_tmp_height.'"';} ?>><?php unset($a7_align,$a7_type) ?><?php $a7_class='text';$a7_raw='__.._____________________';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; + $tmp_url = $a9_url; +?><a<?php if (isset($a9_name)) echo ' name="'.$a9_name.'"'; else echo ' href="'.$tmp_url.(isset($a9_anchor)?'#'.$a9_anchor:'').'"' ?> class="<?php echo $a9_class ?>" target="<?php echo $a9_target ?>"<?php if (isset($a9_accesskey)) echo ' accesskey="'.$a9_accesskey.'"' ?> title="<?php echo encodeHtml($a9_title) ?>"><?php unset($a9_title,$a9_target,$a9_url,$a9_class) ?><?php $a10_align='left';$a10_type='folder'; ?><?php + $a10_tmp_image_file = $image_dir.'icon_'.$a10_type.IMG_ICON_EXT; + $a10_size = '16x16'; + $a10_tmp_title = basename($a10_tmp_image_file); +?><img alt="<?php echo $a10_tmp_title; if (isset($a10_size)) { echo ' ('; list($a10_tmp_width,$a10_tmp_height)=explode('x',$a10_size);echo $a10_tmp_width.'x'.$a10_tmp_height; echo')';} ?>" src="<?php echo $a10_tmp_image_file ?>" border="0"<?php if(isset($a10_align)) echo ' align="'.$a10_align.'"' ?><?php if (isset($a10_size)) { list($a10_tmp_width,$a10_tmp_height)=explode('x',$a10_size);echo ' width="'.$a10_tmp_width.'" height="'.$a10_tmp_height.'"';} ?>><?php unset($a10_align,$a10_type) ?><?php $a10_class='text';$a10_raw='__.._____________________';$a10_escape=true;$a10_cut='both'; ?><?php + $a10_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a7_raw); +?><<?php echo $tmp_tag ?> class="<?php echo $a10_class ?>" title="<?php echo $a10_title ?>"><?php + $langF = $a10_escape?'langHtml':'lang'; + $tmp_text = str_replace('_',' ',$a10_raw); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_raw,$a7_escape,$a7_cut) ?></a></td></tr><?php } ?><?php $a3_class='headline'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($a10_class,$a10_raw,$a10_escape,$a10_cut) ?></a></td></tr><?php } ?><?php $a6_class='headline'; ?><?php $row_idx++; $column_idx = 0; ?> <tr class="headline" > -<?php unset($a3_class) ?><?php $a4_class='help'; ?><?php $column_idx++; ?><td +<?php unset($a6_class) ?><?php $a7_class='help'; ?><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> class="help" -><?php unset($a4_class) ?><?php $a5_class='text';$a5_key='GLOBAL_TYPE';$a5_escape=true;$a5_cut='both'; ?><?php - $a5_title = ''; +><?php unset($a7_class) ?><?php $a8_class='text';$a8_key='GLOBAL_TYPE';$a8_escape=true;$a8_cut='both'; ?><?php + $a8_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a5_class ?>" title="<?php echo $a5_title ?>"><?php - $langF = $a5_escape?'langHtml':'lang'; - $tmp_text = $langF($a5_key); +?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php + $langF = $a8_escape?'langHtml':'lang'; + $tmp_text = $langF($a8_key); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a5_class,$a5_key,$a5_escape,$a5_cut) ?><?php $a5_class='text';$a5_raw='_/_';$a5_escape=true;$a5_cut='both'; ?><?php - $a5_title = ''; +?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_key,$a8_escape,$a8_cut) ?><?php $a8_class='text';$a8_raw='_/_';$a8_escape=true;$a8_cut='both'; ?><?php + $a8_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a5_class ?>" title="<?php echo $a5_title ?>"><?php - $langF = $a5_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a5_raw); +?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php + $langF = $a8_escape?'langHtml':'lang'; + $tmp_text = str_replace('_',' ',$a8_raw); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a5_class,$a5_raw,$a5_escape,$a5_cut) ?><?php $a5_class='text';$a5_key='GLOBAL_NAME';$a5_escape=true;$a5_cut='both'; ?><?php - $a5_title = ''; +?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_raw,$a8_escape,$a8_cut) ?><?php $a8_class='text';$a8_key='GLOBAL_NAME';$a8_escape=true;$a8_cut='both'; ?><?php + $a8_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a5_class ?>" title="<?php echo $a5_title ?>"><?php - $langF = $a5_escape?'langHtml':'lang'; - $tmp_text = $langF($a5_key); +?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php + $langF = $a8_escape?'langHtml':'lang'; + $tmp_text = $langF($a8_key); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a5_class,$a5_key,$a5_escape,$a5_cut) ?></td><?php $a4_class='help'; ?><?php $column_idx++; ?><td +?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_key,$a8_escape,$a8_cut) ?></td><?php $a7_class='help'; ?><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> class="help" -><?php unset($a4_class) ?><?php $a5_class='text';$a5_key='GLOBAL_LASTCHANGE';$a5_escape=true;$a5_cut='both'; ?><?php - $a5_title = ''; +><?php unset($a7_class) ?><?php $a8_class='text';$a8_key='GLOBAL_LASTCHANGE';$a8_escape=true;$a8_cut='both'; ?><?php + $a8_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a5_class ?>" title="<?php echo $a5_title ?>"><?php - $langF = $a5_escape?'langHtml':'lang'; - $tmp_text = $langF($a5_key); +?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php + $langF = $a8_escape?'langHtml':'lang'; + $tmp_text = $langF($a8_key); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a5_class,$a5_key,$a5_escape,$a5_cut) ?></td></tr><?php $a3_list='object';$a3_extract=true;$a3_key='list_key';$a3_value='list_value'; ?><?php - $a3_list_tmp_key = $a3_key; - $a3_list_tmp_value = $a3_value; - $a3_list_extract = $a3_extract; - unset($a3_key); - unset($a3_value); - if ( !isset($$a3_list) || !is_array($$a3_list) ) - $$a3_list = array(); - foreach( $$a3_list as $$a3_list_tmp_key => $$a3_list_tmp_value ) +?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_key,$a8_escape,$a8_cut) ?></td></tr><?php $a6_list='object';$a6_extract=true;$a6_key='list_key';$a6_value='list_value'; ?><?php + $a6_list_tmp_key = $a6_key; + $a6_list_tmp_value = $a6_value; + $a6_list_extract = $a6_extract; + unset($a6_key); + unset($a6_value); + if ( !isset($$a6_list) || !is_array($$a6_list) ) + $$a6_list = array(); + foreach( $$a6_list as $$a6_list_tmp_key => $$a6_list_tmp_value ) { - if ( $a3_list_extract ) + if ( $a6_list_extract ) { - if ( !is_array($$a3_list_tmp_value) ) + if ( !is_array($$a6_list_tmp_value) ) { - print_r($$a3_list_tmp_value); - die( 'not an array at key: '.$$a3_list_tmp_key ); + print_r($$a6_list_tmp_value); + die( 'not an array at key: '.$$a6_list_tmp_key ); } - extract($$a3_list_tmp_value); + extract($$a6_list_tmp_value); } -?><?php unset($a3_list,$a3_extract,$a3_key,$a3_value) ?><?php $a4_class='data'; ?><?php +?><?php unset($a6_list,$a6_extract,$a6_key,$a6_value) ?><?php $a7_class='data'; ?><?php $row_idx++; $column_idx = 0; ?> <tr class="data" > -<?php unset($a4_class) ?><?php $column_idx++; ?><td +<?php unset($a7_class) ?><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> -><?php $a6_title=$desc;$a6_target='_self';$a6_url=$url;$a6_class=$class; ?><?php +><?php $a9_title=$desc;$a9_target='_self';$a9_url=$url;$a9_class=$class; ?><?php $params = array(); $tmp_url = ''; - $tmp_url = $a6_url; -?><a<?php if (isset($a6_name)) echo ' name="'.$a6_name.'"'; else echo ' href="'.$tmp_url.(isset($a6_anchor)?'#'.$a6_anchor:'').'"' ?> class="<?php echo $a6_class ?>" target="<?php echo $a6_target ?>"<?php if (isset($a6_accesskey)) echo ' accesskey="'.$a6_accesskey.'"' ?> title="<?php echo encodeHtml($a6_title) ?>"><?php unset($a6_title,$a6_target,$a6_url,$a6_class) ?><?php $a7_align='left';$a7_type=$icon; ?><?php - $a7_tmp_image_file = $image_dir.'icon_'.$a7_type.IMG_ICON_EXT; - $a7_size = '16x16'; - $a7_tmp_title = basename($a7_tmp_image_file); -?><img alt="<?php echo $a7_tmp_title; if (isset($a7_size)) { echo ' ('; list($a7_tmp_width,$a7_tmp_height)=explode('x',$a7_size);echo $a7_tmp_width.'x'.$a7_tmp_height; echo')';} ?>" src="<?php echo $a7_tmp_image_file ?>" border="0"<?php if(isset($a7_align)) echo ' align="'.$a7_align.'"' ?><?php if (isset($a7_size)) { list($a7_tmp_width,$a7_tmp_height)=explode('x',$a7_size);echo ' width="'.$a7_tmp_width.'" height="'.$a7_tmp_height.'"';} ?>><?php unset($a7_align,$a7_type) ?><?php $a7_class='text';$a7_var='name';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; + $tmp_url = $a9_url; +?><a<?php if (isset($a9_name)) echo ' name="'.$a9_name.'"'; else echo ' href="'.$tmp_url.(isset($a9_anchor)?'#'.$a9_anchor:'').'"' ?> class="<?php echo $a9_class ?>" target="<?php echo $a9_target ?>"<?php if (isset($a9_accesskey)) echo ' accesskey="'.$a9_accesskey.'"' ?> title="<?php echo encodeHtml($a9_title) ?>"><?php unset($a9_title,$a9_target,$a9_url,$a9_class) ?><?php $a10_align='left';$a10_type=$icon; ?><?php + $a10_tmp_image_file = $image_dir.'icon_'.$a10_type.IMG_ICON_EXT; + $a10_size = '16x16'; + $a10_tmp_title = basename($a10_tmp_image_file); +?><img alt="<?php echo $a10_tmp_title; if (isset($a10_size)) { echo ' ('; list($a10_tmp_width,$a10_tmp_height)=explode('x',$a10_size);echo $a10_tmp_width.'x'.$a10_tmp_height; echo')';} ?>" src="<?php echo $a10_tmp_image_file ?>" border="0"<?php if(isset($a10_align)) echo ' align="'.$a10_align.'"' ?><?php if (isset($a10_size)) { list($a10_tmp_width,$a10_tmp_height)=explode('x',$a10_size);echo ' width="'.$a10_tmp_width.'" height="'.$a10_tmp_height.'"';} ?>><?php unset($a10_align,$a10_type) ?><?php $a10_class='text';$a10_var='name';$a10_escape=true;$a10_cut='both'; ?><?php + $a10_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = isset($$a7_var)?$$a7_var:$langF('UNKNOWN'); +?><<?php echo $tmp_tag ?> class="<?php echo $a10_class ?>" title="<?php echo $a10_title ?>"><?php + $langF = $a10_escape?'langHtml':'lang'; + $tmp_text = isset($$a10_var)?$$a10_var:$langF('UNKNOWN'); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_var,$a7_escape,$a7_cut) ?><?php $a7_class='text';$a7_raw='_';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; +?></<?php echo $tmp_tag ?>><?php unset($a10_class,$a10_var,$a10_escape,$a10_cut) ?><?php $a10_class='text';$a10_raw='_';$a10_escape=true;$a10_cut='both'; ?><?php + $a10_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a7_raw); +?><<?php echo $tmp_tag ?> class="<?php echo $a10_class ?>" title="<?php echo $a10_title ?>"><?php + $langF = $a10_escape?'langHtml':'lang'; + $tmp_text = str_replace('_',' ',$a10_raw); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_raw,$a7_escape,$a7_cut) ?></a></td><?php $column_idx++; ?><td +?></<?php echo $tmp_tag ?>><?php unset($a10_class,$a10_raw,$a10_escape,$a10_cut) ?></a></td><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> <?php if (!empty($column_classes)) { ?> class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> -><?php $a6_date=$date; ?><?php +><?php $a9_date=$date; ?><?php global $conf; - $time = $a6_date; + $time = $a9_date; if ( isset($_COOKIE['or_timezone_offset']) ) { $time -= (int)date('Z'); @@ -296,26 +316,26 @@ echo $jahre.' '.lang('GLOBAL_YEARS'); echo '</span>'; } -?><?php unset($a6_date) ?></td></tr><?php } ?><?php $a3_empty='object'; ?><?php - if ( !isset($$a3_empty) ) - $a3_tmp_exec = empty($a3_empty); - elseif ( is_array($$a3_empty) ) - $a3_tmp_exec = (count($$a3_empty)==0); - elseif ( is_bool($$a3_empty) ) - $a3_tmp_exec = true; +?><?php unset($a9_date) ?></td></tr><?php } ?><?php $a6_empty='object'; ?><?php + if ( !isset($$a6_empty) ) + $a6_tmp_exec = empty($a6_empty); + elseif ( is_array($$a6_empty) ) + $a6_tmp_exec = (count($$a6_empty)==0); + elseif ( is_bool($$a6_empty) ) + $a6_tmp_exec = true; else - $a3_tmp_exec = empty( $$a3_empty ); - $a3_tmp_last_exec = $a3_tmp_exec; - if ( $a3_tmp_exec ) + $a6_tmp_exec = empty( $$a6_empty ); + $a6_tmp_last_exec = $a6_tmp_exec; + if ( $a6_tmp_exec ) { ?> -<?php unset($a3_empty) ?><?php +<?php unset($a6_empty) ?><?php $row_idx++; $column_idx = 0; ?> <tr > -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td +<?php $a8_colspan='2'; ?><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> @@ -323,194 +343,167 @@ class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" <?php } ?> colspan="2" -><?php unset($a5_colspan) ?><?php $a6_class='text';$a6_text='GLOBAL_NOT_FOUND';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; +><?php unset($a8_colspan) ?><?php $a9_class='text';$a9_text='GLOBAL_NOT_FOUND';$a9_escape=true;$a9_cut='both'; ?><?php + $a9_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = $langF($a6_text); +?><<?php echo $tmp_tag ?> class="<?php echo $a9_class ?>" title="<?php echo $a9_title ?>"><?php + $langF = $a9_escape?'langHtml':'lang'; + $tmp_text = $langF($a9_text); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_text,$a6_escape,$a6_cut) ?></td></tr><?php } ?><?php $a3_true=$writable; ?><?php - if (gettype($a3_true) === '' && gettype($a3_true) === '1') - $a3_tmp_exec = $$a3_true == true; +?></<?php echo $tmp_tag ?>><?php unset($a9_class,$a9_text,$a9_escape,$a9_cut) ?></td></tr><?php } ?><?php $a6_true=$writable; ?><?php + if (gettype($a6_true) === '' && gettype($a6_true) === '1') + $a6_tmp_exec = $$a6_true == true; else - $a3_tmp_exec = $a3_true == true; - $a3_tmp_last_exec = $a3_tmp_exec; - if ( $a3_tmp_exec ) + $a6_tmp_exec = $a6_true == true; + $a6_tmp_last_exec = $a6_tmp_exec; + if ( $a6_tmp_exec ) { ?> -<?php unset($a3_true) ?><?php +<?php unset($a6_true) ?><?php $row_idx++; $column_idx = 0; ?> <tr > -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td +<?php $a8_class='act'; ?><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a5_colspan) ?><br/><br/><?php $a6_title=lang('file'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a5_colspan) ?><?php $a6_action='filemanager';$a6_subaction='upload';$a6_id=$id;$a6_name='';$a6_target='_self';$a6_method='post';$a6_enctype='multipart/form-data'; ?><?php + class="act" +><?php unset($a8_class) ?><br/><?php $a9_action='filemanager';$a9_subaction='upload';$a9_id=$id;$a9_name='';$a9_target='_self';$a9_method='post';$a9_enctype='multipart/form-data'; ?><?php if ($this->isEditable()) { if ($this->isEditMode()) { - $a6_method = 'POST'; + $a9_method = 'POST'; } else { - $a6_method = 'GET'; - $a6_subaction = $subActionName; + $a9_method = 'GET'; + $a9_subaction = $subActionName; } } -?><form name="<?php echo $a6_name ?>" - target="<?php echo $a6_target ?>" - action="<?php echo Html::url( $a6_action,$a6_subaction,$a6_id ) ?>" - method="<?php echo $a6_method ?>" - enctype="<?php echo $a6_enctype ?>" style="margin:0px;padding:0px;"> +?><form name="<?php echo $a9_name ?>" + target="<?php echo $a9_target ?>" + action="<?php echo Html::url( $a9_action,$a9_subaction,$a9_id ) ?>" + method="<?php echo $a9_method ?>" + enctype="<?php echo $a9_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_TOKEN ?>" value="<?php echo token() ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $a6_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $a6_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $a6_id ?>" /><?php +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $a9_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $a9_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $a9_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($a6_action,$a6_subaction,$a6_id,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_name='CKEditorFuncNum'; ?><?php -if (isset($$a7_name)) - $a7_tmp_value = $$a7_name; -elseif ( isset($a7_default) ) - $a7_tmp_value = $a7_default; +?><?php unset($a9_action,$a9_subaction,$a9_id,$a9_name,$a9_target,$a9_method,$a9_enctype) ?><?php $a10_name='CKEditorFuncNum'; ?><?php +if (isset($$a10_name)) + $a10_tmp_value = $$a10_name; +elseif ( isset($a10_default) ) + $a10_tmp_value = $a10_default; else - $a7_tmp_value = ""; -?><input type="hidden" name="<?php echo $a7_name ?>" value="<?php echo $a7_tmp_value ?>" /><?php unset($a7_name) ?><?php $a7_name='file';$a7_class='upload';$a7_size='40'; ?><input size="<?php echo $a7_size ?>" id="id_<?php echo $a7_name ?>" type="file" <?php if (isset($a7_maxlength))echo ' maxlength="'.$a7_maxlength.'"' ?> name="<?php echo $a7_name ?>" class="<?php echo $a7_class ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php unset($a7_name,$a7_class,$a7_size) ?><?php $a7_type='ok';$a7_class='ok';$a7_value='ok';$a7_text='add'; ?><?php + $a10_tmp_value = ""; +?><input type="hidden" name="<?php echo $a10_name ?>" value="<?php echo $a10_tmp_value ?>" /><?php unset($a10_name) ?><?php $a10_class='text';$a10_key='file';$a10_escape=true;$a10_cut='both'; ?><?php + $a10_title = ''; + $tmp_tag = 'span'; +?><<?php echo $tmp_tag ?> class="<?php echo $a10_class ?>" title="<?php echo $a10_title ?>"><?php + $langF = $a10_escape?'langHtml':'lang'; + $tmp_text = $langF($a10_key); + $tmp_text = nl2br($tmp_text); + echo $tmp_text; + unset($tmp_text); +?></<?php echo $tmp_tag ?>><?php unset($a10_class,$a10_key,$a10_escape,$a10_cut) ?><?php $a10_name='file';$a10_class='upload';$a10_size='40'; ?><input size="<?php echo $a10_size ?>" id="id_<?php echo $a10_name ?>" type="file" <?php if (isset($a10_maxlength))echo ' maxlength="'.$a10_maxlength.'"' ?> name="<?php echo $a10_name ?>" class="<?php echo $a10_class ?>" <?php if (in_array($a10_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php unset($a10_name,$a10_class,$a10_size) ?><br/><?php $a10_type='ok';$a10_class='ok';$a10_value='ok';$a10_text='add'; ?><?php if ($this->isEditable() && !$this->isEditMode()) - $a7_text = 'MODE_EDIT'; - $a7_type = 'submit'; + $a10_text = 'MODE_EDIT'; + $a10_type = 'submit'; if ( $this->isEditable() && readonly() ) - $a7_type = ''; // Knopf nicht anzeigen - $a7_src = ''; - if ( !empty($a7_type) ) { -?><input type="<?php echo $a7_type ?>"<?php if(isset($a7_src)) { ?> src="<?php echo $image_dir.'icon_'.$a7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $a7_value ?>" class="ok" title="<?php echo lang($a7_text.'_DESC') ?>" value=" <?php echo langHtml($a7_text) ?> " /><?php unset($a7_src) + $a10_type = ''; // Knopf nicht anzeigen + $a10_src = ''; + if ( !empty($a10_type) ) { +?><input type="<?php echo $a10_type ?>"<?php if(isset($a10_src)) { ?> src="<?php echo $image_dir.'icon_'.$a10_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $a10_value ?>" class="ok" title="<?php echo lang($a10_text.'_DESC') ?>" value=" <?php echo langHtml($a10_text) ?> " /><?php unset($a10_src) ?><?php } -?><?php unset($a7_type,$a7_class,$a7_value,$a7_text) ?></form> -</td></tr><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td +?><?php unset($a10_type,$a10_class,$a10_value,$a10_text) ?></form> +</td><?php $a8_class='act'; ?><?php $column_idx++; ?><td <?php if (!empty($column_widths)) { ?> width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" <?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a5_colspan) ?><br/><br/><?php $a6_title=lang('folder'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a5_colspan) ?><?php $a6_var='name';$a6_value=''; ?><?php - if (isset($a6_key)) - $$a6_var = $a6_value[$a6_key]; + class="act" +><?php unset($a8_class) ?><?php $a9_var='name';$a9_value=''; ?><?php + if (isset($a9_key)) + $$a9_var = $a9_value[$a9_key]; else - $$a6_var = $a6_value; -?><?php unset($a6_var,$a6_value) ?><?php $a6_action='filemanager';$a6_subaction='addfolder';$a6_id=$id;$a6_name='';$a6_target='_self';$a6_method='post';$a6_enctype='application/x-www-form-urlencoded'; ?><?php + $$a9_var = $a9_value; +?><?php unset($a9_var,$a9_value) ?><?php $a9_action='filemanager';$a9_subaction='addfolder';$a9_id=$id;$a9_name='';$a9_target='_self';$a9_method='post';$a9_enctype='application/x-www-form-urlencoded'; ?><?php if ($this->isEditable()) { if ($this->isEditMode()) { - $a6_method = 'POST'; + $a9_method = 'POST'; } else { - $a6_method = 'GET'; - $a6_subaction = $subActionName; + $a9_method = 'GET'; + $a9_subaction = $subActionName; } } -?><form name="<?php echo $a6_name ?>" - target="<?php echo $a6_target ?>" - action="<?php echo Html::url( $a6_action,$a6_subaction,$a6_id ) ?>" - method="<?php echo $a6_method ?>" - enctype="<?php echo $a6_enctype ?>" style="margin:0px;padding:0px;"> +?><form name="<?php echo $a9_name ?>" + target="<?php echo $a9_target ?>" + action="<?php echo Html::url( $a9_action,$a9_subaction,$a9_id ) ?>" + method="<?php echo $a9_method ?>" + enctype="<?php echo $a9_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_TOKEN ?>" value="<?php echo token() ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $a6_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $a6_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $a6_id ?>" /><?php +<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $a9_action ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $a9_subaction ?>" /> +<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $a9_id ?>" /><?php if ( $conf['interface']['url_sessionid'] ) echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($a6_action,$a6_subaction,$a6_id,$a6_name,$a6_target,$a6_method,$a6_enctype) ?><?php $a7_name='CKEditorFuncNum'; ?><?php -if (isset($$a7_name)) - $a7_tmp_value = $$a7_name; -elseif ( isset($a7_default) ) - $a7_tmp_value = $a7_default; +?><?php unset($a9_action,$a9_subaction,$a9_id,$a9_name,$a9_target,$a9_method,$a9_enctype) ?><?php $a10_name='CKEditorFuncNum'; ?><?php +if (isset($$a10_name)) + $a10_tmp_value = $$a10_name; +elseif ( isset($a10_default) ) + $a10_tmp_value = $a10_default; else - $a7_tmp_value = ""; -?><input type="hidden" name="<?php echo $a7_name ?>" value="<?php echo $a7_tmp_value ?>" /><?php unset($a7_name) ?><?php $a7_class='text';$a7_key='name';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; + $a10_tmp_value = ""; +?><input type="hidden" name="<?php echo $a10_name ?>" value="<?php echo $a10_tmp_value ?>" /><?php unset($a10_name) ?><?php $a10_class='text';$a10_key='name';$a10_escape=true;$a10_cut='both'; ?><?php + $a10_title = ''; $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = $langF($a7_key); +?><<?php echo $tmp_tag ?> class="<?php echo $a10_class ?>" title="<?php echo $a10_title ?>"><?php + $langF = $a10_escape?'langHtml':'lang'; + $tmp_text = $langF($a10_key); $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_key,$a7_escape,$a7_cut) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='name';$a7_size='40';$a7_maxlength='256';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; - if(!isset($a7_default)) $a7_default=''; -?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php -if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_type='ok';$a7_class='ok';$a7_value='ok';$a7_text='add'; ?><?php +?></<?php echo $tmp_tag ?>><?php unset($a10_class,$a10_key,$a10_escape,$a10_cut) ?><?php $a10_class='text';$a10_default='';$a10_type='text';$a10_name='name';$a10_size='40';$a10_maxlength='256';$a10_onchange='';$a10_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a10_readonly=true; + if ($a10_readonly && empty($$a10_name)) $$a10_name = '- '.lang('EMPTY').' -'; + if(!isset($a10_default)) $a10_default=''; +?><?php if (!$a10_readonly || $a10_type=='hidden') { +?><input<?php if ($a10_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a10_name ?><?php if ($a10_readonly) echo '_disabled' ?>" name="<?php echo $a10_name ?><?php if ($a10_readonly) echo '_disabled' ?>" type="<?php echo $a10_type ?>" size="<?php echo $a10_size ?>" maxlength="<?php echo $a10_maxlength ?>" class="<?php echo $a10_class ?>" value="<?php echo isset($$a10_name)?$$a10_name:$a10_default ?>" <?php if (in_array($a10_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +if ($a10_readonly) { +?><input type="hidden" id="id_<?php echo $a10_name ?>" name="<?php echo $a10_name ?>" value="<?php echo isset($$a10_name)?$$a10_name:$a10_default ?>" /><?php + } } else { ?><span class="<?php echo $a10_class ?>"><?php echo isset($$a10_name)?$$a10_name:$a10_default ?></span><?php } ?><?php unset($a10_class,$a10_default,$a10_type,$a10_name,$a10_size,$a10_maxlength,$a10_onchange,$a10_readonly) ?><br/><?php $a10_type='ok';$a10_class='ok';$a10_value='ok';$a10_text='add'; ?><?php if ($this->isEditable() && !$this->isEditMode()) - $a7_text = 'MODE_EDIT'; - $a7_type = 'submit'; + $a10_text = 'MODE_EDIT'; + $a10_type = 'submit'; if ( $this->isEditable() && readonly() ) - $a7_type = ''; // Knopf nicht anzeigen - $a7_src = ''; - if ( !empty($a7_type) ) { -?><input type="<?php echo $a7_type ?>"<?php if(isset($a7_src)) { ?> src="<?php echo $image_dir.'icon_'.$a7_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $a7_value ?>" class="ok" title="<?php echo lang($a7_text.'_DESC') ?>" value=" <?php echo langHtml($a7_text) ?> " /><?php unset($a7_src) + $a10_type = ''; // Knopf nicht anzeigen + $a10_src = ''; + if ( !empty($a10_type) ) { +?><input type="<?php echo $a10_type ?>"<?php if(isset($a10_src)) { ?> src="<?php echo $image_dir.'icon_'.$a10_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $a10_value ?>" class="ok" title="<?php echo lang($a10_text.'_DESC') ?>" value=" <?php echo langHtml($a10_text) ?> " /><?php unset($a10_src) ?><?php } -?><?php unset($a7_type,$a7_class,$a7_value,$a7_text) ?></form> +?><?php unset($a10_type,$a10_class,$a10_value,$a10_text) ?></form> </td></tr><?php } ?><?php $row_idx = $last_row_idx; $column_idx = $last_column_idx; ?> +</table></td></tr><?php + $row_idx = $last_row_idx; + $column_idx = $last_column_idx; +?> </table></body> </html> \ No newline at end of file diff --git a/themes/default/pages/html/folder/create.tpl.php b/themes/default/pages/html/folder/create.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='GLOBAL_NEW';$a3_name='global_new';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/createfile.tpl.php b/themes/default/pages/html/folder/createfile.tpl.php @@ -69,6 +69,7 @@ else $a3_tmp_value = ""; ?><input type="hidden" name="<?php echo $a3_name ?>" value="<?php echo $a3_tmp_value ?>" /><?php unset($a3_name,$a3_default) ?><?php $a3_title='';$a3_name='';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -87,7 +88,7 @@ else if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -95,7 +96,7 @@ else ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/createfolder.tpl.php b/themes/default/pages/html/folder/createfolder.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='';$a3_name='';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/createlink.tpl.php b/themes/default/pages/html/folder/createlink.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='';$a3_name='';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/createpage.tpl.php b/themes/default/pages/html/folder/createpage.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='';$a3_name='';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/edit.tpl.php b/themes/default/pages/html/folder/edit.tpl.php @@ -74,7 +74,8 @@ else $a3_tmp_value = ""; ?><input type="hidden" name="<?php echo $a3_name ?>" value="<?php echo $a3_tmp_value ?>" /><?php unset($a3_name) ?><?php $a3_widths='5%,75%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -93,7 +94,7 @@ else if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -101,7 +102,7 @@ else ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/order.tpl.php b/themes/default/pages/html/folder/order.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/prop.tpl.php b/themes/default/pages/html/folder/prop.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='global_prop';$a3_name='objectName';$a3_icon='folder';$a3_widths='35%,65%';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) @@ -202,11 +203,12 @@ ><?php unset($a5_class) ?><?php $a6_class='name';$a6_default='';$a6_type='text';$a6_name='name';$a6_size='50';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> @@ -236,11 +238,12 @@ if ($a6_readonly) { ><?php unset($a5_class) ?><?php $a6_class='filename';$a6_default='';$a6_type='text';$a6_name='filename';$a6_size='40';$a6_maxlength='256';$a6_onchange='';$a6_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a6_readonly=true; if ($a6_readonly && empty($$a6_name)) $$a6_name = '- '.lang('EMPTY').' -'; if(!isset($a6_default)) $a6_default=''; + $tmp_value = Text::encodeHtml(isset($$a6_name)?$$a6_name:$a6_default); ?><?php if (!$a6_readonly || $a6_type=='hidden') { -?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a6_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" name="<?php echo $a6_name ?><?php if ($a6_readonly) echo '_disabled' ?>" type="<?php echo $a6_type ?>" size="<?php echo $a6_size ?>" maxlength="<?php echo $a6_maxlength ?>" class="<?php echo $a6_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a6_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a6_readonly) { -?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo isset($$a6_name)?$$a6_name:$a6_default ?>" /><?php - } } else { ?><span class="<?php echo $a6_class ?>"><?php echo isset($$a6_name)?$$a6_name:$a6_default ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php +?><input type="hidden" id="id_<?php echo $a6_name ?>" name="<?php echo $a6_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a6_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a6_class,$a6_default,$a6_type,$a6_name,$a6_size,$a6_maxlength,$a6_onchange,$a6_readonly) ?></td></tr><?php $row_idx++; $column_idx = 0; ?> diff --git a/themes/default/pages/html/folder/pub.tpl.php b/themes/default/pages/html/folder/pub.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/remove.tpl.php b/themes/default/pages/html/folder/remove.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/folder/select.tpl.php b/themes/default/pages/html/folder/select.tpl.php @@ -1,575 +0,0 @@ -<?php $a1_class='main'; ?><?php - if (!defined('OR_VERSION')) die('Forbidden'); - 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($a1_title)?langHtml($a1_title).' - ':(isset($windowTitle)?langHtml($windowTitle).' - ':'') ?><?php echo $cms_title ?></title> - <meta http-equiv="content-type" content="text/html; charset=<?php echo $charset ?>" > -<?php if ( isset($refresh_url) ) { ?> - <meta http-equiv="refresh" content="<?php echo isset($refresh_timeout)?$refresh_timeout:0 ?>; URL=<?php echo $refresh_url; if (ini_get('session.use_trans_sid')) echo '&'.session_name().'='.session_id(); ?>"> -<?php } ?> - <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']) ?>" > -<?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 $meta['title'] ?>" ><?php - } -?><?php if(!empty($root_stylesheet)) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $root_stylesheet ?>" > -<?php } ?> -<?php if($root_stylesheet!=$user_stylesheet) { ?> - <link rel="stylesheet" type="text/css" href="<?php echo $user_stylesheet ?>" > -<?php } ?> -</head> -<body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > -<?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_action='folder';$a2_subaction='edit';$a2_name='';$a2_target='_self';$a2_method='post';$a2_enctype='application/x-www-form-urlencoded'; ?><?php - $a2_id = $this->getRequestId(); - if ($this->isEditable()) - { - if ($this->isEditMode()) - { - $a2_method = 'POST'; - } - else - { - $a2_method = 'GET'; - $a2_subaction = $subActionName; - } - } -?><form name="<?php echo $a2_name ?>" - target="<?php echo $a2_target ?>" - action="<?php echo Html::url( $a2_action,$a2_subaction,$a2_id ) ?>" - method="<?php echo $a2_method ?>" - enctype="<?php echo $a2_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_TOKEN ?>" value="<?php echo token() ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ACTION ?>" value="<?php echo $a2_action ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_SUBACTION ?>" value="<?php echo $a2_subaction ?>" /> -<input type="hidden" name="<?php echo REQ_PARAM_ID ?>" value="<?php echo $a2_id ?>" /><?php - if ( $conf['interface']['url_sessionid'] ) - echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; -?><?php unset($a2_action,$a2_subaction,$a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='titelso';$a3_name='bla';$a3_widths='5%,75%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php - $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); - $row_classes = explode(',',$a3_rowclasses); - $row_class_idx = 999; - $column_classes = explode(',',$a3_columnclasses); - $row_idx = 0; - $column_idx = 0; - global $image_dir; - if (@$conf['interface']['application_mode'] ) - { - echo '<table class="main" cellspacing="0" cellpadding="4" width="100%" style="margin:0px;border:0px; padding:0px;" height_oo="100%">'; - } - else - { - echo '<br/><br/><br/><center>'; - echo '<table class="main" cellspacing="0" cellpadding="4" width="'.$a3_width.'">'; - } - if (!@$conf['interface']['application_mode'] ) - { - echo '<tr class="title"><td>'; - 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 } - elseif (readonly()) { - ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { - ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } - ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; - if ( !isset($path) || is_array($path) ) - $path = array(); - foreach( $path as $pathElement) - { - extract($pathElement); - echo '<a href="'.$url.'" class="path">'.langHtml($name).'</a>'; - echo ' » '; - } - echo '<span class="title">'.langHtml($windowTitle).'</span>'; - if ( isset($notice_status)) - { - ?><img src="<?php echo $image_dir.'notice_'.$notice_status.IMG_ICON_EXT ?>" align="right" /><?php - } - ?> - </td> - <?php - } - ?> -<?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_'.langHtml($menu['type'].'_DESC') ?>"><image border="0" src="<?php echo $image_dir.$icon['type'].IMG_ICON_EXT ?>"></a> <?php - } - ?> - </td>--> - </tr> - <tr class="menu"><td> - <table class="menu"><tr> - <?php if ( !isset($windowMenu) || !is_array($windowMenu) ) - $windowMenu = array(); - foreach( $windowMenu as $menu ) - { - $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']) ) - { - ?><td class="action"><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></td><?php - } - else - { - ?><td class="noaction"><?php echo $tmp_text ?></td><?php - } - } - if (@$conf['help']['enabled'] ) - { - ?><td><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></td><?php - } - ?> - </tr></table></td> - </tr> -<?php if (isset($notices) && count($notices)>0 ) - { ?> - <tr> - <td align="center" class="notice"> - <?php foreach( $notices as $notice_idx=>$notice ) { ?> - <br><table class="notice"> - <?php if ($notice['name']!='') { ?> - <tr> - <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="<?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 } ?> - </td> - </tr> - </table> - <?php } ?> - </td> - </tr> - <tr> - <td colspan="2"><fieldset></fieldset></td> - </tr> -<?php } ?> - <tr> - <td class="window"> - <table cellspacing="0" width="100%" cellpadding="4"> -<?php unset($a3_title,$a3_name,$a3_widths,$a3_width,$a3_rowclasses,$a3_columnclasses) ?><?php $a4_class='headline'; ?><?php - $row_idx++; - $column_idx = 0; -?> -<tr - class="headline" -> -<?php unset($a4_class) ?><?php $a5_class='help'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> - class="help" -><?php unset($a5_class) ?><?php $a6_class='text';$a6_key='SELECT';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = $langF($a6_key); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_key,$a6_escape,$a6_cut) ?></td><?php $a5_class='help'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> - class="help" -><?php unset($a5_class) ?><?php $a6_class='text';$a6_key='GLOBAL_TYPE';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = $langF($a6_key); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_key,$a6_escape,$a6_cut) ?><?php $a6_class='text';$a6_raw='_/_';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a6_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_raw,$a6_escape,$a6_cut) ?><?php $a6_class='text';$a6_key='GLOBAL_NAME';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = $langF($a6_key); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_key,$a6_escape,$a6_cut) ?></td></tr><?php $a4_list='object';$a4_extract=true;$a4_key='list_key';$a4_value='list_value'; ?><?php - $a4_list_tmp_key = $a4_key; - $a4_list_tmp_value = $a4_value; - $a4_list_extract = $a4_extract; - unset($a4_key); - unset($a4_value); - if ( !isset($$a4_list) || !is_array($$a4_list) ) - $$a4_list = array(); - foreach( $$a4_list as $$a4_list_tmp_key => $$a4_list_tmp_value ) - { - if ( $a4_list_extract ) - { - if ( !is_array($$a4_list_tmp_value) ) - { - print_r($$a4_list_tmp_value); - die( 'not an array at key: '.$$a4_list_tmp_key ); - } - extract($$a4_list_tmp_value); - } -?><?php unset($a4_list,$a4_extract,$a4_key,$a4_value) ?><?php $a5_class='data'; ?><?php - $row_idx++; - $column_idx = 0; -?> -<tr - class="data" -> -<?php unset($a5_class) ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> -><?php $a7_true='writable'; ?><?php - if (gettype($a7_true) === '' && gettype($a7_true) === '1') - $a7_tmp_exec = $$a7_true == true; - else - $a7_tmp_exec = $a7_true == true; - $a7_tmp_last_exec = $a7_tmp_exec; - if ( $a7_tmp_exec ) - { -?> -<?php unset($a7_true) ?><?php $a8_default=false;$a8_readonly=false;$a8_name=$id; ?><?php - if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; - if ( isset($$a8_name) ) - $checked = $$a8_name; - else - $checked = $a8_default; -?><input class="checkbox" type="checkbox" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" <?php if ($a8_readonly) echo ' disabled="disabled"' ?> value="1" <?php if( $checked ) echo 'checked="checked"' ?><?php if (in_array($a8_name,$errors)) echo ' style="background-color:red;"' ?> /><?php -if ( $a8_readonly && $checked ) -{ -?><input type="hidden" name="<?php echo $a8_name ?>" value="1" /><?php -} -?><?php unset($a8_name); unset($a8_readonly); unset($a8_default); ?><?php unset($a8_default,$a8_readonly,$a8_name) ?><?php } ?><?php $a7_false='writable'; ?><?php - if (gettype($a7_false) === '' && gettype($a7_false) === '1') - $a7_tmp_exec = $$a7_false == false; - else - $a7_tmp_exec = $a7_false == false; - $a7_tmp_last_exec = $a7_tmp_exec; - if ( $a7_tmp_exec ) - { -?> -<?php unset($a7_false) ?><?php $a8_class='text';$a8_raw='_';$a8_escape=true;$a8_cut='both'; ?><?php - $a8_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php - $langF = $a8_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a8_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_raw,$a8_escape,$a8_cut) ?><?php } ?></td><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> -><?php $a7_for=$id; ?><label for="id_<?php echo $a7_for ?><?php if (!empty($a7_value)) echo '_'.$a7_value ?>"><?php unset($a7_for) ?><?php $a8_align='left';$a8_type=$icon; ?><?php - $a8_tmp_image_file = $image_dir.'icon_'.$a8_type.IMG_ICON_EXT; - $a8_size = '16x16'; - $a8_tmp_title = basename($a8_tmp_image_file); -?><img alt="<?php echo $a8_tmp_title; if (isset($a8_size)) { echo ' ('; list($a8_tmp_width,$a8_tmp_height)=explode('x',$a8_size);echo $a8_tmp_width.'x'.$a8_tmp_height; echo')';} ?>" src="<?php echo $a8_tmp_image_file ?>" border="0"<?php if(isset($a8_align)) echo ' align="'.$a8_align.'"' ?><?php if (isset($a8_size)) { list($a8_tmp_width,$a8_tmp_height)=explode('x',$a8_size);echo ' width="'.$a8_tmp_width.'" height="'.$a8_tmp_height.'"';} ?>><?php unset($a8_align,$a8_type) ?><?php $a8_class='text';$a8_var='name';$a8_escape=true;$a8_cut='both'; ?><?php - $a8_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php - $langF = $a8_escape?'langHtml':'lang'; - $tmp_text = isset($$a8_var)?$$a8_var:$langF('UNKNOWN'); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_var,$a8_escape,$a8_cut) ?><?php $a8_class='text';$a8_raw='_';$a8_escape=true;$a8_cut='both'; ?><?php - $a8_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php - $langF = $a8_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a8_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_raw,$a8_escape,$a8_cut) ?></label></td></tr><?php } ?><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a5_colspan) ?><?php $a6_align='left';$a6_fileext='tree_none_end.gif'; ?><?php - $a6_tmp_image_file = $image_dir.$a6_fileext; - $a6_tmp_title = basename($a6_tmp_image_file); -?><img alt="<?php echo $a6_tmp_title; if (isset($a6_size)) { echo ' ('; list($a6_tmp_width,$a6_tmp_height)=explode('x',$a6_size);echo $a6_tmp_width.'x'.$a6_tmp_height; echo')';} ?>" src="<?php echo $a6_tmp_image_file ?>" border="0"<?php if(isset($a6_align)) echo ' align="'.$a6_align.'"' ?><?php if (isset($a6_size)) { list($a6_tmp_width,$a6_tmp_height)=explode('x',$a6_size);echo ' width="'.$a6_tmp_width.'" height="'.$a6_tmp_height.'"';} ?>><?php unset($a6_align,$a6_fileext) ?><?php $a6_class='text';$a6_raw='_';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a6_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_raw,$a6_escape,$a6_cut) ?><?php $a6_title='';$a6_target='_self';$a6_class='';$a6_action=$actionName;$a6_subaction='select';$a6_var1='markall';$a6_value1='1'; ?><?php - $params = array(); - $params[$a6_var1]=$a6_value1; - $tmp_url = ''; - $tmp_url = Html::url($a6_action,$a6_subaction,!empty($a6_id)?$a6_id:$this->getRequestId(),$params); -?><a<?php if (isset($a6_name)) echo ' name="'.$a6_name.'"'; else echo ' href="'.$tmp_url.(isset($a6_anchor)?'#'.$a6_anchor:'').'"' ?> class="<?php echo $a6_class ?>" target="<?php echo $a6_target ?>"<?php if (isset($a6_accesskey)) echo ' accesskey="'.$a6_accesskey.'"' ?> title="<?php echo encodeHtml($a6_title) ?>"><?php unset($a6_title,$a6_target,$a6_class,$a6_action,$a6_subaction,$a6_var1,$a6_value1) ?><?php $a7_class='text';$a7_key='FOLDER_MARK_ALL';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = $langF($a7_key); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_key,$a7_escape,$a7_cut) ?></a><?php $a6_class='text';$a6_raw='_|_';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a6_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_raw,$a6_escape,$a6_cut) ?><?php $a6_title='';$a6_target='_self';$a6_url='javascript:unmark();';$a6_class=''; ?><?php - $params = array(); - $tmp_url = ''; - $tmp_url = $a6_url; -?><a<?php if (isset($a6_name)) echo ' name="'.$a6_name.'"'; else echo ' href="'.$tmp_url.(isset($a6_anchor)?'#'.$a6_anchor:'').'"' ?> class="<?php echo $a6_class ?>" target="<?php echo $a6_target ?>"<?php if (isset($a6_accesskey)) echo ' accesskey="'.$a6_accesskey.'"' ?> title="<?php echo encodeHtml($a6_title) ?>"><?php unset($a6_title,$a6_target,$a6_url,$a6_class) ?><?php $a7_class='text';$a7_key='FOLDER_UNMARK_ALL';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = $langF($a7_key); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_key,$a7_escape,$a7_cut) ?></a><?php $a6_class='text';$a6_raw='_|_';$a6_escape=true;$a6_cut='both'; ?><?php - $a6_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a6_class ?>" title="<?php echo $a6_title ?>"><?php - $langF = $a6_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a6_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a6_class,$a6_raw,$a6_escape,$a6_cut) ?><?php $a6_title='';$a6_target='_self';$a6_url='javascript:flip();';$a6_class=''; ?><?php - $params = array(); - $tmp_url = ''; - $tmp_url = $a6_url; -?><a<?php if (isset($a6_name)) echo ' name="'.$a6_name.'"'; else echo ' href="'.$tmp_url.(isset($a6_anchor)?'#'.$a6_anchor:'').'"' ?> class="<?php echo $a6_class ?>" target="<?php echo $a6_target ?>"<?php if (isset($a6_accesskey)) echo ' accesskey="'.$a6_accesskey.'"' ?> title="<?php echo encodeHtml($a6_title) ?>"><?php unset($a6_title,$a6_target,$a6_url,$a6_class) ?><?php $a7_class='text';$a7_key='FOLDER_FLIP_MARK';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = $langF($a7_key); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_key,$a7_escape,$a7_cut) ?></a></td></tr><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a5_colspan) ?><?php $a6_title=lang('options'); ?><fieldset><?php if(isset($a6_title)) { ?><legend><?php echo encodeHtml($a6_title) ?></legend><?php } ?><?php unset($a6_title) ?></fieldset></td></tr><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a5_colspan='2'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a5_colspan) ?><?php $a6_var='type';$a6_value=$defaulttype; ?><?php - if (isset($a6_key)) - $$a6_var = $a6_value[$a6_key]; - else - $$a6_var = $a6_value; -?><?php unset($a6_var,$a6_value) ?><?php $a6_list='actionlist';$a6_extract=false;$a6_key='list_key';$a6_value='actiontype'; ?><?php - $a6_list_tmp_key = $a6_key; - $a6_list_tmp_value = $a6_value; - $a6_list_extract = $a6_extract; - unset($a6_key); - unset($a6_value); - if ( !isset($$a6_list) || !is_array($$a6_list) ) - $$a6_list = array(); - foreach( $$a6_list as $$a6_list_tmp_key => $$a6_list_tmp_value ) - { - if ( $a6_list_extract ) - { - if ( !is_array($$a6_list_tmp_value) ) - { - print_r($$a6_list_tmp_value); - die( 'not an array at key: '.$$a6_list_tmp_key ); - } - extract($$a6_list_tmp_value); - } -?><?php unset($a6_list,$a6_extract,$a6_key,$a6_value) ?><?php $a7_readonly=false;$a7_name='type';$a7_value=$actiontype;$a7_default=false;$a7_prefix='';$a7_suffix='';$a7_class='';$a7_onchange=''; ?><?php - if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; - if ( isset($$a7_name) ) - $a7_tmp_default = $$a7_name; - elseif ( isset($a7_default) ) - $a7_tmp_default = $a7_default; - else - $a7_tmp_default = ''; - ?><input onclick="" class="radio" type="radio" id="id_<?php echo $a7_name.'_'.$a7_value ?>" name="<?php echo $a7_prefix.$a7_name ?>"<?php if ( $a7_readonly ) echo ' disabled="disabled"' ?> value="<?php echo $a7_value ?>" <?php if($a7_value==$a7_tmp_default) echo 'checked="checked"' ?><?php if (in_array($a7_name,$errors)) echo ' style="borderx:2px dashed red; background-color:red;"' ?> /> -<?php /* #END-IF# */ ?><?php unset($a7_readonly,$a7_name,$a7_value,$a7_default,$a7_prefix,$a7_suffix,$a7_class,$a7_onchange) ?><?php $a7_for='type';$a7_value=$actiontype; ?><label for="id_<?php echo $a7_for ?><?php if (!empty($a7_value)) echo '_'.$a7_value ?>"><?php unset($a7_for,$a7_value) ?><?php $a8_class='text';$a8_raw='_';$a8_escape=true;$a8_cut='both'; ?><?php - $a8_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php - $langF = $a8_escape?'langHtml':'lang'; - $tmp_text = str_replace('_',' ',$a8_raw); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_raw,$a8_escape,$a8_cut) ?><?php $a8_class='text';$a8_key=$actiontype;$a8_prefix='FOLDER_SELECT_';$a8_escape=true;$a8_cut='both'; ?><?php - $a8_key = $a8_prefix.$a8_key; - $a8_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php - $langF = $a8_escape?'langHtml':'lang'; - $tmp_text = $langF($a8_key); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a8_class,$a8_key,$a8_prefix,$a8_escape,$a8_cut) ?></label><br/><?php } ?></td></tr><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a5_class='act';$a5_colspan='2'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> - class="act" - colspan="2" -><?php unset($a5_class,$a5_colspan) ?><?php $a6_type='ok';$a6_class='ok';$a6_value='ok';$a6_text='button_next'; ?><?php - if ($this->isEditable() && !$this->isEditMode()) - $a6_text = 'MODE_EDIT'; - $a6_type = 'submit'; - if ( $this->isEditable() && readonly() ) - $a6_type = ''; // Knopf nicht anzeigen - $a6_src = ''; - if ( !empty($a6_type) ) { -?><input type="<?php echo $a6_type ?>"<?php if(isset($a6_src)) { ?> src="<?php echo $image_dir.'icon_'.$a6_src.IMG_ICON_EXT ?>"<?php } ?> name="<?php echo $a6_value ?>" class="ok" title="<?php echo lang($a6_text.'_DESC') ?>" value=" <?php echo langHtml($a6_text) ?> " /><?php unset($a6_src) -?><?php } -?><?php unset($a6_type,$a6_class,$a6_value,$a6_text) ?></td></tr><?php $a4_empty='object'; ?><?php - if ( !isset($$a4_empty) ) - $a4_tmp_exec = empty($a4_empty); - elseif ( is_array($$a4_empty) ) - $a4_tmp_exec = (count($$a4_empty)==0); - elseif ( is_bool($$a4_empty) ) - $a4_tmp_exec = true; - else - $a4_tmp_exec = empty( $$a4_empty ); - $a4_tmp_last_exec = $a4_tmp_exec; - if ( $a4_tmp_exec ) - { -?> -<?php unset($a4_empty) ?><?php - $row_idx++; - $column_idx = 0; -?> -<tr -> -<?php $a6_colspan='2'; ?><?php $column_idx++; ?><td -<?php if (!empty($column_widths)) { ?> - width="<?php echo $column_widths[($column_idx-1)%count($column_widths)] ?>" -<?php } ?> -<?php if (!empty($column_classes)) { ?> - class="<?php echo $column_classes[($column_idx-1)%count($column_classes)] ?>" -<?php } ?> - colspan="2" -><?php unset($a6_colspan) ?><?php $a7_class='text';$a7_text='GLOBAL_NOT_FOUND';$a7_escape=true;$a7_cut='both'; ?><?php - $a7_title = ''; - $tmp_tag = 'span'; -?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php - $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = $langF($a7_text); - $tmp_text = nl2br($tmp_text); - echo $tmp_text; - unset($tmp_text); -?></<?php echo $tmp_tag ?>><?php unset($a7_class,$a7_text,$a7_escape,$a7_cut) ?></td></tr><?php } ?> </table> - </td> - </tr> -</table> -</center> -<?php if ($showDuration) - { ?> -<br/> -<center><small> -<?php $dur = time()-START_TIME; - echo floor($dur/60).':'.str_pad($dur%60,2,'0',STR_PAD_LEFT); ?></small></center> -<?php } ?> -</form> -<?php $a2_script='mark';$a2_inline=true; ?><?php -$a2_tmp_file = $tpl_dir.'../../js/'.basename($a2_script).'.js'; -if (!$a2_inline) -{ - ?><script src="<?php echo $a2_tmp_file ?>" type="text/javascript"></script><?php -} -else -{ - echo '<script type="text/javascript">'; - echo str_replace(' ',' ',str_replace('~','',strtr(implode('',file($a2_tmp_file)),"\t\n\b",'~~~'))); - echo '</script>'; -} -?> -<?php unset($a2_script,$a2_inline) ?></body> -</html>- \ No newline at end of file diff --git a/themes/default/pages/html/folder/show.tpl.php b/themes/default/pages/html/folder/show.tpl.php @@ -32,7 +32,8 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_widths='75%,25%';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a2_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a2_widths); $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -51,7 +52,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -59,7 +60,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/group/add.tpl.php b/themes/default/pages/html/group/add.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/group/edit.tpl.php b/themes/default/pages/html/group/edit.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/group/listing.tpl.php b/themes/default/pages/html/group/listing.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='GLOBAL_GROUPS';$a2_icon='group';$a2_width='70%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/group/remove.tpl.php b/themes/default/pages/html/group/remove.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/group/rights.tpl.php b/themes/default/pages/html/group/rights.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_title='ACL';$a2_name='x';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/group/users.tpl.php b/themes/default/pages/html/group/users.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GROUP_MEMBERSHIPS';$a3_icon='user';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/index/applications.tpl.php b/themes/default/pages/html/index/applications.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class,$a1_title) ?><?php $a2_icon='project';$a2_width='600';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/index/changepassword.tpl.php b/themes/default/pages/html/index/changepassword.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='GLOBAL_CHOOSE';$a3_name='login';$a3_icon='user';$a3_width='400';$a3_rowclasses='fx1,fx2';$a3_columnclasses='x,y'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/index/password.tpl.php b/themes/default/pages/html/index/password.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='GLOBAL_password';$a3_name='login';$a3_icon='user';$a3_widths='50%,50%';$a3_width='400';$a3_rowclasses='fx1,fx2';$a3_columnclasses='x,y'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/index/passwordinputcode.tpl.php b/themes/default/pages/html/index/passwordinputcode.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='password';$a3_icon='user';$a3_widths='50%,50%';$a3_width='400px';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/index/projectmenu.tpl.php b/themes/default/pages/html/index/projectmenu.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class,$a1_title) ?><?php $a2_title='GLOBAL_PROJECTS';$a2_name='login';$a2_icon='project';$a2_width='600';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) @@ -288,6 +289,7 @@ $a10_tmp_default = ''; foreach( $a10_tmp_list as $box_key=>$box_value ) { + $box_value = is_array($box_value)?(isset($box_value['lang'])?langHtml($box_value['lang']):$box_value['value']):$box_value; $id = 'id_'.$a10_name.'_'.$box_key; echo '<input id="'.$id.'" name="'.$a10_name.'" type="radio" class="'.$a10_class.'" value="'.$box_key.'"'; if ($box_key==$a10_tmp_default) @@ -310,6 +312,7 @@ $a10_tmp_default = ''; foreach( $a10_tmp_list as $box_key=>$box_value ) { + $box_value = is_array($box_value)?(isset($box_value['lang'])?langHtml($box_value['lang']):$box_value['value']):$box_value; $id = 'id_'.$a10_name.'_'.$box_key; echo '<input id="'.$id.'" name="'.$a10_name.'" type="radio" class="'.$a10_class.'" value="'.$box_key.'"'; if ($box_key==$a10_tmp_default) diff --git a/themes/default/pages/html/index/register.tpl.php b/themes/default/pages/html/index/register.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='GLOBAL_REGISTER';$a3_name='login';$a3_icon='user';$a3_width='400';$a3_rowclasses='odd,even';$a3_columnclasses='x'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/index/registeruserdata.tpl.php b/themes/default/pages/html/index/registeruserdata.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='GLOBAL_REGISTER';$a3_name='login';$a3_icon='user';$a3_width='400';$a3_rowclasses='fx1,fx2';$a3_columnclasses='x,y'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/index/showlogin.tpl.php b/themes/default/pages/html/index/showlogin.tpl.php @@ -60,6 +60,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_action,$a2_subaction,$a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='GLOBAL_LOGIN';$a3_name='login';$a3_icon='user';$a3_width='400px';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -78,7 +79,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -86,7 +87,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) @@ -429,7 +430,7 @@ if ($a8_readonly) { $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a8_class ?>" title="<?php echo $a8_title ?>"><?php $langF = $a8_escape?'langHtml':'lang'; - $tmp_text = $a8_value; + $tmp_text = $a8_escape?htmlentities($a8_value):$a8_value; $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); @@ -828,7 +829,7 @@ else $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a3_class ?>" title="<?php echo $a3_title ?>"><?php $langF = $a3_escape?'langHtml':'lang'; - $tmp_text = $a3_value; + $tmp_text = $a3_escape?htmlentities($a3_value):$a3_value; $tmp_text = nl2br($tmp_text); echo $tmp_text; unset($tmp_text); diff --git a/themes/default/pages/html/language/add.tpl.php b/themes/default/pages/html/language/add.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROJECTS';$a3_icon='project';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/language/advanced.tpl.php b/themes/default/pages/html/language/advanced.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/language/edit.tpl.php b/themes/default/pages/html/language/edit.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/language/listing.tpl.php b/themes/default/pages/html/language/listing.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_icon='language';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/language/remove.tpl.php b/themes/default/pages/html/language/remove.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/link/edit.tpl.php b/themes/default/pages/html/link/edit.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='global_link';$a3_name='GLOBAL_PROP';$a3_icon='link';$a3_widths='5%,30%,65%';$a3_width='90%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/link/prop.tpl.php b/themes/default/pages/html/link/prop.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='global_link';$a3_name='GLOBAL_PROP';$a3_icon='link';$a3_widths='40%,60%';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/mainmenu/show.tpl.php b/themes/default/pages/html/mainmenu/show.tpl.php @@ -166,11 +166,12 @@ ?><?php unset($a7_action,$a7_subaction,$a7_name,$a7_target,$a7_method,$a7_enctype) ?><?php $a8_class='search';$a8_default='';$a8_type='text';$a8_name='search';$a8_size='15';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php $a8_true=@$conf['search']['quicksearch']['show_button']; ?><?php +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?><?php $a8_true=@$conf['search']['quicksearch']['show_button']; ?><?php if (gettype($a8_true) === '' && gettype($a8_true) === '1') $a8_tmp_exec = $$a8_true == true; else diff --git a/themes/default/pages/html/model/add.tpl.php b/themes/default/pages/html/model/add.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROJECTS';$a3_icon='project';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/model/edit.tpl.php b/themes/default/pages/html/model/edit.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/model/listing.tpl.php b/themes/default/pages/html/model/listing.tpl.php @@ -32,7 +32,8 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='GLOBAL_MODELS';$a2_icon='group';$a2_widths='50%,25%,25%';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a2_widths); + $icon=$a2_icon; + $coldumn_widths = explode(',',$a2_widths); $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -51,7 +52,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -59,7 +60,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/model/remove.tpl.php b/themes/default/pages/html/model/remove.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_GROUPS';$a3_icon='group';$a3_widths='30%,70%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/object/rights.tpl.php b/themes/default/pages/html/object/rights.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='ACL';$a3_name='x';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/page/changetemplate.tpl.php b/themes/default/pages/html/page/changetemplate.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/page/changetemplateselectelements.tpl.php b/themes/default/pages/html/page/changetemplateselectelements.tpl.php @@ -69,6 +69,7 @@ else $a3_tmp_value = ""; ?><input type="hidden" name="<?php echo $a3_name ?>" value="<?php echo $a3_tmp_value ?>" /><?php unset($a3_name,$a3_default) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -87,7 +88,7 @@ else if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -95,7 +96,7 @@ else ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/page/el.tpl.php b/themes/default/pages/html/page/el.tpl.php @@ -32,7 +32,8 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_title='TEMPLATE_ELEMENTS';$a2_name='x';$a2_widths='30%,50%,20%';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a2_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a2_widths); $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -51,7 +52,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -59,7 +60,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/page/form.tpl.php b/themes/default/pages/html/page/form.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='TEMPLATE_ELEMENTS';$a3_name='TEMPLATE_ELEMENTS';$a3_widths='30%,5%,65%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/page/prop.tpl.php b/themes/default/pages/html/page/prop.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_icon='folder';$a3_widths='40%,60%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/page/pub.tpl.php b/themes/default/pages/html/page/pub.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/page/src.tpl.php b/themes/default/pages/html/page/src.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_icon='page';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/pageelement/archive.tpl.php b/themes/default/pages/html/pageelement/archive.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_widths='5%,5%,5%,15%,15%,35%,10%,10%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/pageelement/diff.tpl.php b/themes/default/pages/html/pageelement/diff.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/pageelement/edit.tpl.php b/themes/default/pages/html/pageelement/edit.tpl.php @@ -63,18 +63,20 @@ ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_class='text';$a3_default='';$a3_type='hidden';$a3_name='elementid';$a3_size='40';$a3_maxlength='256';$a3_onchange='';$a3_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a3_readonly=true; if ($a3_readonly && empty($$a3_name)) $$a3_name = '- '.lang('EMPTY').' -'; if(!isset($a3_default)) $a3_default=''; + $tmp_value = Text::encodeHtml(isset($$a3_name)?$$a3_name:$a3_default); ?><?php if (!$a3_readonly || $a3_type=='hidden') { -?><input<?php if ($a3_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" name="<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" type="<?php echo $a3_type ?>" size="<?php echo $a3_size ?>" maxlength="<?php echo $a3_maxlength ?>" class="<?php echo $a3_class ?>" value="<?php echo isset($$a3_name)?$$a3_name:$a3_default ?>" <?php if (in_array($a3_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a3_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" name="<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" type="<?php echo $a3_type ?>" size="<?php echo $a3_size ?>" maxlength="<?php echo $a3_maxlength ?>" class="<?php echo $a3_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a3_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a3_readonly) { -?><input type="hidden" id="id_<?php echo $a3_name ?>" name="<?php echo $a3_name ?>" value="<?php echo isset($$a3_name)?$$a3_name:$a3_default ?>" /><?php - } } else { ?><span class="<?php echo $a3_class ?>"><?php echo isset($$a3_name)?$$a3_name:$a3_default ?></span><?php } ?><?php unset($a3_class,$a3_default,$a3_type,$a3_name,$a3_size,$a3_maxlength,$a3_onchange,$a3_readonly) ?><?php $a3_class='text';$a3_default='';$a3_type='hidden';$a3_name='value_time';$a3_size='40';$a3_maxlength='256';$a3_onchange='';$a3_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a3_readonly=true; +?><input type="hidden" id="id_<?php echo $a3_name ?>" name="<?php echo $a3_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a3_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a3_class,$a3_default,$a3_type,$a3_name,$a3_size,$a3_maxlength,$a3_onchange,$a3_readonly) ?><?php $a3_class='text';$a3_default='';$a3_type='hidden';$a3_name='value_time';$a3_size='40';$a3_maxlength='256';$a3_onchange='';$a3_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a3_readonly=true; if ($a3_readonly && empty($$a3_name)) $$a3_name = '- '.lang('EMPTY').' -'; if(!isset($a3_default)) $a3_default=''; + $tmp_value = Text::encodeHtml(isset($$a3_name)?$$a3_name:$a3_default); ?><?php if (!$a3_readonly || $a3_type=='hidden') { -?><input<?php if ($a3_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" name="<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" type="<?php echo $a3_type ?>" size="<?php echo $a3_size ?>" maxlength="<?php echo $a3_maxlength ?>" class="<?php echo $a3_class ?>" value="<?php echo isset($$a3_name)?$$a3_name:$a3_default ?>" <?php if (in_array($a3_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a3_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" name="<?php echo $a3_name ?><?php if ($a3_readonly) echo '_disabled' ?>" type="<?php echo $a3_type ?>" size="<?php echo $a3_size ?>" maxlength="<?php echo $a3_maxlength ?>" class="<?php echo $a3_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a3_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a3_readonly) { -?><input type="hidden" id="id_<?php echo $a3_name ?>" name="<?php echo $a3_name ?>" value="<?php echo isset($$a3_name)?$$a3_name:$a3_default ?>" /><?php - } } else { ?><span class="<?php echo $a3_class ?>"><?php echo isset($$a3_name)?$$a3_name:$a3_default ?></span><?php } ?><?php unset($a3_class,$a3_default,$a3_type,$a3_name,$a3_size,$a3_maxlength,$a3_onchange,$a3_readonly) ?><?php $a3_name='element';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php +?><input type="hidden" id="id_<?php echo $a3_name ?>" name="<?php echo $a3_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a3_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a3_class,$a3_default,$a3_type,$a3_name,$a3_size,$a3_maxlength,$a3_onchange,$a3_readonly) ?><?php $a3_name='element';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); @@ -1071,11 +1073,12 @@ if (count($$a8_list)==1) echo '<input type="hidden" name="'.$a8_name.'" value="' ><?php unset($a6_colspan) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='text';$a7_size='50';$a7_maxlength='255';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_field='text'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_field='text'; ?><?php if (isset($errors[0])) $a7_field = $errors[0]; ?><script name="JavaScript" type="text/javascript"><!-- document.forms[0].<?php echo $a7_field ?>.focus(); @@ -1307,7 +1310,7 @@ function table() </tr> </table> <fieldset><legend><?php echo langHtml('CONTENT') ?></legend></fieldset> - <textarea name="<?php echo $a8_name ?>" class="editor" style="width:100%;height:300px;"><?php echo $$a8_name ?></textarea> + <textarea name="<?php echo $a8_name ?>" class="editor"><?php echo $$a8_name ?></textarea> <?php } else @@ -1531,7 +1534,7 @@ function table() </tr> </table> <fieldset><legend><?php echo langHtml('CONTENT') ?></legend></fieldset> - <textarea name="<?php echo $a8_name ?>" class="editor" style="width:100%;height:300px;"><?php echo $$a8_name ?></textarea> + <textarea name="<?php echo $a8_name ?>" class="editor"><?php echo $$a8_name ?></textarea> <?php } else @@ -2014,11 +2017,12 @@ document.forms[0].<?php echo $a7_field ?>.select(); ><?php $a8_class='text';$a8_default='';$a8_type='text';$a8_name='linkurl';$a8_size='40';$a8_maxlength='256';$a8_onchange='';$a8_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a8_readonly=true; if ($a8_readonly && empty($$a8_name)) $$a8_name = '- '.lang('EMPTY').' -'; if(!isset($a8_default)) $a8_default=''; + $tmp_value = Text::encodeHtml(isset($$a8_name)?$$a8_name:$a8_default); ?><?php if (!$a8_readonly || $a8_type=='hidden') { -?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a8_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" name="<?php echo $a8_name ?><?php if ($a8_readonly) echo '_disabled' ?>" type="<?php echo $a8_type ?>" size="<?php echo $a8_size ?>" maxlength="<?php echo $a8_maxlength ?>" class="<?php echo $a8_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a8_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a8_readonly) { -?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo isset($$a8_name)?$$a8_name:$a8_default ?>" /><?php - } } else { ?><span class="<?php echo $a8_class ?>"><?php echo isset($$a8_name)?$$a8_name:$a8_default ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?></td></tr><?php } ?><?php } ?><?php $a4_equals='list';$a4_value=$type; ?><?php +?><input type="hidden" id="id_<?php echo $a8_name ?>" name="<?php echo $a8_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a8_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a8_class,$a8_default,$a8_type,$a8_name,$a8_size,$a8_maxlength,$a8_onchange,$a8_readonly) ?></td></tr><?php } ?><?php } ?><?php $a4_equals='list';$a4_value=$type; ?><?php $a4_tmp_exec = $a4_equals == $a4_value; $a4_tmp_last_exec = $a4_tmp_exec; if ( $a4_tmp_exec ) @@ -2208,11 +2212,12 @@ else ?><input type="hidden" name="<?php echo $a7_name ?>" value="<?php echo $a7_tmp_value ?>" /><?php unset($a7_name,$a7_default) ?><?php $a7_class='text';$a7_default='';$a7_type='text';$a7_name='number';$a7_size='15';$a7_maxlength='20';$a7_onchange='';$a7_readonly=false; ?><?php if ($this->isEditable() && !$this->isEditMode()) $a7_readonly=true; if ($a7_readonly && empty($$a7_name)) $$a7_name = '- '.lang('EMPTY').' -'; if(!isset($a7_default)) $a7_default=''; + $tmp_value = Text::encodeHtml(isset($$a7_name)?$$a7_name:$a7_default); ?><?php if (!$a7_readonly || $a7_type=='hidden') { -?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border-rightx:10px solid red; background-colorx:yellow; border:2px dashed red;"' ?> /><?php +?><input<?php if ($a7_readonly) echo ' disabled="true"' ?> id="id_<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" name="<?php echo $a7_name ?><?php if ($a7_readonly) echo '_disabled' ?>" type="<?php echo $a7_type ?>" size="<?php echo $a7_size ?>" maxlength="<?php echo $a7_maxlength ?>" class="<?php echo $a7_class ?>" value="<?php echo $tmp_value ?>" <?php if (in_array($a7_name,$errors)) echo 'style="border:2px dashed red;"' ?> /><?php if ($a7_readonly) { -?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo isset($$a7_name)?$$a7_name:$a7_default ?>" /><?php - } } else { ?><span class="<?php echo $a7_class ?>"><?php echo isset($$a7_name)?$$a7_name:$a7_default ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_field='number'; ?><?php +?><input type="hidden" id="id_<?php echo $a7_name ?>" name="<?php echo $a7_name ?>" value="<?php echo $tmp_value ?>" /><?php + } } else { ?><span class="<?php echo $a7_class ?>"><?php echo $tmp_value ?></span><?php } ?><?php unset($a7_class,$a7_default,$a7_type,$a7_name,$a7_size,$a7_maxlength,$a7_onchange,$a7_readonly) ?><?php $a7_field='number'; ?><?php if (isset($errors[0])) $a7_field = $errors[0]; ?><script name="JavaScript" type="text/javascript"><!-- document.forms[0].<?php echo $a7_field ?>.focus(); diff --git a/themes/default/pages/html/pageelement/export.tpl.php b/themes/default/pages/html/pageelement/export.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='export';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='a'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/pageelement/import.tpl.php b/themes/default/pages/html/pageelement/import.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='import';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='a'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/pageelement/link.tpl.php b/themes/default/pages/html/pageelement/link.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='element';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/pageelement/prop.tpl.php b/themes/default/pages/html/pageelement/prop.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_icon='folder';$a3_widths='40%,60%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) @@ -537,8 +538,25 @@ switch( $a7_type ) $base = defined('OR_BASE_URL')?slashify(OR_BASE_URL).'editor/editor/':'./editor/editor/'; $editor->basePath = $base; $editor->config['skin' ] = 'v2'; - $editor->config['filebrowserUploadUrl' ] = './'.OR_EXT_CONTROLLER_FILE.'.php?action=filemanager&subaction=connector&Command=DirectUpload&CurrentFolder=/&Type=File&'.REQ_PARAM_TOKEN.'='.token(); - $editor->config['filebrowserBrowseUrl' ] = str_replace('&','&',Html::url('filemanager','browse','-',array('oid'=>'',REQ_PARAM_TOKEN=>token()) )); + $editor->config['language' ] = config('language','language_code'); + $editor->config['toolbar' ] = 'Openrat'; + $editor->config['toolbar_Openrat' ] = array( + array('Save','Preview','-'/*,'Templates'*/), + array('Cut','Copy','Paste','PasteText','PasteFromWord','-','Print', 'SpellChecker', 'Scayt'), + array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'), + array('Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton', 'HiddenField'), + '/', + array('Bold','Italic',/*'Underline',*/'Strike','-','Subscript','Superscript'), + array('NumberedList','BulletedList','-','Outdent','Indent','Blockquote'), + array('JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'), + array('Link','Unlink','Anchor'), + array('Image','Flash','Table','HorizontalRule','SpecialChar','PageBreak'), + '/', + array(/*'Styles',*/'Format','Font','FontSize'), + array('TextColor','BGColor'), + array('Source','-', 'ShowBlocks','Maximize') ); + $editor->config['filebrowserUploadUrl' ] = str_replace('&','&',Html::url('filebrowser','directupload','-',array(REQ_PARAM_TOKEN=>token(),'name'=>'upload'))); + $editor->config['filebrowserBrowseUrl' ] = str_replace('&','&',Html::url('filebrowser','browse','-')); $editor->editor($a7_name,$$a7_name); } else @@ -644,7 +662,7 @@ function table() </tr> </table> <fieldset><legend><?php echo langHtml('CONTENT') ?></legend></fieldset> - <textarea name="<?php echo $a7_name ?>" class="editor" style="width:100%;height:300px;"><?php echo $$a7_name ?></textarea> + <textarea name="<?php echo $a7_name ?>" class="editor"><?php echo $$a7_name ?></textarea> <?php } else diff --git a/themes/default/pages/html/profile/confirmmail.tpl.php b/themes/default/pages/html/profile/confirmmail.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_title='GLOBAL_password';$a3_name='login';$a3_icon='user';$a3_widths='50%,50%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/profile/edit.tpl.php b/themes/default/pages/html/profile/edit.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='user_profile';$a3_icon='user';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/profile/groups.tpl.php b/themes/default/pages/html/profile/groups.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='user_groups';$a2_icon='user';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/profile/mail.tpl.php b/themes/default/pages/html/profile/mail.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='user_profile';$a3_icon='user';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/profile/pwchange.tpl.php b/themes/default/pages/html/profile/pwchange.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='user_profile';$a3_icon='user';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/profile/settings.tpl.php b/themes/default/pages/html/profile/settings.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/project/add.tpl.php b/themes/default/pages/html/project/add.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROJECTS';$a3_icon='project';$a3_widths='20px,20%,80%';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/project/edit.tpl.php b/themes/default/pages/html/project/edit.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROJECT';$a3_icon='project';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/project/export.tpl.php b/themes/default/pages/html/project/export.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROJECT';$a3_icon='project';$a3_widths='30%,70%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/project/info.tpl.php b/themes/default/pages/html/project/info.tpl.php @@ -32,7 +32,8 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='GLOBAL_PROJECT';$a2_icon='project';$a2_widths='20%,80%';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a2_widths); + $icon=$a2_icon; + $coldumn_widths = explode(',',$a2_widths); $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -51,7 +52,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -59,7 +60,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/project/listing.tpl.php b/themes/default/pages/html/project/listing.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='GLOBAL_PROJECTS';$a2_icon='project';$a2_width='70%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) @@ -186,7 +187,7 @@ $tmp_tag = 'span'; ?><<?php echo $tmp_tag ?> class="<?php echo $a7_class ?>" title="<?php echo $a7_title ?>"><?php $langF = $a7_escape?'langHtml':'lang'; - $tmp_text = $a7_value; + $tmp_text = $a7_escape?htmlentities($a7_value):$a7_value; $tmp_text = Text::maxLength( $tmp_text,intval($a7_maxlength),'..',constant('STR_PAD_'.strtoupper($a7_cut)) ); $tmp_text = nl2br($tmp_text); echo $tmp_text; diff --git a/themes/default/pages/html/project/maintenance.tpl.php b/themes/default/pages/html/project/maintenance.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROJECT';$a3_icon='project';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/project/remove.tpl.php b/themes/default/pages/html/project/remove.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROJECT';$a3_icon='group';$a3_widths='20%,80%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$a3_icon; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/search/content.tpl.php b/themes/default/pages/html/search/content.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_icon='search';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/search/prop.tpl.php b/themes/default/pages/html/search/prop.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_icon='search';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/search/result.tpl.php b/themes/default/pages/html/search/result.tpl.php @@ -32,7 +32,8 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_icon='search';$a2_widths='70%,30%';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a2_widths); + $icon=$a2_icon; + $coldumn_widths = explode(',',$a2_widths); $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -51,7 +52,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -59,7 +60,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/add.tpl.php b/themes/default/pages/html/template/add.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_TEMPLATES';$a3_widths='10px,40px';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/addel.tpl.php b/themes/default/pages/html/template/addel.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_TEMPLATES';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/el.tpl.php b/themes/default/pages/html/template/el.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='TEMPLATE_ELEMENTS';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/extension.tpl.php b/themes/default/pages/html/template/extension.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROP';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/listing.tpl.php b/themes/default/pages/html/template/listing.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='GLOBAL_TEMPLATES';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/name.tpl.php b/themes/default/pages/html/template/name.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_PROP';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/pages.tpl.php b/themes/default/pages/html/template/pages.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_name='pages';$a2_icon='template';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a2_icon; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/remove.tpl.php b/themes/default/pages/html/template/remove.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_icon='template';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/template/srcelement.tpl.php b/themes/default/pages/html/template/srcelement.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_widths='10px,150px';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/user/add.tpl.php b/themes/default/pages/html/user/add.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_USERS';$a3_icon='user';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$a3_icon; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/user/edit.tpl.php b/themes/default/pages/html/user/edit.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_USER';$a3_widths='50%,50%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/user/groups.tpl.php b/themes/default/pages/html/user/groups.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='USER_MEMBERSHIPS';$a3_widths='5%,95%';$a3_width='70%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/user/pw.tpl.php b/themes/default/pages/html/user/pw.tpl.php @@ -62,6 +62,7 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='USER_PASSWORD';$a3_width='93%';$a3_rowclasses='rx';$a3_columnclasses='fx'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -80,7 +81,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -88,7 +89,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/user/remove.tpl.php b/themes/default/pages/html/user/remove.tpl.php @@ -62,7 +62,8 @@ echo '<input type="hidden" name="'.session_name().'" value="'.session_id().'" />'."\n"; ?><?php unset($a2_name,$a2_target,$a2_method,$a2_enctype) ?><?php $a3_name='GLOBAL_USER';$a3_widths='30%,70%';$a3_width='93%';$a3_rowclasses='odd,even';$a3_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); - $column_widths = explode(',',$a3_widths); + $icon=$actionName; + $coldumn_widths = explode(',',$a3_widths); $row_classes = explode(',',$a3_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a3_columnclasses); @@ -81,7 +82,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -89,7 +90,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement) diff --git a/themes/default/pages/html/user/rights.tpl.php b/themes/default/pages/html/user/rights.tpl.php @@ -32,6 +32,7 @@ <body class="main" <?php if (@$conf['interface']['application_mode']) { ?> style="padding:0px;margin:0px;"<?php } ?> > <?php /* Debug-Information */ if ($showDuration) { echo "<!-- Output Variables are:\n";echo str_replace('-->','-- >',print_r($this->templateVars,true));echo "\n-->";} ?><?php unset($a1_class) ?><?php $a2_title='ACL';$a2_name='x';$a2_width='93%';$a2_rowclasses='odd,even';$a2_columnclasses='1,2,3'; ?><?php $coloumn_widths=array(); + $icon=$actionName; $row_classes = explode(',',$a2_rowclasses); $row_class_idx = 999; $column_classes = explode(',',$a2_columnclasses); @@ -50,7 +51,7 @@ if (!@$conf['interface']['application_mode'] ) { echo '<tr class="title"><td>'; - echo '<img src="'.$image_dir.'icon_'.$actionName.IMG_ICON_EXT.'" align="left" border="0">'; + echo '<img src="'.$image_dir.'icon_'.$icon.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 } @@ -58,7 +59,7 @@ ?><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /> <?php } else { ?><a href="<?php echo Html::url($actionName,$subActionName,$this->getRequestId(),array('mode'=>'edit') ) ?>" accesskey="1" title="<?php echo langHtml('MODE_SHOW_DESC') ?>" class="path" style="text-align:right;font-weight:bold;font-weight:bold;"><img src="<?php echo $image_dir ?>readonly.png" style="vertical-align:top; " border="0" /></a> <?php } ?><?php } - echo '<span class="path">'.langHtml('GLOBAL_'.$actionName).'</span> <strong>»</strong> '; + echo '<span class="path">'.langHtml($actionName).'</span> <strong>»</strong> '; if ( !isset($path) || is_array($path) ) $path = array(); foreach( $path as $pathElement)