friendica
/
friendica
mirror of https://github.com/friendica/friendica.git
3
5
Fork 3
Code Issues Releases 13 Wiki Activity
Browse Source

a bit more robust about loading external pics 

also friend confirm was getting wrong email
pull/1/head
Mike Macgirvin 11 years ago
parent
8abac5e5c7
commit
8424f31aad
7 changed files with 62 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      boot.php
  2. 7
      include/Photo.php
  3. 2
      include/items.php
  4. 14
      mod/dfrn_confirm.php
  5. 2
      mod/photos.php
  6. 61
      mod/profile_photo.php
  7. 10
      mod/wall_upload.php

9
boot.php
View File

@ -298,6 +298,13 @@ function fetch_url($url,$binary = false) {
curl_setopt($ch, CURLOPT_FOLLOWLOCATION,true);
curl_setopt($ch, CURLOPT_MAXREDIRS,8);
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
// by default we will allow self-signed certs
// but you can override this
$check_cert = get_config('system','verifyssl');
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
$prx = get_config('system','proxy');
if(strlen($prx)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
@ -327,6 +334,8 @@ function post_url($url,$params) {
curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
curl_setopt($ch, CURLOPT_POST,1);
curl_setopt($ch, CURLOPT_POSTFIELDS,$params);
$check_cert = get_config('system','verifyssl');
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
$prx = get_config('system','proxy');
if(strlen($prx)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);

7
include/Photo.php
View File

@ -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;
}

2
include/items.php
View File

@ -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']),

14
mod/dfrn_confirm.php
View File

@ -26,7 +26,7 @@ function dfrn_confirm_post(&$a) {
if(! count($r)) {
xml_status(3); // failure
return; // NOTREACHED
// NOTREACHED
}
$my_prvkey = $r[0]['prvkey'];
@ -73,7 +73,7 @@ function dfrn_confirm_post(&$a) {
);
if(count($r)) {
xml_status(1); // Birthday paradox - duplicate dfrn-id
return; // NOTREACHED
// NOTREACHED
}
$r = q("UPDATE `contact` SET `dfrn-id` = '%s', `pubkey` = '%s' WHERE `id` = %d LIMIT 1",
@ -96,7 +96,7 @@ function dfrn_confirm_post(&$a) {
$filename = basename($r[0]['photo']);
$img_str = fetch_url($r[0]['photo'],true);
$img = new Photo($img_str);
if($img) {
if($img->is_valid()) {
$img->scaleImageSquare(175);
@ -164,7 +164,7 @@ function dfrn_confirm_post(&$a) {
);
if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) {
$tpl = (($new_relation == $REL_BUD)
$tpl = (($new_relation == REL_BUD)
? load_view_file('view/friend_complete_eml.tpl')
: load_view_file('view/intro_complete_eml.tpl'));
@ -185,7 +185,7 @@ function dfrn_confirm_post(&$a) {
}
}
xml_status(0); // Success
return; // NOTREACHED
// NOTREACHED
}
else {
xml_status(2); // Hopefully temporary problem that can be retried.
@ -201,7 +201,7 @@ function dfrn_confirm_post(&$a) {
$uid = get_uid();
if(! $uid) {
notice( t("Permission denied.") . EOL );
notice( t('Permission denied.') . EOL );
return;
}
@ -329,7 +329,7 @@ function dfrn_confirm_post(&$a) {
$filename = basename($r[0]['photo']);
$img_str = fetch_url($r[0]['photo'],true);
$img = new Photo($img_str);
if($img) {
if($img->is_valid()) {
$img->scaleImageSquare(175);

2
mod/photos.php
View File

@ -287,7 +287,7 @@ function photos_post(&$a) {
$imagedata = @file_get_contents($src);
$ph = new Photo($imagedata);
if(! ($image = $ph->getImage())) {
if(! $ph->is_valid()) {
notice( t('Unable to process image.') . EOL );
@unlink($src);
killme();

61
mod/profile_photo.php
View File

@ -53,39 +53,42 @@ function profile_photo_post(&$a) {
$base_image = $r[0];
$im = new Photo($base_image['data']);
$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
if($im->is_valid()) {
$im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
$r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
$r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, 1);
if($r === false)
notice ( t('Image size reduction [175] failed.') . EOL );
if($r === false)
notice ( t('Image size reduction [175] failed.') . EOL );
$im->scaleImage(80);
$im->scaleImage(80);
$r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
$r = $im->store(get_uid(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 5, 1);
if($r === false)
notice( t('Image size reduction [80] failed.') . EOL );
// Unset the profile photo flag from any other photos I own
$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
dbesc($base_image['resource-id']),
intval(get_uid())
);
$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
dbesc(datetime_convert()),
intval(get_uid())
);
// Update global directory in background
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
array(),$foo));
if($r === false)
notice( t('Image size reduction [80] failed.') . EOL );
// Unset the profile photo flag from any other photos I own
$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
dbesc($base_image['resource-id']),
intval(get_uid())
);
$r = q("UPDATE `contact` SET `avatar-date` = '%s' WHERE `self` = 1 AND `uid` = %d LIMIT 1",
dbesc(datetime_convert()),
intval(get_uid())
);
// Update global directory in background
$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
$url = $_SESSION['my_url'];
if($url && strlen(get_config('system','directory_submit_url')))
proc_close(proc_open("\"$php_path\" \"include/directory.php\" \"$url\" &",
array(),$foo));
}
else
notice( t('Unable to process image') . EOL);
}
goaway($a->get_baseurl() . '/profiles');
return; // NOTREACHED
@ -98,7 +101,7 @@ function profile_photo_post(&$a) {
$imagedata = @file_get_contents($src);
$ph = new Photo($imagedata);
if(! ($image = $ph->getImage())) {
if(! $ph->is_valid()) {
notice( t('Unable to process image.') . EOL );
@unlink($src);
return;

10
mod/wall_upload.php
View File

@ -4,10 +4,10 @@ require_once('Photo.php');
function wall_upload_post(&$a) {
if(! local_user()) {
echo ( t('Permission denied.') . EOL );
killme();
}
if(! local_user()) {
echo ( t('Permission denied.') . EOL );
killme();
}
if(! x($_FILES,'userfile'))
killme();
@ -19,7 +19,7 @@ function wall_upload_post(&$a) {
$imagedata = @file_get_contents($src);
$ph = new Photo($imagedata);
if(! ($image = $ph->getImage())) {
if(! $ph->is_valid()) {
echo ( t('Unable to process image.') . EOL);
@unlink($src);
killme();

Write Preview
Loading…
Cancel
Save