Index: core/admin_templates/catalog_tab.tpl
===================================================================
--- core/admin_templates/catalog_tab.tpl (revision 12650)
+++ core/admin_templates/catalog_tab.tpl (working copy)
@@ -41,7 +41,7 @@
<inp2:m_RenderElement name="structure_reload_element"/>
- <inp2:m_DefineElement name="grid_parent_category_td" format="" no_special="">
+ <inp2:m_DefineElement name="grid_parent_category_td" format="">
<inp2:Field name="ParentId" result_to_var="item_category" db="db"/>
<inp2:m_if check="m_Get" name="type" equals_to="item_selector">
Index: core/admin_templates/categories/ci_blocks.tpl
===================================================================
--- core/admin_templates/categories/ci_blocks.tpl (revision 12650)
+++ core/admin_templates/categories/ci_blocks.tpl (working copy)
@@ -26,7 +26,7 @@
<inp2:m_RenderElement name="status_mark" field="IsHot" type="hot" PrefixSpecial="$PrefixSpecial"/>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_primary_category_td" format="" no_special="">
+<inp2:m_DefineElement name="grid_primary_category_td" format="">
<inp2:Field name="CategoryId" db="db" result_to_var="item_category"/>
<inp2:m_if check="m_Get" name="type" equals_to="item_selector">
@@ -36,7 +36,7 @@
</inp2:m_if>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_category_td" format="" no_special="">
+<inp2:m_DefineElement name="grid_category_td" format="">
<td valign="top" class="text">
<inp2:CategoryName />
</td>
Index: core/admin_templates/categories/xml/categories_list.tpl
===================================================================
--- core/admin_templates/categories/xml/categories_list.tpl (revision 12650)
+++ core/admin_templates/categories/xml/categories_list.tpl (working copy)
@@ -1,82 +1 @@
-<inp2:lang.current_Field name="Charset" result_to_var="charset"/>
-<inp2:m_Header data="Content-type: text/plain; charset=$charset"/>
-<inp2:m_include t="incs/blocks"/>
-<inp2:m_include t="incs/in-portal"/>
-<inp2:m_include t="categories/ci_blocks"/>
-
-<inp2:c_InitList grid="Structure" no_special="1"/>
-
-<inp2:m_DefineElement name="page_entercat_td" format="" no_special="">
- <a href="javascript:$Catalog.go_to_cat(<inp2:m_get name="c_id"/>, '<inp2:GetModulePrefix/>');">
- <inp2:m_Phrase label="lu_ViewSubPages"/>
- </a> <span class="small-statistics">(<inp2:SubCatCount/> / <inp2:ItemCount/>)</span>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="page_browse_td" format="" no_special="">
- <a href="<inp2:PageBrowseLink/>"><inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/></a>
-
- <!--
- <span class="priority">
- <inp2:m_if check="FieldEquals" field="Priority" value="0" inverse="inverse">
- <sup><inp2:Field field="Priority"/></sup>
- </inp2:m_if>
- </span>-->
-
- <inp2:m_if check="Field" field="IsSystem">
- <span class="field-required"> *</span>
- </inp2:m_if>
-</inp2:m_DefineElement>
-var catalog_height = $Catalog.BottomVisible ? 200 : 'auto';
-
-<inp2:m_if check="m_GetEquals" name="tm" value="single">
- <inp2:m_RenderElement name="grid_js" PrefixSpecial="c" IdField="CategoryId" grid="Structure" grid_height="catalog_height" no_special="1" grid_status="0" menu_filters="yes" selector="radio"/>
-<inp2:m_else/>
- <inp2:m_RenderElement name="grid_js" PrefixSpecial="c" IdField="CategoryId" grid="Structure" grid_height="catalog_height" no_special="1" grid_status="0" menu_filters="yes"/>
-</inp2:m_if>
-
-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 = '<inp2:m_t pass="all" js_escape="1"/>';
-$Catalog.setItemCount('c', '<inp2:c_TotalRecords no_special="1"/>');
-
-document.getElementById('top_pagination_bar[c]').innerHTML = '<inp2:m_RenderElement name="grid_pagination_elem" PrefixSpecial="c" no_special="1" ajax="1" js_escape="1"/>';
-
-$Catalog.ParentCategoryID = <inp2:c_GetParentCategory/>;
-document.getElementById('c_search_warning').style.display = '<inp2:m_if check="m_RecallEquals" var="c_search_keyword" value="" inverse="inverse">block<inp2:m_else/>none</inp2:m_if>';
-document.getElementById('c_search_keyword').value = '<inp2:c_SearchKeyword no_special="1" js_escape="1"/>';
-set_window_title( RemoveTranslationLink(document.getElementById('blue_bar').innerHTML, false).replace(/(<[^<]+>)/g, '') );
-<inp2:m_DefineElement name="category_caption">
- <span class="nav_current_item">
- <inp2:m_ifnot check="c_HomeCategory" equals_to="$cat_id">
- <inp2:m_param name="separator"/>
- </inp2:m_ifnot>
- <inp2:m_if check="m_ParamEquals" name="current" value="1" inverse="1">
- <a class="control_link" href="javascript:$Catalog.go_to_cat(<inp2:m_param name="cat_id"/>);"><inp2:m_param name="cat_name"/></a>
- <inp2:m_else/>
- <inp2:m_param name="cat_name"/>
- </inp2:m_if>
- </span>
-</inp2:m_DefineElement>
-setInnerHTML('category_path', '<inp2:c_CategoryPath separator=">" render_as="category_caption" js_escape="1"/>');
-<inp2:m_if check="m_GetEquals" name="m_cat_id" value="0">
- a_toolbar.DisableButton('upcat');
- a_toolbar.DisableButton('homecat');
-<inp2:m_else/>
- a_toolbar.EnableButton('upcat');
- a_toolbar.EnableButton('homecat');
-</inp2:m_if>
-<inp2:m_if check="m_GetEquals" name="tm" value="single">
- Grids['c'].DblClick = function() {return false};
-</inp2:m_if>
-$Catalog.reflectPasteButton(<inp2:c_HasClipboard/>);
-
-<inp2:m_if check="m_Recall" name="root_delete_error">
- alert('<inp2:m_Phrase name="la_error_RootCategoriesDelete"/>');
- <inp2:m_RemoveVar name="root_delete_error"/>
-</inp2:m_if>
-
-#separator#
-<inp2:c_UpdateLastTemplate template="catalog/catalog"/>
-
-<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="c" IdField="CategoryId" grid="Structure" no_special="1" grid_status="0" menu_filters="yes"/>
\ No newline at end of file
+<!-- DELETE ME, BECAUSE I'M NO LONGER USED -->
\ No newline at end of file
Index: core/admin_templates/groups/groups_edit_users.tpl
===================================================================
--- core/admin_templates/groups/groups_edit_users.tpl (revision 12650)
+++ core/admin_templates/groups/groups_edit_users.tpl (working copy)
@@ -78,7 +78,7 @@
</tbody>
</table>
-<inp2:m_DefineElement name="grid_membership_td">
+<inp2:m_DefineElement name="grid_membership_td" no_special="">
<inp2:m_if check="Field" name="$field" db="db">
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
<inp2:m_else/>
Index: core/admin_templates/incs/grid_blocks.tpl
===================================================================
--- core/admin_templates/incs/grid_blocks.tpl (revision 12650)
+++ core/admin_templates/incs/grid_blocks.tpl (working copy)
@@ -245,11 +245,11 @@
<input type="hidden" name="<inp2:InputName field="{$field}_time"/>" id="<inp2:InputName field="{$field}_time" input_format="1"/>" value="">
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_data_label_td" >
+<inp2:m_DefineElement name="grid_data_label_td">
<inp2:Field field="$field" grid="$grid" plus_or_as_label="1" no_special="no_special" format="$format"/>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_data_label_ml_td" format="" >
+<inp2:m_DefineElement name="grid_data_label_ml_td" format="">
<span class="<inp2:m_if check="{$SourcePrefix}_HasError" field="$virtual_field">error-cell</inp2:m_if>">
<inp2:{$PrefixSpecial}_Field field="$field" grid="$grid" as_label="1" no_special="no_special" format="$format"/>
</span><inp2:m_if check="{$SourcePrefix}_IsRequired" field="$virtual_field"><span class="field-required"> *</span></inp2:m_if>:<br />
@@ -514,11 +514,11 @@
</script>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_status" no_special="0" pagination="1">
+<inp2:m_DefineElement name="grid_status" pagination="1">
<table class="grid-status-bar">
<tr>
<td nowrap="nowrap" style="vertical-align: middle;">
- <inp2:m_Phrase label="la_Records"/>: <inp2:GridInfo type="filtered" no_special="$no_special"/> (<inp2:GridInfo type="from" no_special="$no_special"/> - <inp2:GridInfo type="to" no_special="$no_special"/>) <inp2:m_Phrase label="la_OutOf"/> <inp2:GridInfo type="total" no_special="$no_special"/>
+ <inp2:m_Phrase label="la_Records"/>: <inp2:GridInfo type="filtered"/> (<inp2:GridInfo type="from"/> - <inp2:GridInfo type="to"/>) <inp2:m_Phrase label="la_OutOf"/> <inp2:GridInfo type="total"/>
</td>
<td align="right" class="tablenav" valign="middle">
<inp2:m_if check="m_Param" name="pagination">
@@ -529,7 +529,7 @@
</table>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_column_title_html" no_special="0">
+<inp2:m_DefineElement name="grid_column_title_html">
<table style="width: auto" class="layout-only-table"><tr>
<td style="vertical-align: middle; padding: 0px">
<a
@@ -538,7 +538,7 @@
title="<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>">
<img
alt="<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>"
- src="img/list_arrow_<inp2:Order field='$sort_field' no_special='$no_special'/>.gif" width="15" height="15" border="0" align="absmiddle"
+ src="img/list_arrow_<inp2:Order field='$sort_field'/>.gif" width="15" height="15" border="0" align="absmiddle"
/>
</a>
</td>
@@ -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 @@
<div id="grid_<inp2:m_Param name='PrefixSpecial'/>_container"></div>
<inp2:m_if check="m_Param" name="grid_status">
- <inp2:m_RenderElement name="grid_status" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" no_special="$no_special" search="$search" ajax="$ajax"/>
+ <inp2:m_RenderElement name="grid_status" grid="$grid" PrefixSpecial="$PrefixSpecial" main_special="$main_special" search="$search" ajax="$ajax"/>
</inp2:m_if>
<inp2:m_if check="m_ParamEquals" name="ajax" value="0">
@@ -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,30 +697,30 @@
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].Spacer = 'img/spacer.gif';
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].LeftCells = <inp2:FreezerPosition grid="$grid"/>;
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].BottomOffset = <inp2:m_if check="m_Param" name="grid_status">30<inp2:m_else/>0</inp2:m_if>;
- GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].MinWidths = [<inp2:GridSelectorColumnWidth selector="$selector" icon_width="20" selector_width="30" grid="$grid"/>, <inp2:IterateGridFields grid="$grid" mode="width" block="grid_js_width_td" ajax="$ajax" no_special="$no_special"/>];
+ GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].MinWidths = [<inp2:GridSelectorColumnWidth selector="$selector" icon_width="20" selector_width="30" grid="$grid"/>, <inp2:IterateGridFields grid="$grid" mode="width" block="grid_js_width_td" ajax="$ajax"/>];
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].PickerCRC = '<inp2:PickerCRC grid="$grid"/>';
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].LimitedHeights = <inp2:m_param name="limited_heights"/>;
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].MaxRowHeight = <inp2:m_param name="max_row_height"/>;
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SetHeader(
[
- [' <inp2:m_RenderElement name="default_sorting_element" prefix="$PrefixSpecial" ajax="$ajax" js_escape="1" strip_nl="2"/>', <inp2:IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax" no_special="$no_special"/>],
- ['<inp2:m_if check="m_Param" name="selector" equals_to="checkbox"><inp2:m_RenderElement name="grid_select_all_checkbox_html" pass_params="1" js_escape="1"/><inp2:m_else/> </inp2:m_if>', <inp2:IterateGridFields grid="$grid" mode="filter" force_block="grid_js_filter_block" ajax="$ajax" no_special="$no_special"/>]
+ [' <inp2:m_RenderElement name="default_sorting_element" prefix="$PrefixSpecial" ajax="$ajax" js_escape="1" strip_nl="2"/>', <inp2:IterateGridFields grid="$grid" mode="header" block="$header_block" ajax="$ajax"/>],
+ ['<inp2:m_if check="m_Param" name="selector" equals_to="checkbox"><inp2:m_RenderElement name="grid_select_all_checkbox_html" pass_params="1" js_escape="1"/><inp2:m_else/> </inp2:m_if>', <inp2:IterateGridFields grid="$grid" mode="filter" force_block="grid_js_filter_block" ajax="$ajax"/>]
]
)
- GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].FieldNames = ['_CheckboxColumn', <inp2:IterateGridFields grid="$grid" mode="fields" no_special="$no_special"/>];
+ GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].FieldNames = ['_CheckboxColumn', <inp2:IterateGridFields grid="$grid" mode="fields"/>];
GridScrollers['<inp2:m_param name="PrefixSpecial"/>'].SetData(
[
<inp2:m_DefineElement name="js_row" td_style="" row_class_render_as="" selector_render_as="grid_selector_html" row_class="">
{ 'row_class': '<inp2:m_if check="m_Param" name="row_class_render_as"><inp2:m_RenderElement name="$row_class_render_as" PrefixSpecial="$PrefixSpecial" trim="1"/><inp2:m_else/><inp2:m_Param name="row_class"/></inp2:m_if>',
- 'data': ['<inp2:m_RenderElement name="$selector_render_as" pass_params="1" js_escape="1"/>',<inp2:IterateGridFields grid="$grid" mode="data" force_block="grid_js_data_td" no_special="$no_special"/>]
+ 'data': ['<inp2:m_RenderElement name="$selector_render_as" pass_params="1" js_escape="1"/>',<inp2:IterateGridFields grid="$grid" mode="data" force_block="grid_js_data_td"/>]
}<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table-color1"/>
<inp2:m_if check="UseItemIcons" grid="$grid">
- <inp2:PrintList block="js_row" selector_render_as="grid_selector_icon_html" per_page="$per_page" main_special="$main_special" no_special="$no_special" selector="$selector" grid="$grid"/>
+ <inp2:PrintList block="js_row" selector_render_as="grid_selector_icon_html" per_page="$per_page" main_special="$main_special" selector="$selector" grid="$grid"/>
<inp2:m_else/>
- <inp2:PrintList block="js_row" selector_render_as="grid_selector_html" per_page="$per_page" main_special="$main_special" no_special="$no_special" selector="$selector" grid="$grid"/>
+ <inp2:PrintList block="js_row" selector_render_as="grid_selector_html" per_page="$per_page" main_special="$main_special" selector="$selector" grid="$grid"/>
</inp2:m_if>
]
)
@@ -730,7 +728,7 @@
<inp2:m_DefineElement name="js_id">
'<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>'<inp2:m_if check="m_Param" name="is_last" inverse="1">,</inp2:m_if>
</inp2:m_DefineElement>
- <inp2:PrintList block="js_id" per_page="$per_page" main_special="$main_special" no_special="$no_special" />
+ <inp2:PrintList block="js_id" per_page="$per_page" main_special="$main_special"/>
]
<inp2:m_if check="m_Param" name="totals_render_as">
Index: core/admin_templates/incs/menu_blocks.tpl
===================================================================
--- core/admin_templates/incs/menu_blocks.tpl (revision 12650)
+++ core/admin_templates/incs/menu_blocks.tpl (working copy)
@@ -1,5 +1,5 @@
-<inp2:m_DefineElement name="nlsmenu_sort_block" no_special="0">
- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.<inp2:m_param name="sort_field"/>'), '<inp2:m_phrase name="$title" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:m_param name="sort_field"/>","<inp2:{$PrefixSpecial}_OrderInfo type="direction" pos="1" no_special="$no_special"/>", null, <inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" field="$sort_field" pos="1" no_special="$no_special">,['img/menu_dot.gif']</inp2:m_if>);
+<inp2:m_DefineElement name="nlsmenu_sort_block">
+ $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.<inp2:m_param name="sort_field"/>'), '<inp2:m_phrase name="$title" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:m_param name="sort_field"/>","<inp2:{$PrefixSpecial}_OrderInfo type="direction" pos="1"/>", null, <inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" field="$sort_field" pos="1">,['img/menu_dot.gif']</inp2:m_if>);
</inp2:m_DefineElement>
<inp2:m_DefineElement name="nlsmenu_filter_block">
@@ -14,7 +14,7 @@
$Menus['<inp2:m_Param name="menu_name"/>'].addSeparator();
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="nlsmenu_declaration" no_special="0" menu_columns="yes" menu_auto_refresh="yes" menu_filters="no" menu_sorting="yes" menu_perpage="yes" menu_select="yes" ajax="0">
+<inp2:m_DefineElement name="nlsmenu_declaration" menu_columns="yes" menu_auto_refresh="yes" menu_filters="no" menu_sorting="yes" menu_perpage="yes" menu_select="yes" ajax="0">
// define ViewMenu
<inp2:m_if check="m_ParamEquals" name="menu_auto_refresh" value="yes">
@@ -46,11 +46,11 @@
$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].applyBorder(false, false, false, false);
$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].dropShadow("none");
$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].showIcon = true;
- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.asc'), '<inp2:m_phrase name="la_common_ascending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" no_special="$no_special" pos="1"/>","asc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" no_special="$no_special" direction="asc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>);
- $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.desc'), '<inp2:m_phrase name="la_common_descending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" no_special="$no_special" pos="1"/>","desc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" no_special="$no_special" direction="desc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>);
+ $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.asc'), '<inp2:m_phrase name="la_common_ascending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","asc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="asc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>);
+ $Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.desc'), '<inp2:m_phrase name="la_common_descending" html_escape="1" js_escape="1"/>','javascript:direct_sort_grid("<inp2:m_param name="PrefixSpecial"/>","<inp2:{$PrefixSpecial}_OrderInfo type="field" pos="1"/>","desc",null,<inp2:m_param name="ajax"/>);'<inp2:m_if check="{$PrefixSpecial}_IsOrder" direction="desc" pos="1" >,['img/menu_dot.gif']</inp2:m_if>);
$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addSeparator();
$Menus['<inp2:m_param name="PrefixSpecial"/>'+'_sorting_menu'].addItem(rs('<inp2:m_param name="PrefixSpecial"/>.sort.def'), '<inp2:m_phrase name="la_Text_Default" html_escape="1" js_escape="1"/>','javascript:reset_sorting("<inp2:m_param name="PrefixSpecial"/>", <inp2:m_param name="ajax"/>);');
- <inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" force_block="nlsmenu_sort_block" no_special="$no_special" ajax="$ajax"/>
+ <inp2:{$PrefixSpecial}_IterateGridFields grid="$grid" mode="header" force_block="nlsmenu_sort_block" ajax="$ajax"/>
</inp2:m_if>
<inp2:m_if check="m_ParamEquals" name="menu_perpage" value="yes">
Index: core/admin_templates/logs/change_logs/change_log_list.tpl
===================================================================
--- core/admin_templates/logs/change_logs/change_log_list.tpl (revision 12650)
+++ core/admin_templates/logs/change_logs/change_log_list.tpl (working copy)
@@ -67,7 +67,7 @@
</inp2:m_if>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_changes_td" format="" no_special="" nl2br="" first_chars="" td_style="">
+<inp2:m_DefineElement name="grid_changes_td" format="" nl2br="" first_chars="" td_style="">
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="1" format="$format"/>
</inp2:m_DefineElement>
Index: core/admin_templates/modules/modules_list.tpl
===================================================================
--- core/admin_templates/modules/modules_list.tpl (revision 12650)
+++ core/admin_templates/modules/modules_list.tpl (working copy)
@@ -54,7 +54,7 @@
<inp2:m_Param name="error"/><br />
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_module_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
+<inp2:m_DefineElement name="grid_module_td" format="" nl2br="" first_chars="" td_style="" currency="">
<inp2:m_if check="ModuleLicensed">
<inp2:m_if check="PrerequisitesMet">
<inp2:m_if check="AlreadyInstalled">
Index: core/admin_templates/stylesheets/stylesheets_edit_base.tpl
===================================================================
--- core/admin_templates/stylesheets/stylesheets_edit_base.tpl (revision 12650)
+++ core/admin_templates/stylesheets/stylesheets_edit_base.tpl (working copy)
@@ -88,7 +88,7 @@
</tbody>
</table>
-<inp2:m_DefineElement name="grid_description_td">
+<inp2:m_DefineElement name="grid_description_td" no_special="">
<inp2:Field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/>
</inp2:m_DefineElement>
Index: core/admin_templates/stylesheets/stylesheets_edit_block.tpl
===================================================================
--- core/admin_templates/stylesheets/stylesheets_edit_block.tpl (revision 12650)
+++ core/admin_templates/stylesheets/stylesheets_edit_block.tpl (working copy)
@@ -96,7 +96,7 @@
</tbody>
</table>
-<inp2:m_DefineElement name="grid_description_td">
+<inp2:m_DefineElement name="grid_description_td" no_special="">
<inp2:Field field="$field" grid="$grid" no_special="$no_special" cut_first="100"/>
</inp2:m_DefineElement>
Index: core/admin_templates/user_selector.tpl
===================================================================
--- core/admin_templates/user_selector.tpl (revision 12650)
+++ core/admin_templates/user_selector.tpl (working copy)
@@ -45,8 +45,9 @@
</tbody>
</table>
-<inp2:m_DefineElement name="grid_login_td" format="" no_special="1" nl2br="" first_chars="" td_style="">
+<inp2:m_DefineElement name="grid_login_td" format="" nl2br="" no_special="1" first_chars="" td_style="">
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
+
<script type="text/javascript">
$user_logins[ <inp2:Field name="$IdField"/> ] = '<inp2:Field name="Login" js_ecape="1"/>';
</script>
Index: core/admin_templates/users/admins_edit_groups.tpl
===================================================================
--- core/admin_templates/users/admins_edit_groups.tpl (revision 12650)
+++ core/admin_templates/users/admins_edit_groups.tpl (working copy)
@@ -85,7 +85,7 @@
</tbody>
</table>
-<inp2:m_DefineElement name="grid_membership_td">
+<inp2:m_DefineElement name="grid_membership_td" no_special="">
<inp2:m_if check="Field" name="$field" db="db">
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
<inp2:m_else/>
Index: core/admin_templates/users/users_edit_groups.tpl
===================================================================
--- core/admin_templates/users/users_edit_groups.tpl (revision 12650)
+++ core/admin_templates/users/users_edit_groups.tpl (working copy)
@@ -86,7 +86,7 @@
</tbody>
</table>
-<inp2:m_DefineElement name="grid_membership_td">
+<inp2:m_DefineElement name="grid_membership_td" no_special="">
<inp2:m_if check="Field" name="$field" db="db">
<inp2:Field field="$field" first_chars="$first_chars" nl2br="$nl2br" grid="$grid" no_special="$no_special" format="$format"/>
<inp2:m_else/>
Index: core/kernel/db/db_tag_processor.php
===================================================================
--- core/kernel/db/db_tag_processor.php (revision 12650)
+++ core/kernel/db/db_tag_processor.php (working copy)
@@ -69,7 +69,8 @@
function SearchKeyword($params)
{
$list =& $this->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: core/units/categories/categories_tag_processor.php
===================================================================
--- core/units/categories/categories_tag_processor.php (revision 12650)
+++ core/units/categories/categories_tag_processor.php (working copy)
@@ -375,6 +375,10 @@
function BuildListSpecial($params)
{
+ if ($this->Special != '') {
+ return $this->Special;
+ }
+
if ( isset($params['parent_cat_id']) ) {
$parent_cat_id = $params['parent_cat_id'];
}
@@ -388,9 +392,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()) {
@@ -631,22 +632,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, <prefixes_list>, none}
Index: in-auction/admin_templates/listings/listing_list.tpl
===================================================================
--- in-auction/admin_templates/listings/listing_list.tpl (revision 12651)
+++ in-auction/admin_templates/listings/listing_list.tpl (working copy)
@@ -109,7 +109,6 @@
</inp2:m_if>
</inp2:m_DefineElement>
-
<inp2:m_DefineElement name="grid_log_link" format="">
<inp2:m_if check="Field" name="LogId">
<a href="javascript:go_to_log('<inp2:Field field="LogId" grid="$grid"/>')">
Index: in-bulletin/admin_templates/catalog_tab.tpl
===================================================================
--- in-bulletin/admin_templates/catalog_tab.tpl (revision 12650)
+++ in-bulletin/admin_templates/catalog_tab.tpl (working copy)
@@ -31,7 +31,7 @@
$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
- $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword no_special="1" js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+ $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="TopicId" grid="$grid_name" menu_filters="yes"/>
<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
Index: in-bulletin/admin_templates/polls/poll_list.tpl
===================================================================
--- in-bulletin/admin_templates/polls/poll_list.tpl (revision 12650)
+++ in-bulletin/admin_templates/polls/poll_list.tpl (working copy)
@@ -74,7 +74,7 @@
</tbody>
</table>
-<inp2:m_DefineElement name="poll_expire_td">
+<inp2:m_DefineElement name="poll_expire_td" no_special="">
<inp2:m_if check="Field" name="$field">
<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
<inp2:m_else/>
Index: in-commerce/admin_templates/catalog_tab.tpl
===================================================================
--- in-commerce/admin_templates/catalog_tab.tpl (revision 12650)
+++ in-commerce/admin_templates/catalog_tab.tpl (working copy)
@@ -69,7 +69,7 @@
$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
- $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword no_special="1" js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+ $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
<inp2:m_DefineElement name="qty_td">
<inp2:Field field="QtyInStock" grid="$grid"/>/<inp2:Field field="QtyReserved" grid="$grid"/>
Index: in-link/admin_templates/catalog_tab.tpl
===================================================================
--- in-link/admin_templates/catalog_tab.tpl (revision 12650)
+++ in-link/admin_templates/catalog_tab.tpl (working copy)
@@ -30,7 +30,7 @@
$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
- $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword no_special="1" js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+ $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>
<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
Index: in-link/admin_templates/link_validation/link_validation_list.tpl
===================================================================
--- in-link/admin_templates/link_validation/link_validation_list.tpl (revision 12650)
+++ in-link/admin_templates/link_validation/link_validation_list.tpl (working copy)
@@ -114,11 +114,11 @@
</tbody>
</table>
-<inp2:m_DefineElement name="grid_url_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
+<inp2:m_DefineElement name="grid_url_td" format="" nl2br="" first_chars="" td_style="" currency="">
<a href="<inp2:FormatUrl field='$field'/>"><inp2:Field field='$field' first_chars="30"/></a>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="grid_link_name_td" format="" no_special="" nl2br="" first_chars="" td_style="" currency="">
+<inp2:m_DefineElement name="grid_link_name_td" format="" nl2br="" first_chars="" td_style="" currency="">
<inp2:Field field='$field' first_chars="$first_chars"/><br />
<span class="small-statistics">
<inp2:Field name="CategoryId" db="db" result_to_var="item_category"/>
Index: in-news/admin_templates/catalog_tab.tpl
===================================================================
--- in-news/admin_templates/catalog_tab.tpl (revision 12650)
+++ in-news/admin_templates/catalog_tab.tpl (working copy)
@@ -30,9 +30,9 @@
$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
- $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword no_special="1" js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
+ $Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
- <inp2:m_DefineElement name="article_expire_td">
+ <inp2:m_DefineElement name="article_expire_td" no_special="">
<inp2:m_if check="Field" name="$field">
<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
<inp2:m_else/>
Index: in-news/admin_templates/user_item_tab.tpl
===================================================================
--- in-news/admin_templates/user_item_tab.tpl (revision 12650)
+++ in-news/admin_templates/user_item_tab.tpl (working copy)
@@ -19,7 +19,7 @@
$Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id"/>);
$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
- <inp2:m_DefineElement name="article_expire_td">
+ <inp2:m_DefineElement name="article_expire_td" no_special="">
<inp2:m_if check="Field" name="$field">
<inp2:Field field="$field" grid="$grid" no_special="$no_special" format="$format"/>
<inp2:m_else/>