Index: branches/5.0.x/core/admin_templates/stylesheets/stylesheets_edit_base.tpl =================================================================== diff -u -N -r12117 -r12707 --- branches/5.0.x/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/stylesheets/stylesheets_edit_base.tpl (.../stylesheets_edit_base.tpl) (revision 12707) @@ -88,7 +88,7 @@ - + Index: branches/5.0.x/core/admin_templates/stylesheets/stylesheets_edit_block.tpl =================================================================== diff -u -N -r12117 -r12707 --- branches/5.0.x/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/stylesheets/stylesheets_edit_block.tpl (.../stylesheets_edit_block.tpl) (revision 12707) @@ -96,7 +96,7 @@ - + Index: branches/5.0.x/core/admin_templates/categories/ci_blocks.tpl =================================================================== diff -u -N -r12570 -r12707 --- branches/5.0.x/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 12570) +++ branches/5.0.x/core/admin_templates/categories/ci_blocks.tpl (.../ci_blocks.tpl) (revision 12707) @@ -26,7 +26,7 @@ - + @@ -36,7 +36,7 @@ - + Index: branches/5.0.x/core/admin_templates/incs/menu_blocks.tpl =================================================================== diff -u -N -r12117 -r12707 --- branches/5.0.x/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/incs/menu_blocks.tpl (.../menu_blocks.tpl) (revision 12707) @@ -1,5 +1,5 @@ - - $Menus[''+'_sorting_menu'].addItem(rs('.sort.'), '','javascript:direct_sort_grid("","","", null, );',['img/menu_dot.gif']); + + $Menus[''+'_sorting_menu'].addItem(rs('.sort.'), '','javascript:direct_sort_grid("","","", null, );',['img/menu_dot.gif']); @@ -14,7 +14,7 @@ $Menus[''].addSeparator(); - + // define ViewMenu @@ -46,11 +46,11 @@ $Menus[''+'_sorting_menu'].applyBorder(false, false, false, false); $Menus[''+'_sorting_menu'].dropShadow("none"); $Menus[''+'_sorting_menu'].showIcon = true; - $Menus[''+'_sorting_menu'].addItem(rs('.sort.asc'), '','javascript:direct_sort_grid("","","asc",null,);',['img/menu_dot.gif']); - $Menus[''+'_sorting_menu'].addItem(rs('.sort.desc'), '','javascript:direct_sort_grid("","","desc",null,);',['img/menu_dot.gif']); + $Menus[''+'_sorting_menu'].addItem(rs('.sort.asc'), '','javascript:direct_sort_grid("","","asc",null,);',['img/menu_dot.gif']); + $Menus[''+'_sorting_menu'].addItem(rs('.sort.desc'), '','javascript:direct_sort_grid("","","desc",null,);',['img/menu_dot.gif']); $Menus[''+'_sorting_menu'].addSeparator(); $Menus[''+'_sorting_menu'].addItem(rs('.sort.def'), '','javascript:reset_sorting("", );'); - + Index: branches/5.0.x/core/kernel/db/db_tag_processor.php =================================================================== diff -u -N -r12511 -r12707 --- branches/5.0.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 12511) +++ branches/5.0.x/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 12707) @@ -1,6 +1,6 @@ GetList($params); - return $this->Application->RecallVar($list->getPrefixSpecial().'_search_keyword'); + + return $this->Application->RecallVar($list->getPrefixSpecial() . '_search_keyword'); } /** @@ -731,7 +732,10 @@ { $field = $this->SelectParam($params, 'name,field'); - if( !$this->Application->IsAdmin() ) $params['no_special'] = 'no_special'; + if( !$this->Application->IsAdmin() ) { + // apply htmlspecialchars on all field values on Front-End + $params['no_special'] = 'no_special'; + } $object =& $this->getObject($params); @@ -770,6 +774,7 @@ } if (!array_key_exists('no_special', $params) || !$params['no_special']) { + // when no_special parameter NOT SET apply htmlspecialchars $value = htmlspecialchars($value); } Index: branches/5.0.x/core/admin_templates/user_selector.tpl =================================================================== diff -u -N -r12117 -r12707 --- branches/5.0.x/core/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/user_selector.tpl (.../user_selector.tpl) (revision 12707) @@ -45,8 +45,9 @@ - + + Index: branches/5.0.x/core/admin_templates/modules/modules_list.tpl =================================================================== diff -u -N -r12117 -r12707 --- branches/5.0.x/core/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/modules/modules_list.tpl (.../modules_list.tpl) (revision 12707) @@ -54,7 +54,7 @@
- + Index: branches/5.0.x/core/admin_templates/groups/groups_edit_users.tpl =================================================================== diff -u -N -r12117 -r12707 --- branches/5.0.x/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 12117) +++ branches/5.0.x/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 12707) @@ -78,7 +78,7 @@ - + Index: branches/5.0.x/core/admin_templates/users/users_edit_groups.tpl =================================================================== diff -u -N -r12495 -r12707 --- branches/5.0.x/core/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 12495) +++ branches/5.0.x/core/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 12707) @@ -86,7 +86,7 @@ - + Index: branches/5.0.x/core/units/categories/categories_tag_processor.php =================================================================== diff -u -N -r12703 -r12707 --- branches/5.0.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 12703) +++ branches/5.0.x/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 12707) @@ -1,6 +1,6 @@ Special != '') { + return $this->Special; + } + if ( isset($params['parent_cat_id']) ) { $parent_cat_id = $params['parent_cat_id']; } @@ -395,9 +399,6 @@ } } - $no_special = isset($params['no_special']) && $params['no_special']; - if ($no_special) return $this->Special; - $list_unique_key = $this->getUniqueListKey($params); // check for "admin" variable, because we are parsing front-end template from admin when using template editor feature if ($this->Application->GetVar('admin') || !$this->Application->IsAdmin()) { @@ -638,22 +639,6 @@ return $object->NoFilterCount != $object->RecordsCount ? $object->RecordsCount.' / '.$object->NoFilterCount : $object->RecordsCount; } - /** - * Print grid pagination using - * block names specified - * - * @param Array $params - * @return string - * @access public - */ - function PrintPages($params) - { - if ($this->Application->Parser->GetParam('no_special')) { - $params['no_special'] = $this->Application->Parser->GetParam('no_special'); - } - return parent::PrintPages($params); - } - function InitCatalog($params) { $tab_prefixes = $this->Application->GetVar('tp'); // {all, , none} Index: branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -N -r12542 -r12707 --- branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 12542) +++ branches/5.0.x/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 12707) @@ -245,11 +245,11 @@ " id="" value=""> - + - + error-cell"> *:
@@ -514,11 +514,11 @@ - +
- : ( - ) + : ( - ) @@ -529,7 +529,7 @@
- + @@ -605,7 +605,6 @@ limited_heights="false" max_row_height="45" grid_height="auto" - no_special="0" selector="checkbox" grid_status="1" totals_render_as="" @@ -631,7 +630,7 @@
- + @@ -688,7 +687,6 @@ grid_height="auto" grid_status="1" ajax="1" totals_render_as="" - no_special="0" selector="checkbox" mouseover_class="grid-data-row-mouseover" selected_class="grid-data-row-selected:grid-data-row-even-selected" tag_name="tr" > @@ -699,38 +697,38 @@ GridScrollers[''].Spacer = 'img/spacer.gif'; GridScrollers[''].LeftCells = ; GridScrollers[''].BottomOffset = 300; - GridScrollers[''].MinWidths = [, ]; + GridScrollers[''].MinWidths = [, ]; GridScrollers[''].PickerCRC = ''; GridScrollers[''].LimitedHeights = ; GridScrollers[''].MaxRowHeight = ; GridScrollers[''].SetHeader( [ - [' ', ], - [' ', ] + [' ', ], + [' ', ] ] ) - GridScrollers[''].FieldNames = ['_CheckboxColumn', ]; + GridScrollers[''].FieldNames = ['_CheckboxColumn', ]; GridScrollers[''].SetData( [ { 'row_class': '', - 'data': ['',] + 'data': ['',] }, - + - + ] ) GridScrollers[''].IDs = [ '_', - + ] Index: branches/5.0.x/core/admin_templates/users/admins_edit_groups.tpl =================================================================== diff -u -N -r12495 -r12707 --- branches/5.0.x/core/admin_templates/users/admins_edit_groups.tpl (.../admins_edit_groups.tpl) (revision 12495) +++ branches/5.0.x/core/admin_templates/users/admins_edit_groups.tpl (.../admins_edit_groups.tpl) (revision 12707) @@ -85,7 +85,7 @@
<inp2:m_Phrase name='la_col_SortBy' no_editing='1' html_escape='1'/> <inp2:m_if check='m_Param' name='use_phrases'><inp2:m_Phrase name='$title' no_editing='1' html_escape='1'/><inp2:m_else/><inp2:m_Param name='title'/></inp2:m_if>
- + Index: branches/5.0.x/core/admin_templates/categories/xml/categories_list.tpl =================================================================== diff -u -N --- branches/5.0.x/core/admin_templates/categories/xml/categories_list.tpl (revision 12117) +++ branches/5.0.x/core/admin_templates/categories/xml/categories_list.tpl (revision 0) @@ -1,82 +0,0 @@ - - - - - - - - - - , '');"> - - ( / ) - - - - - - - - -  * - - -var catalog_height = $Catalog.BottomVisible ? 200 : 'auto'; - - - - - - - -Grids['c'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6')); - -// substiture form action, like from was created from here -document.getElementById('categories_form').action = ''; -$Catalog.setItemCount('c', ''); - -document.getElementById('top_pagination_bar[c]').innerHTML = ''; - -$Catalog.ParentCategoryID = ; -document.getElementById('c_search_warning').style.display = 'blocknone'; -document.getElementById('c_search_keyword').value = ''; -set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') ); - - - - - - - );"> - - - - - -setInnerHTML('category_path', ''); - - a_toolbar.DisableButton('upcat'); - a_toolbar.DisableButton('homecat'); - - a_toolbar.EnableButton('upcat'); - a_toolbar.EnableButton('homecat'); - - - Grids['c'].DblClick = function() {return false}; - -$Catalog.reflectPasteButton(); - - - alert(''); - - - -#separator# - - - \ No newline at end of file Index: branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl =================================================================== diff -u -N -r12506 -r12707 --- branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl (.../change_log_list.tpl) (revision 12506) +++ branches/5.0.x/core/admin_templates/logs/change_logs/change_log_list.tpl (.../change_log_list.tpl) (revision 12707) @@ -67,7 +67,7 @@ - + Index: branches/5.0.x/core/admin_templates/catalog_tab.tpl =================================================================== diff -u -N -r12230 -r12707 --- branches/5.0.x/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 12230) +++ branches/5.0.x/core/admin_templates/catalog_tab.tpl (.../catalog_tab.tpl) (revision 12707) @@ -41,7 +41,7 @@ - +