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

Jump to bottom

Phone type mapping and PNG support #36

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Phone type mapping and PNG support #36

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
234e547
Map phone type 'main' to 'work'
jensbocklage May 31, 2019
84a5e1c
Fax has a higher prio then home or work
jensbocklage May 31, 2019
3dc93b3
Add support for PNG pictures in vcards
jensbocklage May 31, 2019
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
33 changes: 25 additions & 8 deletions carddav2fb.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ public function is_base64($str)
}
}

public function base64_to_jpeg($inputfile, $outputfile)
public function base64_to_picture($inputfile, $outputfile)
{
// read data (binary)
$ifp = fopen($inputfile, "rb");
Expand Down Expand Up @@ -462,18 +462,21 @@ public function get_carddav_entries()
// set the proper type
if(in_array("cell", $typearr_lower))
$type = "mobile";
elseif(in_array("home", $typearr_lower))
$type = "home";
elseif(in_array("fax", $typearr_lower))
$type = "fax_work";
elseif(in_array("home", $typearr_lower))
$type = "home";
elseif(in_array("work", $typearr_lower))
$type = "work";
elseif(in_array("main", $typearr_lower))
$type = "work";
elseif(in_array("other", $typearr_lower))
$type = "other";
elseif(in_array("dom", $typearr_lower))
$type = "other";
elseif(in_array("voice", $typearr_lower))
$type = "other";

else
continue;
}
Expand Down Expand Up @@ -590,22 +593,36 @@ public function build_fb_xml()
// we have to extract ['value'] and friends.
if(is_array($entry['photo_data'][0]) and (array_key_exists('value', $entry['photo_data'][0])))
{
// check if photo_data really contains JPEG data
// check if photo_data really contains JPEG or PNG data
if((array_key_exists('type', $entry['photo_data'][0])) and (is_array($entry['photo_data'][0]['type'])) and
($entry['photo_data'][0]['type'][0] == 'jpeg' or $entry['photo_data'][0]['type'][0] == 'jpg' or $entry['photo_data'][0]['type'][0] == 'image/jpeg'))
($entry['photo_data'][0]['type'][0] == 'jpeg' or $entry['photo_data'][0]['type'][0] == 'jpg' or $entry['photo_data'][0]['type'][0] == 'image/jpeg') or
($entry['photo_data'][0]['type'][0] == 'png' or $entry['photo_data'][0]['type'][0] == 'image/png'))
{
// get photo, rename, base64 convert and save as jpg
$photo_data = $entry['photo_data'][0]['value'];
$photo_version = substr(sha1($photo_data), 0, 5);
$photo_file = $this->tmpdir . '/' . "{$entry['photo']}_{$photo_version}.jpg";
$photo_file = $this->tmpdir . '/' . "{$entry['photo']}_{$photo_version}";

// check for base64 encoding of the photo data and convert it
// accordingly.
if(((array_key_exists('encoding', $entry['photo_data'][0])) and ($entry['photo_data'][0]['encoding'] == 'b')) or $this->is_base64($photo_data))
{
file_put_contents($photo_file . ".b64", $photo_data);
$this->base64_to_jpeg($photo_file . ".b64", $photo_file);
$this->base64_to_picture($photo_file . ".b64", $photo_file);
unlink($photo_file . ".b64");
if($entry['photo_data'][0]['type'][0] == 'jpeg' or $entry['photo_data'][0]['type'][0] == 'jpg' or $entry['photo_data'][0]['type'][0] == 'image/jpeg')
{
rename($photo_file, $photo_file . ".jpg");
$photo_file .= ".jpg";
}
if($entry['photo_data'][0]['type'][0] == 'png' or $entry['photo_data'][0]['type'][0] == 'image/png')
{
print " Convert photo from png to jpg" . PHP_EOL;
$image = imagecreatefrompng($photo_file);
$photo_file .= ".jpg";
imagejpeg($image, $photo_file, 100); // full quality
imagedestroy($image);
}
}
else
{
Expand All @@ -619,7 +636,7 @@ public function build_fb_xml()
print " Added photo: " . basename($photo_file) . PHP_EOL;
}
else
print " WARNING: Only jpg contact photos are currently supported." . PHP_EOL;
print " WARNING: Only jpg and png contact photos are currently supported." . PHP_EOL;
}
elseif(substr($entry['photo_data'][0], 0, 4) == 'http')
{
Expand Down