diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-10-04 16:04:52 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-10-04 16:04:52 -0700 |
| commit | 8424f31aad844b49e74e0fb7a7d197284fb67ec9 (patch) | |
| tree | b0711c1d0fd226d5e0061bc5b42cfbb774200431 /include | |
| parent | 8abac5e5c7128748f8bc8cc8c52ebf37874023c4 (diff) | |
| download | volse-hubzilla-8424f31aad844b49e74e0fb7a7d197284fb67ec9.tar.gz volse-hubzilla-8424f31aad844b49e74e0fb7a7d197284fb67ec9.tar.bz2 volse-hubzilla-8424f31aad844b49e74e0fb7a7d197284fb67ec9.zip | |
a bit more robust about loading external pics
also friend confirm was getting wrong email
Diffstat (limited to 'include')
| -rw-r--r-- | include/Photo.php | 7 | ||||
| -rw-r--r-- | include/items.php | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/Photo.php b/include/Photo.php index 0f5003a6f..e418cde46 100644 --- a/include/Photo.php +++ b/include/Photo.php @@ -6,12 +6,15 @@ class Photo { private $image; private $width; private $height; + private $valid; public function __construct($data) { + $this->valid = false; $this->image = @imagecreatefromstring($data); if($this->image !== FALSE) { $this->width = imagesx($this->image); $this->height = imagesy($this->image); + $this->valid = true; } } @@ -20,6 +23,10 @@ class Photo { imagedestroy($this->image); } + public function is_valid() { + return $this->valid; + } + public function getWidth() { return $this->width; } diff --git a/include/items.php b/include/items.php index ac4e694be..799af48ac 100644 --- a/include/items.php +++ b/include/items.php @@ -633,7 +633,7 @@ function consume_feed($xml,$importer,$contact, &$hub) { $resource_id = $r[0]['resource-id']; $img_str = fetch_url($photo_url,true); $img = new Photo($img_str); - if($img) { + if($img->is_valid()) { q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND contact-id` = %d AND `uid` = %d", dbesc($resource_id), intval($contact['id']), |