files: don't use safe_unicode calls

rhodecode/templates/files/files.mako

@@ -1,379 +1,379 b''
 <%inherit file="/base/base.mako"/>
 
 <%def name="title(*args)">
     ${_('{} Files').format(c.repo_name)}
     %if hasattr(c,'file'):
-        &middot; ${(h.safe_unicode(c.file.path) or '\\')}
+        &middot; ${(h.safe_str(c.file.path) or '\\')}
     %endif
 
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
     ${_('Files')}
     %if c.file:
         @ ${h.show_id(c.commit)}
     %endif
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='files')}
 </%def>
 
 <%def name="main()">
     <script type="text/javascript">
         var fileSourcePage = ${c.file_source_page};
         var atRef = '${request.GET.get('at', '')}';
 
         // global state for fetching metadata
         metadataRequest = null;
 
         // global metadata about URL
         filesUrlData = ${h.files_url_data(request)|n};
     </script>
 
     <div>
         <div>
             <%include file='files_pjax.mako'/>
         </div>
     </div>
 
     <script type="text/javascript">
 
         var initFileJS = function () {
             var state = getFileState();
 
             // select code link event
             $("#hlcode").mouseup(getSelectionLink);
 
             // file history select2 used for history of file, and switch to
             var initialCommitData = {
                 at_ref: atRef,
                 id: null,
                 text: '${c.commit.raw_id}',
                 type: 'sha',
                 raw_id: '${c.commit.raw_id}',
                 idx: ${c.commit.idx},
                 files_url: null,
             };
 
             // check if we have ref info.
             var selectedRef =  fileTreeRefs[atRef];
             if (selectedRef !== undefined) {
                 $.extend(initialCommitData, selectedRef)
             }
 
             var loadUrl = pyroutes.url('repo_file_history', {'repo_name': templateContext.repo_name, 'commit_id': state.commit_id,'f_path': state.f_path});
             var cacheKey = '__SINGLE_FILE_REFS__';
             var cachedDataSource = {};
 
             var loadRefsData = function (query) {
                 $.ajax({
                     url: loadUrl,
                     data: {},
                     dataType: 'json',
                     type: 'GET',
                     success: function (data) {
                         cachedDataSource[cacheKey] = data;
                         query.callback({results: data.results});
                     }
                 });
             };
 
             var feedRefsData = function (query, cachedData) {
                 var data = {results: []};
                 //filter results
                 $.each(cachedData.results, function () {
                     var section = this.text;
                     var children = [];
                     $.each(this.children, function () {
                         if (query.term.length === 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
                             children.push(this)
                         }
                     });
                     data.results.push({
                         'text': section,
                         'children': children
                     })
                 });
 
                 query.callback(data);
             };
 
             var select2FileHistorySwitcher = function (targetElement, loadUrl, initialData) {
                 var formatResult = function (result, container, query) {
                     return formatSelect2SelectionRefs(result);
                 };
 
                 var formatSelection = function (data, container) {
                     var commit_ref = data;
 
                     var tmpl = '';
                     if (commit_ref.type === 'sha') {
                         tmpl = (commit_ref.raw_id || "").substr(0,8);
                     } else if (commit_ref.type === 'branch') {
                         tmpl = tmpl.concat('<i class="icon-branch"></i> ');
                         tmpl = tmpl.concat(escapeHtml(commit_ref.text));
                     } else if (commit_ref.type === 'tag') {
                         tmpl = tmpl.concat('<i class="icon-tag"></i> ');
                         tmpl = tmpl.concat(escapeHtml(commit_ref.text));
                     } else if (commit_ref.type === 'book') {
                         tmpl = tmpl.concat('<i class="icon-bookmark"></i> ');
                         tmpl = tmpl.concat(escapeHtml(commit_ref.text));
                     }
                     var idx = commit_ref.idx || 0;
                     if (idx !== 0) {
                         tmpl = tmpl.concat('<span class="select-index-number">r{0}</span>'.format(idx));
                     }
                     return tmpl
                 };
 
               $(targetElement).select2({
                 dropdownAutoWidth: true,
                 width: "resolve",
                 containerCssClass: "drop-menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 query: function(query) {
                   var cachedData = cachedDataSource[cacheKey];
                   if (cachedData) {
                     feedRefsData(query, cachedData)
                   } else {
                     loadRefsData(query)
                   }
                 },
                 initSelection: function(element, callback) {
                   callback(initialData);
                 },
                 formatResult: formatResult,
                 formatSelection: formatSelection
               });
 
             };
 
             select2FileHistorySwitcher('#file_refs_filter', loadUrl, initialCommitData);
 
             // switcher for files
             $('#file_refs_filter').on('change', function(e) {
                 var data = $('#file_refs_filter').select2('data');
                 var commit_id = data.id;
                 var params = {
                     'repo_name': templateContext.repo_name,
                     'commit_id': commit_id,
                     'f_path': state.f_path
                 };
 
                 if(data.at_rev !== undefined && data.at_rev !== "") {
                     params['at'] = data.at_rev;
                 }
 
                 if ("${c.annotate}" === "True") {
                     var url = pyroutes.url('repo_files:annotated', params);
                 } else {
                     var url = pyroutes.url('repo_files', params);
                 }
                 window.location = url;
 
             });
 
             // load file short history
             $('#file_history_overview').on('click', function(e) {
                 e.preventDefault();
                 path = state.f_path;
                 if (path.indexOf("#") >= 0) {
                     path = path.slice(0, path.indexOf("#"));
                 }
                 var url = pyroutes.url('repo_commits_file',
                         {'repo_name': templateContext.repo_name,
                          'commit_id': state.commit_id, 'f_path': path, 'limit': 6});
                 $('#file_history_container').show();
                 $('#file_history_container').html('<div class="file-history-inner">{0}</div>'.format(_gettext('Loading ...')));
 
                 $.pjax({
                     url: url,
                     container: '#file_history_container',
                     push: false,
                     timeout: 5000
                 }).complete(function () {
                     tooltipActivate();
                 });
             });
 
         };
 
         var initTreeJS = function () {
             var state = getFileState();
             getFilesMetadata();
 
             // fuzzy file filter
             fileBrowserListeners(state.node_list_url, state.url_base);
 
             // switch to widget
             var initialCommitData = {
                 at_ref: atRef,
                 id: null,
                 text: '${c.commit.raw_id}',
                 type: 'sha',
                 raw_id: '${c.commit.raw_id}',
                 idx: ${c.commit.idx},
                 files_url: null,
             };
 
             // check if we have ref info.
             var selectedRef =  fileTreeRefs[atRef];
             if (selectedRef !== undefined) {
                 $.extend(initialCommitData, selectedRef)
             }
 
             var loadUrl = pyroutes.url('repo_refs_data', {'repo_name': templateContext.repo_name});
             var cacheKey = '__ALL_FILE_REFS__';
             var cachedDataSource = {};
 
             var loadRefsData = function (query) {
                 $.ajax({
                     url: loadUrl,
                     data: {},
                     dataType: 'json',
                     type: 'GET',
                     success: function (data) {
                         cachedDataSource[cacheKey] = data;
                         query.callback({results: data.results});
                     }
                 });
             };
 
             var feedRefsData = function (query, cachedData) {
                 var data = {results: []};
                 //filter results
                 $.each(cachedData.results, function () {
                     var section = this.text;
                     var children = [];
                     $.each(this.children, function () {
                         if (query.term.length === 0 || this.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) {
                             children.push(this)
                         }
                     });
                     data.results.push({
                         'text': section,
                         'children': children
                     })
                 });
 
                 //push the typed in commit idx
                 if (!isNaN(query.term)) {
                     var files_url = pyroutes.url('repo_files',
                                 {'repo_name': templateContext.repo_name,
                                  'commit_id': query.term, 'f_path': state.f_path});
 
                     data.results.push({
                         'text': _gettext('go to numeric commit'),
                         'children': [{
                             at_ref: null,
                             id: null,
                             text: 'r{0}'.format(query.term),
                             type: 'sha',
                             raw_id: query.term,
                             idx: query.term,
                             files_url: files_url,
                         }]
                     });
                 }
                 query.callback(data);
             };
 
             var select2RefFileSwitcher = function (targetElement, loadUrl, initialData) {
                 var formatResult = function (result, container, query) {
                     return formatSelect2SelectionRefs(result);
                 };
 
                 var formatSelection = function (data, container) {
                     var commit_ref = data;
 
                     var tmpl = '';
                     if (commit_ref.type === 'sha') {
                         tmpl = (commit_ref.raw_id || "").substr(0,8);
                     } else if (commit_ref.type === 'branch') {
                         tmpl = tmpl.concat('<i class="icon-branch"></i> ');
                         tmpl = tmpl.concat(escapeHtml(commit_ref.text));
                     } else if (commit_ref.type === 'tag') {
                         tmpl = tmpl.concat('<i class="icon-tag"></i> ');
                         tmpl = tmpl.concat(escapeHtml(commit_ref.text));
                     } else if (commit_ref.type === 'book') {
                         tmpl = tmpl.concat('<i class="icon-bookmark"></i> ');
                         tmpl = tmpl.concat(escapeHtml(commit_ref.text));
                     }
 
                     var idx = commit_ref.idx || 0;
                     if (idx !== 0) {
                         tmpl = tmpl.concat('<span class="select-index-number">r{0}</span>'.format(idx));
                     }
                     return tmpl
                 };
 
               $(targetElement).select2({
                 dropdownAutoWidth: true,
                 width: "resolve",
                 containerCssClass: "drop-menu",
                 dropdownCssClass: "drop-menu-dropdown",
                 query: function(query) {
 
                   var cachedData = cachedDataSource[cacheKey];
                   if (cachedData) {
                     feedRefsData(query, cachedData)
                   } else {
                     loadRefsData(query)
                   }
                 },
                 initSelection: function(element, callback) {
                   callback(initialData);
                 },
                 formatResult: formatResult,
                 formatSelection: formatSelection
               });
 
             };
 
             select2RefFileSwitcher('#refs_filter', loadUrl, initialCommitData);
 
             // switcher for file tree
             $('#refs_filter').on('change', function(e) {
                 var data = $('#refs_filter').select2('data');
                 window.location = data.files_url
             });
 
         };
 
         $(document).ready(function() {
             timeagoActivate();
             tooltipActivate();
 
             if ($('#trimmed_message_box').height() < 50) {
                 $('#message_expand').hide();
             }
 
             $('#message_expand').on('click', function(e) {
                 $('#trimmed_message_box').css('max-height', 'none');
                 $(this).hide();
             });
 
             if (fileSourcePage) {
                 initFileJS()
             } else {
                 initTreeJS()
             }
 
             var search_GET = "${request.GET.get('search','')}";
             if (search_GET === "1") {
                 NodeFilter.initFilter();
                 NodeFilter.focus();
             }
         });
 
     </script>
 
 </%def>
  No newline at end of file

