Skip to content
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

Image upload error handling #68

Merged
merged 7 commits into from
Dec 26, 2018
Merged

Image upload error handling #68

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e356eb
deletes semicolons that sometimes appear at the end of "ORG:" names
blacksenator Dec 11, 2018
d9740df
Merge branch 'erase_end_semicolon'
blacksenator Dec 11, 2018
78115ff
Merge branch 'master' of https://github.com/andig/carddav2fb
blacksenator Dec 19, 2018
9ef2ce2
Merge branch 'master' of https://github.com/andig/carddav2fb
blacksenator Dec 19, 2018
ab13390
Merge branch 'master' of https://github.com/andig/carddav2fb
blacksenator Dec 26, 2018
0a704e7
Improvements if something went wrong during image upload
blacksenator Dec 26, 2018
5754261
whitespace eliminated
blacksenator Dec 26, 2018
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
8 changes: 6 additions & 2 deletions src/functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,15 @@ function uploadImages(array $vcards, $config)
$vcard->uid
);
ob_start();
imagejpeg($imgFile, NULL);
imagejpeg($imgFile, null);
$contents = ob_get_clean();
if (file_put_contents($ftp_destination, $contents, 0, $context) !== false) {
if (@file_put_contents($ftp_destination, $contents, 0, $context) !== false) {
$i++;
}
else {
unset ($vcard->rawPhoto); // no wrong link will set in phonebook
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bitte Space vor der Klammer entfernen

error_log(sprintf("ftp access denied for %s.jpg to %s!", $vcard->uid, $config['fonpix']));
}
imagedestroy($imgFile);
}
}
Expand Down