public function __construct($data, $type=null) {
$this->imagick = class_exists('Imagick');
$this->types = $this->supportedTypes();
- if (!array_key_exists($type,$this->types)){
+ if (!array_key_exists($type, $this->types)){
$type='image/jpeg';
}
$this->type = $type;
if ($this->is_imagick() && $this->load_data($data)) {
- return true;
- } else {
- // Failed to load with Imagick, fallback
- $this->imagick = false;
- }
- return $this->load_data($data);
+ return true;
+ } else {
+ // Failed to load with Imagick, fallback
+ $this->imagick = false;
+ }
+ return $this->load_data($data);
}
public function __destruct() {
/**
* @brief Maps Mime types to Imagick formats
+ * @return arr With with image formats (mime type as key)
*/
public function get_FormatsMap() {
$m = array(
private function load_data($data) {
if ($this->is_imagick()) {
- $this->image = new Imagick();
+ $this->image = new Imagick();
try {
$this->image->readImageBlob($data);
- }
- catch (Exception $e) {
+ } catch (Exception $e) {
// Imagick couldn't use the data
return false;
}
*/
switch($this->getType()){
case "image/png":
- $quality = get_config('system','png_quality');
+ $quality = get_config('system', 'png_quality');
if ((! $quality) || ($quality > 9)) {
$quality = PNG_QUALITY;
}
$this->image->setCompressionQuality($quality);
break;
case "image/jpeg":
- $quality = get_config('system','jpeg_quality');
+ $quality = get_config('system', 'jpeg_quality');
if ((! $quality) || ($quality > 100)) {
$quality = JPEG_QUALITY;
}
if ((($height * 9) / 16) > $width) {
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
+ $dest_height = intval(($height * $max) / $width);
} elseif ($width > $height) {
// else constrain both dimensions
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
+ $dest_height = intval(($height * $max) / $width);
} else {
- $dest_width = intval(( $width * $max ) / $height);
+ $dest_width = intval(($width * $max) / $height);
$dest_height = $max;
}
} else {
- if ( $width > $max ) {
+ if ($width > $max) {
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
+ $dest_height = intval(($height * $max) / $width);
} else {
- if ( $height > $max ) {
+ if ($height > $max) {
// very tall image (greater than 16:9)
// but width is OK - don't do anything
$dest_width = $width;
$dest_height = $height;
} else {
- $dest_width = intval(( $width * $max ) / $height);
+ $dest_width = intval(($width * $max) / $height);
$dest_height = $max;
}
} else {
do {
// FIXME - implement horizantal bias for scaling as in followin GD functions
- // to allow very tall images to be constrained only horizontally.
+ // to allow very tall images to be constrained only horizontally.
$this->image->scaleImage($dest_width, $dest_height);
} while ($this->image->nextImage());
}
- $dest = imagecreatetruecolor( $dest_width, $dest_height );
+ $dest = imagecreatetruecolor($dest_width, $dest_height);
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') {
return false;
}
- if ( (! function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg') ) {
+ if ((!function_exists('exif_read_data')) || ($this->getType() !== 'image/jpeg')) {
return;
}
$exif = @exif_read_data($filename,null,true);
- if (! $exif) {
+ if (!$exif) {
return;
}
$dest_width = $dest_height = 0;
- if ((! $width)|| (! $height)) {
+ if ((!$width)|| (!$height)) {
return false;
}
if ($width < $min && $height < $min) {
if ($width > $height) {
$dest_width = $min;
- $dest_height = intval(( $height * $min ) / $width);
+ $dest_height = intval(($height * $min) / $width);
} else {
- $dest_width = intval(( $width * $min ) / $height);
+ $dest_width = intval(($width * $min) / $height);
$dest_height = $min;
}
} else {
- if ( $width < $min ) {
+ if ($width < $min) {
$dest_width = $min;
- $dest_height = intval(( $height * $min ) / $width);
+ $dest_height = intval(($height * $min) / $width);
} else {
- if ( $height < $min ) {
- $dest_width = intval(( $width * $min ) / $height);
+ if ($height < $min) {
+ $dest_width = intval(($width * $min) / $height);
$dest_height = $min;
} else {
$dest_width = $width;
}
if ($this->is_imagick()) {
- return $this->scaleImage($dest_width,$dest_height);
+ return $this->scaleImage($dest_width, $dest_height);
}
- $dest = imagecreatetruecolor( $dest_width, $dest_height );
+ $dest = imagecreatetruecolor($dest_width, $dest_height);
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') {
return;
}
- $dest = imagecreatetruecolor( $dim, $dim );
+ $dest = imagecreatetruecolor($dim, $dim);
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') {
}
- public function cropImage($max,$x,$y,$w,$h) {
+ public function cropImage($max, $x, $y, $w, $h) {
if (!$this->is_valid()) {
return false;
}
return $this->scaleImage($max);
}
- $dest = imagecreatetruecolor( $max, $max );
+ $dest = imagecreatetruecolor($max, $max);
imagealphablending($dest, false);
imagesavealpha($dest, true);
if ($this->type=='image/png') {
return $string;
}
- $quality = FALSE;
+ $quality = false;
ob_start();
switch($this->getType()){
case "image/png":
- $quality = get_config('system','png_quality');
- if ((! $quality) || ($quality > 9)) {
+ $quality = get_config('system', 'png_quality');
+ if ((!$quality) || ($quality > 9)) {
$quality = PNG_QUALITY;
}
- imagepng($this->image,NULL, $quality);
+ imagepng($this->image, null, $quality);
break;
case "image/jpeg":
- $quality = get_config('system','jpeg_quality');
- if ((! $quality) || ($quality > 100)) {
+ $quality = get_config('system', 'jpeg_quality');
+ if ((!$quality) || ($quality > 100)) {
$quality = JPEG_QUALITY;
}
- imagejpeg($this->image,NULL,$quality);
+ imagejpeg($this->image, null, $quality);
}
$string = ob_get_contents();
ob_end_clean();
);
} else {
$r = q("INSERT INTO `photo`
- ( `uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid` )
- VALUES ( %d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s' )",
+ (`uid`, `contact-id`, `guid`, `resource-id`, `created`, `edited`, `filename`, type, `album`, `height`, `width`, `datasize`, `data`, `scale`, `profile`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
+ VALUES (%d, %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, %d, '%s', %d, %d, '%s', '%s', '%s', '%s')",
intval($uid),
intval($cid),
dbesc($guid),
);
}
- // Update the cached values
- if ($album != 'Contact Photos') {
- photo_albums($uid, true);
- }
-
return $r;
}
}
$ext = pathinfo($filename, PATHINFO_EXTENSION);
$types = Photo::supportedTypes();
$type = "image/jpeg";
- foreach ($types as $m=>$e){
- if ($ext==$e) {
+ foreach ($types as $m => $e){
+ if ($ext == $e) {
$type = $m;
}
}
*
* @return array Returns array of the different avatar sizes
*/
-function update_contact_avatar($avatar,$uid,$cid, $force = false) {
+function update_contact_avatar($avatar, $uid, $cid, $force = false) {
$r = q("SELECT `avatar`, `photo`, `thumb`, `micro` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
if (!dbm::is_result($r)) {
}
if (($r[0]["avatar"] != $avatar) OR $force) {
- $photos = import_profile_photo($avatar,$uid,$cid, true);
+ $photos = import_profile_photo($avatar, $uid, $cid, true);
if ($photos) {
q("UPDATE `contact` SET `avatar` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
return $data;
}
-function import_profile_photo($photo,$uid,$cid, $quit_on_error = false) {
-
- $a = get_app();
+function import_profile_photo($photo, $uid, $cid, $quit_on_error = false) {
$r = q("SELECT `resource-id` FROM `photo` WHERE `uid` = %d AND `contact-id` = %d AND `scale` = 4 AND `album` = 'Contact Photos' LIMIT 1",
intval($uid),
$photo_failure = false;
$filename = basename($photo);
- $img_str = fetch_url($photo,true);
+ $img_str = fetch_url($photo, true);
if ($quit_on_error AND ($img_str == "")) {
return false;
}
- $type = guess_image_type($photo,true);
+ $type = guess_image_type($photo, true);
$img = new Photo($img_str, $type);
if ($img->is_valid()) {
$img->scaleImageSquare(175);
- $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4 );
+ $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4);
if ($r === false)
$photo_failure = true;
$img->scaleImage(80);
- $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5 );
+ $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5);
if ($r === false)
$photo_failure = true;
$img->scaleImage(48);
- $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6 );
+ $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6);
if ($r === false) {
$photo_failure = true;
}
- $photo = $a->get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
- $thumb = $a->get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
- $micro = $a->get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
+ $photo = App::get_baseurl() . '/photo/' . $hash . '-4.' . $img->getExt();
+ $thumb = App::get_baseurl() . '/photo/' . $hash . '-5.' . $img->getExt();
+ $micro = App::get_baseurl() . '/photo/' . $hash . '-6.' . $img->getExt();
} else {
$photo_failure = true;
}
}
if ($photo_failure) {
- $photo = $a->get_baseurl() . '/images/person-175.jpg';
- $thumb = $a->get_baseurl() . '/images/person-80.jpg';
- $micro = $a->get_baseurl() . '/images/person-48.jpg';
+ $photo = App::get_baseurl() . '/images/person-175.jpg';
+ $thumb = App::get_baseurl() . '/images/person-80.jpg';
+ $micro = App::get_baseurl() . '/images/person-48.jpg';
}
return(array($photo,$thumb,$micro));
$data = Cache::get($url);
- if (is_null($data) OR !$data) {
+ if (is_null($data) OR !$data OR !is_array($data)) {
$img_str = fetch_url($url, true, $redirects, 4);
$filesize = strlen($img_str);
if ((($height * 9) / 16) > $width) {
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
+ $dest_height = intval(($height * $max) / $width);
} elseif ($width > $height) {
// else constrain both dimensions
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
+ $dest_height = intval(($height * $max) / $width);
} else {
- $dest_width = intval(( $width * $max ) / $height);
+ $dest_width = intval(($width * $max) / $height);
$dest_height = $max;
}
} else {
- if ( $width > $max ) {
+ if ($width > $max) {
$dest_width = $max;
- $dest_height = intval(( $height * $max ) / $width);
+ $dest_height = intval(($height * $max) / $width);
} else {
- if ( $height > $max ) {
+ if ($height > $max) {
// very tall image (greater than 16:9)
// but width is OK - don't do anything
$dest_width = $width;
$dest_height = $height;
} else {
- $dest_width = intval(( $width * $max ) / $height);
+ $dest_width = intval(($width * $max) / $height);
$dest_height = $max;
}
} else {
return array("width" => $dest_width, "height" => $dest_height);
}
-function store_photo($a, $uid, $imagedata = "", $url = "") {
+function store_photo(App $a, $uid, $imagedata = "", $url = "") {
$r = q("SELECT `user`.`nickname`, `user`.`page-flags`, `contact`.`id` FROM `user` INNER JOIN `contact` on `user`.`uid` = `contact`.`uid`
WHERE `user`.`uid` = %d AND `user`.`blocked` = 0 AND `contact`.`self` = 1 LIMIT 1",
intval($uid));
$a->save_timestamp($stamp1, "file");
}
- $maximagesize = get_config('system','maximagesize');
+ $maximagesize = get_config('system', 'maximagesize');
if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
$ph->orient($tempfile);
unlink($tempfile);
- $max_length = get_config('system','max_image_length');
+ $max_length = get_config('system', 'max_image_length');
if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
// Pictures are always public by now
//$defperm = '<'.$default_cid.'>';
$defperm = "";
- $visitor = 0;
+ $visitor = 0;
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
return(array());
}
- $image = array("page" => $a->get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
- "full" => $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
+ $image = array("page" => App::get_baseurl().'/photos/'.$page_owner_nick.'/image/'.$hash,
+ "full" => App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt());
if ($width > 800 || $height > 800) {
- $image["large"] = $a->get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
+ $image["large"] = App::get_baseurl()."/photo/{$hash}-0.".$ph->getExt();
}
if ($width > 640 || $height > 640) {
$ph->scaleImage(640);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 1, 0, $defperm);
if ($r) {
- $image["medium"] = $a->get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
+ $image["medium"] = App::get_baseurl()."/photo/{$hash}-1.".$ph->getExt();
}
}
$ph->scaleImage(320);
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
if ($r) {
- $image["small"] = $a->get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
+ $image["small"] = App::get_baseurl()."/photo/{$hash}-2.".$ph->getExt();
}
}
$r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
if ($r) {
- $image["thumb"] = $a->get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
+ $image["thumb"] = App::get_baseurl()."/photo/{$hash}-3.".$ph->getExt();
}
}
projects / friendica.git / blobdiff