rhodecode/templates/files/files_browser_tree.mako

@@ -1,98 +1,98 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <%
     at_ref = request.GET.get('at')
     if at_ref:
         query={'at': at_ref}
         default_landing_ref = at_ref or c.rhodecode_db_repo.landing_ref_name
     else:
         query=None
         default_landing_ref = c.commit.raw_id
 %>
 <div id="file-tree-wrapper" class="browser-body ${('full-load' if c.full_load else '')}">
     <table class="code-browser rctable table-bordered">
         <thead>
             <tr>
                 <th>${_('Name')}</th>
                 <th>${_('Size')}</th>
                 <th>${_('Modified')}</th>
                 <th>${_('Last Commit')}</th>
                 <th>${_('Author')}</th>
             </tr>
         </thead>
 
         <tbody id="tbody">
         <tr>
             <td colspan="5">
                 ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True)}
             </td>
         </tr>
 
         <% has_files = False %>
         % for cnt,node in enumerate(c.file):
         <% has_files = True %>
         <tr class="parity${(cnt % 2)}">
             <td class="td-componentname">
             % if node.is_submodule():
               <span class="submodule-dir">
                 % if node.url.startswith('http://') or node.url.startswith('https://'):
                   <a href="${node.url}">
                       <i class="icon-directory browser-dir"></i>${node.name}
                   </a>
                 % else:
                   <i class="icon-directory browser-dir"></i>${node.name}
                 % endif
               </span>
             % else:
