holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improvements for linking mail:

Browse Source 
- Let filemanager encode name so we can keep more characters
- Remove doubled mime removal, which sometimes damaged title
- Fix file information action
This commit is contained in:
Nathan Gray 2015-03-31 14:30:55 +00:00
parent 49097a7b63
commit 4c1424db9b
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etemplate/inc/class.etemplate_widget_link.inc.php
View File

@ -179,10 +179,6 @@ class etemplate_widget_link extends etemplate_widget
$link['target'] = '_blank';
$link['label'] = 'Delete';
$link['help'] = lang('Delete this file');
if ($GLOBALS['egw_info']['user']['preferences']['common']['link_list_format'] != 'text')
{
$link['title'] = preg_replace('/: ([^ ]+) /',': ',$link['title']); // remove mime-type, it's alread in the icon
}
$link['title'] = egw_vfs::decodePath($link['title']);
$link['icon'] = egw_link::vfs_path($link['app2'],$link['id2'],$link['id'],true);
$link['download_url'] = egw_vfs::download_url($link['icon']);

3
etemplate/js/et2_widget_link.js
View File

@ -1517,7 +1517,8 @@ var et2_link_list = et2_link_string.extend(
var link_data = self.context.data;
if(link_data.app == 'file')
{
var url = self.egw().mime_open(link_data);
// File info is always the same
var url = '/apps/'+link_data.app2+'/'+link_data.id2+'/'+decodeURIComponent(link_data.id);
if(typeof url == 'string' && url.indexOf('webdav.php'))
{
// URL is url to file in webdav, so get rid of that part

5
filemanager/inc/class.filemanager_select.inc.php
View File

@ -168,6 +168,11 @@ class filemanager_select
case 'select-dir':
$files = $content['path'];
break;
case 'saveas':
// Don't trust the name the user gives, encode it
$content['name'] = egw_vfs::encodePathComponent($content['name']);
// Fall through
default:
$files = egw_vfs::concat($content['path'],$content['name']);

4
mail/js/app.js
View File

@ -2552,7 +2552,7 @@ app.classes.mail = AppJS.extend(
url += 'menuaction=filemanager.filemanager_select.select'; // todo compose for Draft folder
url += '&mode=saveas';
var subject = dataElem? dataElem.data.subject: _elems[0].subject;
var filename = subject.replace(/[\f\n\t\v/\\:*#?<>\|]/g,"_")|| 'unknown';
var filename = subject.replace(/[\f\n\t\v]/g,"_")|| 'unknown';
url += '&name='+encodeURIComponent(filename+'.eml');
url += '&mime=message'+encodeURIComponent('/')+'rfc822';
url += '&method=mail.mail_ui.vfsSaveMessage';
@ -3481,7 +3481,7 @@ app.classes.mail = AppJS.extend(
'acc_id': acc_id,
'ajax': 'true'
});
// an ugly hack for idots to show up sieve rules not in an iframe
// but as new link, better to remove it after get rid of idots template
if (typeof window.framework == 'undefined')