Skip to content

Do not re-encode unchanged images on every contact safe #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stackcoder wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Do not re-encode unchanged images on every contact safe #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions data_process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4733,30 +4733,38 @@ function dataToVcard(accountUID, inputUID, inputFilterUID, inputEtag)
// PHOTO
if(globalDisabledContactAttributes.indexOf('PHOTO')==-1 && !tmpvCardEditorRef.find('#photo').hasClass('photo_blank'))
{
var value = $('#photoURLHidden').val() || tmpvCardEditorRef.find('#photo').get(0).toDataURL('image/png');
if(vCard.tplM['contentline_PHOTO']!=null && (process_elem=vCard.tplM['contentline_PHOTO'][0])!=undefined)
// keep original vCard content with out re-encoding the image
if ($('#photoDataHidden').val() !== '')
{
// replace the object and related objects' group names (+ append the related objects after the processed)
parsed=('\r\n'+process_elem).match(RegExp('\r\n((?:'+vCard.re['group']+'\\.)?)','m'));
if(parsed[1]!='') // if group is present, replace the object and related objects' group names
process_elem=('\r\n'+process_elem).replace(RegExp('\r\n'+parsed[1].replace('.','\\.'),'mg'),'\r\nitem'+(groupCounter++)+'.').substring(2);

process_elem=process_elem.replace('##:::##value##:::##',value);
process_elem = $('#photoDataHidden').val();
}
else
{
process_elem=vCard.tplC['contentline_PHOTO'];
process_elem=process_elem.replace('##:::##group_wd##:::##', '');
process_elem=process_elem.replace('##:::##value##:::##', value);
}

// Data URL (non-remote) will always be a binary encoded png image
if($('#photoURLHidden').val()==='') {
process_elem=process_elem.replace('##:::##params_wsc##:::##', ';ENCODING=b;TYPE=png');
}
// For remote URL, we can't reliably determine its type, so we just append the VALUE=URI param
else {
process_elem=process_elem.replace('##:::##params_wsc##:::##', ';VALUE=URI');
var value = $('#photoURLHidden').val() || tmpvCardEditorRef.find('#photo').get(0).toDataURL('image/png');
if(vCard.tplM['contentline_PHOTO']!=null && (process_elem=vCard.tplM['contentline_PHOTO'][0])!=undefined)
{
// replace the object and related objects' group names (+ append the related objects after the processed)
parsed=('\r\n'+process_elem).match(RegExp('\r\n((?:'+vCard.re['group']+'\\.)?)','m'));
if(parsed[1]!='') // if group is present, replace the object and related objects' group names
process_elem=('\r\n'+process_elem).replace(RegExp('\r\n'+parsed[1].replace('.','\\.'),'mg'),'\r\nitem'+(groupCounter++)+'.').substring(2);

process_elem=process_elem.replace('##:::##value##:::##',value);
}
else
{
process_elem=vCard.tplC['contentline_PHOTO'];
process_elem=process_elem.replace('##:::##group_wd##:::##', '');
process_elem=process_elem.replace('##:::##value##:::##', value);
}

// Data URL (non-remote) will always be a binary encoded png image
if($('#photoURLHidden').val()==='') {
process_elem=process_elem.replace('##:::##params_wsc##:::##', ';ENCODING=b;TYPE=png');
}
// For remote URL, we can't reliably determine its type, so we just append the VALUE=URI param
else {
process_elem=process_elem.replace('##:::##params_wsc##:::##', ';VALUE=URI');
}
}

vCardText+=process_elem;
Expand Down Expand Up @@ -6323,11 +6331,16 @@ function vcardToData(inputContact, inputIsReadonly, inputIsCompany, inputEditorM
if(photo_show_org)
tmpvCardEditorRef.find('#photo').toggleClass('photo_user photo_company');

tmpvCardEditorRef.find('#photoDataHidden').val('');

if(globalDisabledContactAttributes.indexOf('PHOTO')==-1)
{
vcard_element=vcard.match(vCard.pre['contentline_PHOTO']);
if(vcard_element!=null) // if the PHOTO attribute is present more than once, we use the first value
{
// store original data to prevent re-encoding image
tmpvCardEditorRef.find('#photoDataHidden').val(vcard_element);

// parsed (contentline_parse) = [1]->"group.", [2]->"name", [3]->";param;param", [4]->"value"
parsed=vcard_element[0].match(vCard.pre['contentline_parse']);

Expand Down
1 change: 1 addition & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1260,6 +1260,7 @@ <h1>remote image url</h1>
<form onsubmit="return false;">
<input type="text" id="photoURL" autocomplete="off" />
<img data-type="invalid" style="position: inline; margin-top: 1px; margin-left: -22px; display: none; vertical-align: top;" src="images/error_b.svg" alt="invalid">
<input type="hidden" id="photoDataHidden" autocomplete="off" />
<input type="hidden" id="photoURLHidden" autocomplete="off" />
<input type="submit" id="photoBoxButton" value="OK" />
</form>
Expand Down
3 changes: 2 additions & 1 deletion interface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5851,6 +5851,7 @@ function CardDAVeditor_cleanup(inputLoadEmpty, inputIsCompany)
// remove the template related to previous image (start with clean one)
vCard.tplM['contentline_PHOTO'][0]=null;

$('#photoDataHidden').val('');
$('#photoURLHidden').val($('#photoURL').val());

loadImage(this);
Expand Down Expand Up @@ -6320,7 +6321,7 @@ function process_image(event)
break; // we handle only the first picture here ...
}

$('#photoURL, #photoURLHidden').val('');
$('#photoURL, #photoURLHidden', '#photoDataHidden').val('');
}
/* END image manipulation */

Expand Down