-              <a href="${h.repo_files_by_ref_url(c.repo_name, c.rhodecode_db_repo.repo_type, f_path=h.safe_unicode(node.path), ref_name=default_landing_ref, commit_id=c.commit.raw_id, query=query)}">
+              <a href="${h.repo_files_by_ref_url(c.repo_name, c.rhodecode_db_repo.repo_type, f_path=h.safe_str(node.path), ref_name=default_landing_ref, commit_id=c.commit.raw_id, query=query)}">
                 <i class="${('icon-file-text browser-file' if node.is_file() else 'icon-directory browser-dir')}"></i>${node.name}
               </a>
             % endif
             </td>
             %if node.is_file():
               <td class="td-size" data-attr-name="size">
                   % if c.full_load:
                     <span data-size="${node.size}">${h.format_byte_size_binary(node.size)}</span>
                   % else:
                     ${_('Loading ...')}
                   % endif
               </td>
               <td class="td-time" data-attr-name="modified_at">
                   % if c.full_load:
                     <span data-date="${node.last_commit.date}">${h.age_component(node.last_commit.date)}</span>
                   % endif
               </td>
               <td class="td-hash" data-attr-name="commit_id">
                   % if c.full_load:
                   <div class="tooltip-hovercard" data-hovercard-alt="${node.last_commit.message}" data-hovercard-url="${h.route_path('hovercard_repo_commit', repo_name=c.repo_name, commit_id=node.last_commit.raw_id)}">
                       <pre data-commit-id="${node.last_commit.raw_id}">r${node.last_commit.idx}:${node.last_commit.short_id}</pre>
                   </div>
                   % endif
               </td>
               <td class="td-user" data-attr-name="author">
                   % if c.full_load:
                   <span data-author="${node.last_commit.author}">${h.gravatar_with_user(request, node.last_commit.author, tooltip=True)|n}</span>
                   % endif
               </td>
             %else:
               <td></td>
               <td></td>
               <td></td>
               <td></td>
             %endif
           </tr>
         % endfor
 
         % if not has_files:
         <tr>
             <td colspan="5">
                 ##empty-dir mostly SVN
                 &nbsp;
             </td>
         </tr>
         % endif
 
         </tbody>
         <tbody id="tbody_filtered"></tbody>
     </table>
 </div>

rhodecode/templates/files/files_pjax.mako

@@ -1,34 +1,34 b''
 <%def name="title(*args)">
     ${_('{} Files').format(c.repo_name)}
     %if hasattr(c,'file'):
-        &middot; ${(h.safe_unicode(c.file.path) or '\\')}
+        &middot; ${(h.safe_str(c.file.path) or '\\')}
     %endif
 
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <div>
 
     <div class="summary-detail">
         <div class="summary-detail-header">
 
         </div><!--end summary-detail-header-->
 
         % if c.file.is_submodule():
             <span class="submodule-dir">Submodule ${h.escape(c.file.name)}</span>
         % elif c.file.is_dir():
             <%include file='files_tree_header.mako'/>
         % else:
             <%include file='files_source_header.mako'/>
         % endif
 
     </div> <!--end summary-detail-->
     % if c.file.is_dir():
         <%include file='files_browser.mako'/>
     % else:
         <%include file='files_source.mako'/>
     % endif
 
 </div>