]> git.mxchange.org Git - friendica.git/commitdiff
Function names
authorAdam Magness <adam.magness@gmail.com>
Wed, 29 Nov 2017 17:17:12 +0000 (12:17 -0500)
committerAdam Magness <adam.magness@gmail.com>
Wed, 29 Nov 2017 17:17:12 +0000 (12:17 -0500)
Update function names and corresponding function calls

23 files changed:
include/api.php
include/follow.php
include/items.php
include/network.php
include/plaintext.php
include/user.php
mod/contacts.php
mod/crepair.php
mod/dfrn_confirm.php
mod/dfrn_request.php
mod/photo.php
mod/photos.php
mod/profile_photo.php
mod/proxy.php
mod/wall_upload.php
src/Model/GlobalContact.php
src/Object/Contact.php
src/Object/Photo.php
src/ParseUrl.php
src/Protocol/DFRN.php
src/Protocol/Diaspora.php
src/Protocol/OStatus.php
update.php

index 9f1ad44e5f8d681ec2f9852eb5091cf25b5d4f07..9c42241594ee5f4a4bcfae62ab169b76deb6397a 100644 (file)
@@ -5,7 +5,6 @@
  *
  * @todo Automatically detect if incoming data is HTML or BBCode
  */
-
 use Friendica\App;
 use Friendica\Core\System;
 use Friendica\Core\Config;
@@ -2377,7 +2376,7 @@ function api_get_attachments(&$body)
        $attachments = array();
 
        foreach ($images[1] as $image) {
-               $imagedata = get_photo_info($image);
+               $imagedata = Photo::getPhotoInfo($image);
 
                if ($imagedata) {
                        $attachments[] = array("url" => $image, "mimetype" => $imagedata["mime"], "size" => $imagedata["size"]);
@@ -2509,7 +2508,7 @@ function api_get_entitities(&$text, $bbcode)
 
                $start = iconv_strpos($text, $url, $offset, "UTF-8");
                if (!($start === false)) {
-                       $image = get_photo_info($url);
+                       $image = Photo::getPhotoInfo($url);
                        if ($image) {
                                // If image cache is activated, then use the following sizes:
                                // thumb  (150), small (340), medium (600) and large (1024)
@@ -2517,19 +2516,19 @@ function api_get_entitities(&$text, $bbcode)
                                        $media_url = proxy_url($url);
 
                                        $sizes = array();
-                                       $scale = scale_image($image[0], $image[1], 150);
+                                       $scale = Photo::scaleImageTo($image[0], $image[1], 150);
                                        $sizes["thumb"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 
                                        if (($image[0] > 150) || ($image[1] > 150)) {
-                                               $scale = scale_image($image[0], $image[1], 340);
+                                               $scale = Photo::scaleImageTo($image[0], $image[1], 340);
                                                $sizes["small"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
                                        }
 
-                                       $scale = scale_image($image[0], $image[1], 600);
+                                       $scale = Photo::scaleImageTo($image[0], $image[1], 600);
                                        $sizes["medium"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
 
                                        if (($image[0] > 600) || ($image[1] > 600)) {
-                                               $scale = scale_image($image[0], $image[1], 1024);
+                                               $scale = Photo::scaleImageTo($image[0], $image[1], 1024);
                                                $sizes["large"] = array("w" => $scale["width"], "h" => $scale["height"], "resize" => "fit");
                                        }
                                } else {
@@ -3946,7 +3945,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
        }
 
        if ($filetype == "") {
-               $filetype=guess_image_type($filename);
+               $filetype=Photo::guessImageType($filename);
        }
        $imagedata = getimagesize($src);
        if ($imagedata) {
@@ -3971,7 +3970,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
        // create Photo instance with the data of the image
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
-       if (! $ph->is_valid()) {
+       if (! $ph->isValid()) {
                throw new InternalServerErrorException("unable to process image data");
        }
 
index 54ea9981fafdede5fe1a7dd47f5e3d010ee51295..cb575ae54c51b67ec1e0dca250cdc946df7211e0 100644 (file)
@@ -250,7 +250,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
        }
 
        // Update the avatar
-       update_contact_avatar($ret['photo'],$uid,$contact_id);
+       Photo::updateContactAvatar($ret['photo'], $uid, $contact_id);
 
        // pull feed and consume it, which should subscribe to the hub.
 
index 938925cb99edcc8f616ef0ced3e8a7b9a074dfb0..a16635339c8caf58ec8ab19f14a7122527125290 100644 (file)
@@ -1690,7 +1690,7 @@ function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
                );
                if (DBM::is_result($r)) {
                        $contact_record = $r[0];
-                       update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
+                       Photo::updateContactAvatar($photo, $importer["uid"], $contact_record["id"], true);
                }
 
                /// @TODO Encapsulate this into a function/method
@@ -1877,7 +1877,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
                                                        $height = intval($match[2]);
 
                                                        $ph = new Photo($data, $type);
-                                                       if ($ph->is_valid()) {
+                                                       if ($ph->isValid()) {
                                                                $ph->scaleImage(max($width, $height));
                                                                $data = $ph->imageString();
                                                                $type = $ph->getType();
index 775ed3eaa86320e39d01fe4040bfff2154e2e7f0..52e3409573347db9754dc7f1249fb09a95f14f5b 100644 (file)
@@ -710,11 +710,11 @@ function scale_external_images($srctext, $include_link = true, $scale_replace =
                        }
 
                        // guess mimetype from headers or filename
-                       $type = guess_image_type($mtch[1], true);
+                       $type = Photo::guessImageType($mtch[1], true);
 
                        if ($i) {
                                $ph = new Photo($i, $type);
-                               if ($ph->is_valid()) {
+                               if ($ph->isValid()) {
                                        $orig_width = $ph->getWidth();
                                        $orig_height = $ph->getHeight();
 
index 13df9d1c808b024c4c92931f1e569e0ed6a042f6..1ae02bc49ea20bcc84514712093ff3dff7ae1ca3 100644 (file)
@@ -51,7 +51,7 @@ function get_old_attachment_data($body) {
 
                        if (preg_match("/\[img\]([$URLSearchString]*)\[\/img\]/ism", $attacheddata, $matches)) {
 
-                               $picturedata = get_photo_info($matches[1]);
+                               $picturedata = Photo::getPhotoInfo($matches[1]);
 
                                if (($picturedata[0] >= 500) && ($picturedata[0] >= $picturedata[1]))
                                        $post["image"] = $matches[1];
@@ -221,7 +221,7 @@ function get_attached_data($body, $item = array()) {
                                        $post["preview"] = $pictures[0][2];
                                        $post["text"] = str_replace($pictures[0][0], "", $body);
                                } else {
-                                       $imgdata = get_photo_info($pictures[0][1]);
+                                       $imgdata = Photo::getPhotoInfo($pictures[0][1]);
                                        if (substr($imgdata["mime"], 0, 6) == "image/") {
                                                $post["type"] = "photo";
                                                $post["image"] = $pictures[0][1];
index ff7e9c9c8f7f049aaf0c410a5e3b661467cb3c94..356f10ad09627705dfca00f2904efb93f7efe2ba 100644 (file)
@@ -285,23 +285,22 @@ function create_user($arr) {
                $photo = avatar_img($email);
 
        // unless there is no avatar-plugin loaded
-       if(strlen($photo)) {
+       if (strlen($photo)) {
                $photo_failure = false;
 
                $filename = basename($photo);
-               $img_str = fetch_url($photo,true);
+               $img_str = fetch_url($photo, true);
                // guess mimetype from headers or filename
-               $type = guess_image_type($photo,true);
+               $type = Photo::guessImageType($photo, true);
 
 
                $img = new Photo($img_str, $type);
-               if($img->is_valid()) {
-
+               if ($img->isValid()) {
                        $img->scaleImageSquare(175);
 
                        $hash = photo_new_resource();
 
-                       $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4 );
+                       $r = $img->store($newuid, 0, $hash, $filename, t('Profile Photos'), 4);
 
                        if ($r === false) {
                                $photo_failure = true;
index 5de39005bd7d50bf474e5eb599852cf916e0fb40..8a42a85d45abf8e8624e742a3ae42c1a64a0c0f7 100644 (file)
@@ -311,7 +311,7 @@ function _contact_update_profile($contact_id) {
        );
 
        // Update the entry in the contact table
-       update_contact_avatar($data['photo'], local_user(), $contact_id, true);
+       Photo::updateContactAvatar($data['photo'], local_user(), $contact_id, true);
 
        // Update the entry in the gcontact table
        GlobalContact::updateFromProbe($data["url"]);
index 4474cec99df3d81ea0eca6b53a4b1cfc40aa8f03..fe4f9dd534c9c9404c69be76e305337d18c47a6b 100644 (file)
@@ -1,5 +1,7 @@
 <?php
-
+/**
+ * @file mod/crepair.php
+ */
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Database\DBM;
@@ -85,17 +87,17 @@ function crepair_post(App $a) {
                local_user()
        );
 
-       if($photo) {
+       if ($photo) {
                logger('mod-crepair: updating photo from ' . $photo);
 
-               update_contact_avatar($photo,local_user(),$contact['id']);
+               Photo::updateContactAvatar($photo, local_user(), $contact['id']);
        }
 
-       if($r)
-               info( t('Contact settings applied.') . EOL);
-       else
-               notice( t('Contact update failed.') . EOL);
-
+       if ($r) {
+               info(t('Contact settings applied.') . EOL);
+       } else {
+               notice(t('Contact update failed.') . EOL);
+       }
 
        return;
 }
index c61e01329678b8fedd5538ba674b9bdce5d82f90..04ccd552af2777bac7765cbfa24d8a5d9ae52cbc 100644 (file)
@@ -326,7 +326,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                 *
                 */
 
-               update_contact_avatar($contact['photo'],$uid,$contact_id);
+               Photo::updateContactAvatar($contact['photo'],$uid,$contact_id);
 
                logger('dfrn_confirm: confirm - imported photos');
 
@@ -675,7 +675,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
                        $photo = System::baseUrl() . '/images/person-175.jpg';
                }
 
-               update_contact_avatar($photo,$local_uid,$dfrn_record);
+               Photo::updateContactAvatar($photo,$local_uid,$dfrn_record);
 
                logger('dfrn_confirm: request - photos imported');
 
index 39b212fbddc37a4847d51e09739dfc4ae9292739..1bf7d71d93ae44667213273e8e3fb9e0dc92dcbe 100644 (file)
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/dfrn_request.php
  * @brief Module: dfrn_request
  *    You also find a graphic which describes the confirmation process at
  *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
  */
-
 use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Photo;
 
 require_once 'include/enotify.php';
 require_once 'include/group.php';
 
-function dfrn_request_init(App $a) {
-
-       if($a->argc > 1)
+function dfrn_request_init(App $a)
+{
+       if ($a->argc > 1)
                $which = $a->argv[1];
 
-       profile_load($a,$which);
+       profile_load($a, $which);
        return;
 }
 
@@ -196,7 +195,7 @@ function dfrn_request_post(App $a) {
                                                group_add_member(local_user(), '', $r[0]['id'], $def_gid);
 
                                        if (isset($photo))
-                                               update_contact_avatar($photo, local_user(), $r[0]["id"], true);
+                                               Photo::updateContactAvatar($photo, local_user(), $r[0]["id"], true);
 
                                        $forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
                                } else {
@@ -587,7 +586,7 @@ function dfrn_request_post(App $a) {
                                        );
                                        if (DBM::is_result($r)) {
                                                $contact_record = $r[0];
-                                               update_contact_avatar($photo, $uid, $contact_record["id"], true);
+                                               Photo::updateContactAvatar($photo, $uid, $contact_record["id"], true);
                                        }
                                }
 
index 62a7350eda9367480b68122c31b7eed75e23fab7..8368b99a6b99f4ff13f66e5817b8fd3f1bddba81 100644 (file)
@@ -169,7 +169,7 @@ function photo_init(App $a) {
        // Resize only if its not a GIF and it is supported by the library
        if (($mimetype != "image/gif") && in_array($mimetype, Photo::supportedTypes())) {
                $ph = new Photo($data, $mimetype);
-               if ($ph->is_valid()) {
+               if ($ph->isValid()) {
                        if (isset($customres) && $customres > 0 && $customres < 500) {
                                $ph->scaleImageSquare($customres);
                        }
index 84fffe8ba3c76c44e0ac97266ec2efeddaadf94c..504f0ff1460df4fa5cc6b695c0c9568834fb15be 100644 (file)
@@ -424,7 +424,7 @@ function photos_post(App $a) {
                        );
                        if (DBM::is_result($r)) {
                                $ph = new Photo($r[0]['data'], $r[0]['type']);
-                               if ($ph->is_valid()) {
+                               if ($ph->isValid()) {
                                        $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
                                        $ph->rotate($rotate_deg);
 
@@ -810,7 +810,7 @@ function photos_post(App $a) {
                $type       = $_FILES['userfile']['type'];
        }
        if ($type == "") {
-               $type = guess_image_type($filename);
+               $type = Photo::guessImageType($filename);
        }
 
        logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
@@ -839,7 +839,7 @@ function photos_post(App $a) {
 
        $ph = new Photo($imagedata, $type);
 
-       if (! $ph->is_valid()) {
+       if (! $ph->isValid()) {
                logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
index b185817d04640bd267e32d6a8f188a3f2a6d78d2..f667359b5184a18ba515167b418628a9b21e81ec 100644 (file)
@@ -73,7 +73,7 @@ function profile_photo_post(App $a) {
                        $base_image = $r[0];
 
                        $im = new Photo($base_image['data'], $base_image['type']);
-                       if($im->is_valid()) {
+                       if ($im->isValid()) {
                                $im->cropImage(175,$srcX,$srcY,$srcW,$srcH);
 
                                $r = $im->store(local_user(), 0, $base_image['resource-id'],$base_image['filename'], t('Profile Photos'), 4, $is_default_profile);
@@ -151,13 +151,13 @@ function profile_photo_post(App $a) {
        $filesize = intval($_FILES['userfile']['size']);
        $filetype = $_FILES['userfile']['type'];
        if ($filetype == "") {
-               $filetype = guess_image_type($filename);
+               $filetype = Photo::guessImageType($filename);
        }
 
-       $maximagesize = Config::get('system','maximagesize');
+       $maximagesize = Config::get('system', 'maximagesize');
 
        if (($maximagesize) && ($filesize > $maximagesize)) {
-               notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
+               notice(sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
                @unlink($src);
                return;
        }
@@ -165,8 +165,8 @@ function profile_photo_post(App $a) {
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
 
-       if (! $ph->is_valid()) {
-               notice( t('Unable to process image.') . EOL );
+       if (! $ph->isValid()) {
+               notice(t('Unable to process image.') . EOL);
                @unlink($src);
                return;
        }
index db9d7409d9784c115b241daf0c97fe41ef4c20ed..790309c62769d4cea2ff235a02299cc544d074c2 100644 (file)
@@ -131,7 +131,7 @@ function proxy_init(App $a) {
                        // reduce quality - if it isn't a GIF
                        if ($mime != 'image/gif') {
                                $img = new Photo($img_str, $mime);
-                               if ($img->is_valid()) {
+                               if ($img->isValid()) {
                                        $img_str = $img->imageString();
                                }
                        }
@@ -175,7 +175,7 @@ function proxy_init(App $a) {
                        $cachefile = ''; // Clear the cachefile so that the dummy isn't stored
                        $valid = false;
                        $img = new Photo($img_str, 'image/png');
-                       if ($img->is_valid()) {
+                       if ($img->isValid()) {
                                $img->scaleImage(10);
                                $img_str = $img->imageString();
                        }
@@ -193,7 +193,7 @@ function proxy_init(App $a) {
                        dba::insert('photo', $fields);
                } else {
                        $img = new Photo($img_str, $mime);
-                       if ($img->is_valid() && !$direct_cache && ($cachefile == '')) {
+                       if ($img->isValid() && !$direct_cache && ($cachefile == '')) {
                                $img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
                        }
                }
@@ -204,7 +204,7 @@ function proxy_init(App $a) {
        // reduce quality - if it isn't a GIF
        if ($mime != 'image/gif') {
                $img = new Photo($img_str, $mime);
-               if ($img->is_valid()) {
+               if ($img->isValid()) {
                        $img->scaleImage($size);
                        $img_str = $img->imageString();
                }
index 5b5598a46e77320a7f2dc5ee40cc75fbabb7ade1..ce73f85151dde9277796c619baaef129110a299d 100644 (file)
@@ -162,7 +162,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
        }
 
        if ($filetype=="") {
-               $filetype=guess_image_type($filename);
+               $filetype=Photo::guessImageType($filename);
        }
 
        // If there is a temp name, then do a manual check
@@ -192,7 +192,7 @@ function wall_upload_post(App $a, $desktopmode = true) {
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
 
-       if (! $ph->is_valid()) {
+       if (! $ph->isValid()) {
                $msg = t('Unable to process image.');
                if ($r_json) {
                        echo json_encode(array('error'=>$msg));
index f0ad8faa1e22aafcab7989dd133ee5ca60d6bd0b..6ee1fa4f9ca177786b5e787f293b31bea4409f45 100644 (file)
@@ -881,7 +881,7 @@ class GlobalContact
                        if (DBM::is_result($r)) {
                                logger("Update public contact ".$r[0]["id"], LOGGER_DEBUG);
 
-                               update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
+                               Photo::updateContactAvatar($contact["photo"], 0, $r[0]["id"]);
 
                                $fields = array('name', 'nick', 'addr',
                                                'network', 'bd', 'gender',
index 9f81b98c48339473652c26ab50626f10d27e5be3..f4ca362437605cf63ecdf235ed9dee624b157832 100644 (file)
@@ -644,7 +644,7 @@ class Contact extends BaseObject
                        }
                }
 
-               update_contact_avatar($data["photo"], $uid, $contact_id);
+               Photo::updateContactAvatar($data["photo"], $uid, $contact_id);
 
                $contact = dba::select('contact', array('url', 'nurl', 'addr', 'alias', 'name', 'nick', 'keywords', 'location', 'about', 'avatar-date'), array('id' => $contact_id), array('limit' => 1));
 
index b87a4b6e7f3ba57c4e795a735e19e6963d0b389c..894a18c5da8a8ff6a5292e1503f39646725ac1c2 100644 (file)
@@ -13,8 +13,11 @@ use Friendica\Database\DBM;
 
 require_once "include/photos.php";
 
-class Photo {
-
+/**
+ * Class to handle Photos
+ */
+class Photo
+{
        private $image;
 
        /*
@@ -30,9 +33,9 @@ class Photo {
        /**
         * @brief supported mimetypes and corresponding file extensions
         */
-       public static function supportedTypes() {
+       public static function supportedTypes()
+       {
                if (class_exists('Imagick')) {
-
                        // Imagick::queryFormats won't help us a lot there...
                        // At least, not yet, other parts of friendica uses this array
                        $t = array(
@@ -51,27 +54,38 @@ class Photo {
                return $t;
        }
 
-       public function __construct($data, $type=null)
+       /**
+        * @brief Constructor
+        * @param object  $data data
+        * @param boolean $type optional, default null
+        * @return object
+        */
+       public function __construct($data, $type = null)
        {
                $this->imagick = class_exists('Imagick');
                $this->types = static::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)) {
+               if ($this->isImagick() && $this->loadData($data)) {
                        return true;
                } else {
                        // Failed to load with Imagick, fallback
                        $this->imagick = false;
                }
-               return $this->load_data($data);
+               return $this->loadData($data);
        }
 
-       public function __destruct() {
+       /**
+        * @brief Destructor
+        * @return void
+        */
+       public function __destruct()
+       {
                if ($this->image) {
-                       if ($this->is_imagick()) {
+                       if ($this->isImagick()) {
                                $this->image->clear();
                                $this->image->destroy();
                                return;
@@ -82,7 +96,10 @@ class Photo {
                }
        }
 
-       public function is_imagick()
+       /**
+        * @return boolean
+        */
+       public function isImagick()
        {
                return $this->imagick;
        }
@@ -91,7 +108,8 @@ class Photo {
         * @brief Maps Mime types to Imagick formats
         * @return arr With with image formats (mime type as key)
         */
-       public function get_FormatsMap() {
+       public function getFormatsMap()
+       {
                $m = array(
                        'image/jpeg' => 'JPG',
                        'image/png' => 'PNG',
@@ -100,8 +118,13 @@ class Photo {
                return $m;
        }
 
-       private function load_data($data) {
-               if ($this->is_imagick()) {
+       /**
+        * @param object $data data
+        * @return boolean
+        */
+       private function loadData($data)
+       {
+               if ($this->isImagick()) {
                        $this->image = new Imagick();
                        try {
                                $this->image->readImageBlob($data);
@@ -113,7 +136,7 @@ class Photo {
                        /*
                         * Setup the image to the format it will be saved to
                         */
-                       $map = $this->get_FormatsMap();
+                       $map = $this->getFormatsMap();
                        $format = $map[$type];
                        $this->image->setFormat($format);
 
@@ -123,7 +146,7 @@ class Photo {
                        /*
                         * setup the compression here, so we'll do it only once
                         */
-                       switch($this->getType()){
+                       switch ($this->getType()) {
                                case "image/png":
                                        $quality = Config::get('system', 'png_quality');
                                        if ((! $quality) || ($quality > 9)) {
@@ -171,41 +194,57 @@ class Photo {
                return false;
        }
 
-       public function is_valid() {
-               if ($this->is_imagick()) {
+       /**
+        * @return boolean
+        */
+       public function isValid()
+       {
+               if ($this->isImagick()) {
                        return ($this->image !== false);
                }
                return $this->valid;
        }
 
-       public function getWidth() {
-               if (!$this->is_valid()) {
+       /**
+        * @return mixed
+        */
+       public function getWidth()
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        return $this->image->getImageWidth();
                }
                return $this->width;
        }
 
-       public function getHeight() {
-               if (!$this->is_valid()) {
+       /**
+        * @return mixed
+        */
+       public function getHeight()
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        return $this->image->getImageHeight();
                }
                return $this->height;
        }
 
-       public function getImage() {
-               if (!$this->is_valid()) {
+       /**
+        * @return mixed
+        */
+       public function getImage()
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        /* Clean it */
                        $this->image = $this->image->deconstructImages();
                        return $this->image;
@@ -213,24 +252,37 @@ class Photo {
                return $this->image;
        }
 
-       public function getType() {
-               if (!$this->is_valid()) {
+       /**
+        * @return mixed
+        */
+       public function getType()
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
                return $this->type;
        }
 
-       public function getExt() {
-               if (!$this->is_valid()) {
+       /**
+        * @return mixed
+        */
+       public function getExt()
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
                return $this->types[$this->getType()];
        }
 
-       public function scaleImage($max) {
-               if (!$this->is_valid()) {
+       /**
+        * @param integer $max max dimension
+        * @return mixed
+        */
+       public function scaleImage($max)
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
@@ -244,7 +296,6 @@ class Photo {
                }
 
                if ($width > $max && $height > $max) {
-
                        // very tall image (greater than 16:9)
                        // constrain the width - let the height float.
 
@@ -265,7 +316,6 @@ class Photo {
                                $dest_height = intval(($height * $max) / $width);
                        } else {
                                if ($height > $max) {
-
                                        // very tall image (greater than 16:9)
                                        // but width is OK - don't do anything
 
@@ -284,7 +334,7 @@ class Photo {
                }
 
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        /*
                         * If it is not animated, there will be only one iteration here,
                         * so don't bother checking
@@ -292,7 +342,6 @@ class Photo {
                        // Don't forget to go back to the first frame
                        $this->image->setFirstIterator();
                        do {
-
                                // FIXME - implement horizantal bias for scaling as in followin GD functions
                                // to allow very tall images to be constrained only horizontally.
 
@@ -322,12 +371,17 @@ class Photo {
                $this->height = imagesy($this->image);
        }
 
-       public function rotate($degrees) {
-               if (!$this->is_valid()) {
+       /**
+        * @param integer $degrees degrees to rotate image
+        * @return mixed
+        */
+       public function rotate($degrees)
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        $this->image->setFirstIterator();
                        do {
                                $this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
@@ -336,17 +390,23 @@ class Photo {
                }
 
                // if script dies at this point check memory_limit setting in php.ini
-               $this->image  = imagerotate($this->image,$degrees,0);
+               $this->image  = imagerotate($this->image, $degrees, 0);
                $this->width  = imagesx($this->image);
                $this->height = imagesy($this->image);
        }
 
-       public function flip($horiz = true, $vert = false) {
-               if (!$this->is_valid()) {
+       /**
+        * @param boolean $horiz optional, default true
+        * @param boolean $vert  optional, default false
+        * @return mixed
+        */
+       public function flip($horiz = true, $vert = false)
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        $this->image->setFirstIterator();
                        do {
                                if ($horiz) {
@@ -375,20 +435,25 @@ class Photo {
                $this->image = $flipped;
        }
 
-       public function orient($filename) {
-               if ($this->is_imagick()) {
+       /**
+        * @param string $filename filename
+        * @return mixed
+        */
+       public function orient($filename)
+       {
+               if ($this->isImagick()) {
                        // based off comment on http://php.net/manual/en/imagick.getimageorientation.php
                        $orientation = $this->image->getImageOrientation();
                        switch ($orientation) {
-                       case imagick::ORIENTATION_BOTTOMRIGHT:
-                               $this->image->rotateimage("#000", 180);
-                               break;
-                       case imagick::ORIENTATION_RIGHTTOP:
-                               $this->image->rotateimage("#000", 90);
-                               break;
-                       case imagick::ORIENTATION_LEFTBOTTOM:
-                               $this->image->rotateimage("#000", -90);
-                               break;
+                               case imagick::ORIENTATION_BOTTOMRIGHT:
+                                       $this->image->rotateimage("#000", 180);
+                                       break;
+                               case imagick::ORIENTATION_RIGHTTOP:
+                                       $this->image->rotateimage("#000", 90);
+                                       break;
+                               case imagick::ORIENTATION_LEFTBOTTOM:
+                                       $this->image->rotateimage("#000", -90);
+                                       break;
                        }
 
                        $this->image->setImageOrientation(imagick::ORIENTATION_TOPLEFT);
@@ -396,7 +461,7 @@ class Photo {
                }
                // based off comment on http://php.net/manual/en/function.imagerotate.php
 
-               if (!$this->is_valid()) {
+               if (!$this->isValid()) {
                        return false;
                }
 
@@ -404,15 +469,14 @@ class Photo {
                        return;
                }
 
-               $exif = @exif_read_data($filename,null,true);
+               $exif = @exif_read_data($filename, null, true);
                if (!$exif) {
                        return;
                }
 
                $ort = $exif['IFD0']['Orientation'];
 
-               switch($ort)
-               {
+               switch ($ort) {
                        case 1: // nothing
                                break;
 
@@ -449,17 +513,18 @@ class Photo {
 
                //      logger('exif: ' . print_r($exif,true));
                return $exif;
-
        }
 
-
-
-       public function scaleImageUp($min) {
-               if (!$this->is_valid()) {
+       /**
+        * @param integer $min minimum dimension
+        * @return mixed
+        */
+       public function scaleImageUp($min)
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-
                $width = $this->getWidth();
                $height = $this->getHeight();
 
@@ -492,7 +557,7 @@ class Photo {
                        }
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        return $this->scaleImage($dest_width, $dest_height);
                }
 
@@ -511,14 +576,17 @@ class Photo {
                $this->height = imagesy($this->image);
        }
 
-
-
-       public function scaleImageSquare($dim) {
-               if (!$this->is_valid()) {
+       /**
+        * @param integer $dim dimension
+        * @return mixed
+        */
+       public function scaleImageSquare($dim)
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        $this->image->setFirstIterator();
                        do {
                                $this->image->scaleImage($dim, $dim);
@@ -541,13 +609,21 @@ class Photo {
                $this->height = imagesy($this->image);
        }
 
-
-       public function cropImage($max, $x, $y, $w, $h) {
-               if (!$this->is_valid()) {
+       /**
+        * @param integer $max maximum
+        * @param integer $x   x coordinate
+        * @param integer $y   y coordinate
+        * @param integer $w   width
+        * @param integer $h   height
+        * @return mixed
+        */
+       public function cropImage($max, $x, $y, $w, $h)
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        $this->image->setFirstIterator();
                        do {
                                $this->image->cropImage($w, $h, $x, $y);
@@ -576,8 +652,13 @@ class Photo {
                $this->height = imagesy($this->image);
        }
 
-       public function saveImage($path) {
-               if (!$this->is_valid()) {
+       /**
+        * @param string $path file path
+        * @return mixed
+        */
+       public function saveImage($path)
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
@@ -590,12 +671,16 @@ class Photo {
                $a->save_timestamp($stamp1, "file");
        }
 
-       public function imageString() {
-               if (!$this->is_valid()) {
+       /**
+        * @return mixed
+        */
+       public function imageString()
+       {
+               if (!$this->isValid()) {
                        return false;
                }
 
-               if ($this->is_imagick()) {
+               if ($this->isImagick()) {
                        /* Clean it */
                        $this->image = $this->image->deconstructImages();
                        $string = $this->image->getImagesBlob();
@@ -609,7 +694,7 @@ class Photo {
                // Enable interlacing
                imageinterlace($this->image, true);
 
-               switch($this->getType()){
+               switch ($this->getType()) {
                        case "image/png":
                                $quality = Config::get('system', 'png_quality');
                                if ((!$quality) || ($quality > 9)) {
@@ -630,10 +715,23 @@ class Photo {
                return $string;
        }
 
-
-
-       public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '') {
-
+       /**
+        * @param integer $uid       uid
+        * @param integer $cid       cid
+        * @param integer $rid       rid
+        * @param string  $filename  filename
+        * @param string  $album     album name
+        * @param integer $scale     scale
+        * @param integer $profile   optional, default = 0
+        * @param string  $allow_cid optional, default = ''
+        * @param string  $allow_gid optional, default = ''
+        * @param string  $deny_cid  optional, default = ''
+        * @param string  $deny_gid  optional, default = ''
+        * @param string  $desc      optional, default = ''
+        * @return object
+        */
+       public function store($uid, $cid, $rid, $filename, $album, $scale, $profile = 0, $allow_cid = '', $allow_gid = '', $deny_cid = '', $deny_gid = '', $desc = '')
+       {
                $r = dba::select('photo', array('guid'), array("`resource-id` = ? AND `guid` != ?", $rid, ''), array('limit' => 1));
                if (DBM::is_result($r)) {
                        $guid = $r['guid'];
@@ -656,417 +754,452 @@ class Photo {
 
                return $r;
        }
-}
-
 
-/**
- * Guess image mimetype from filename or from Content-Type header
- *
- * @arg $filename string Image filename
- * @arg $fromcurl boolean Check Content-Type header from curl request
- */
-function guess_image_type($filename, $fromcurl=false) {
-       logger('Photo: guess_image_type: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
-       $type = null;
-       if ($fromcurl) {
-               $a = get_app();
-               $headers=array();
-               $h = explode("\n",$a->get_curl_headers());
-               foreach ($h as $l) {
-                       list($k,$v) = array_map("trim", explode(":", trim($l), 2));
-                       $headers[$k] = $v;
-               }
-               if (array_key_exists('Content-Type', $headers))
-                       $type = $headers['Content-Type'];
-       }
-       if (is_null($type)){
-               // Guessing from extension? Isn't that... dangerous?
-               if (class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
-                       /**
-                        * Well, this not much better,
-                        * but at least it comes from the data inside the image,
-                        * we won't be tricked by a manipulated extension
-                        */
-                       $image = new Imagick($filename);
-                       $type = $image->getImageMimeType();
-                       $image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
-               } else {
-                       $ext = pathinfo($filename, PATHINFO_EXTENSION);
-                       $types = Photo::supportedTypes();
-                       $type = "image/jpeg";
-                       foreach ($types as $m => $e){
-                               if ($ext == $e) {
-                                       $type = $m;
+       /**
+        * Guess image mimetype from filename or from Content-Type header
+        *
+        * @param string  $filename Image filename
+        * @param boolean $fromcurl Check Content-Type header from curl request
+        *
+        * @return object
+        */
+       public function guessImageType($filename, $fromcurl = false)
+       {
+               logger('Photo: guessImageType: '.$filename . ($fromcurl?' from curl headers':''), LOGGER_DEBUG);
+               $type = null;
+               if ($fromcurl) {
+                       $a = get_app();
+                       $headers=array();
+                       $h = explode("\n", $a->get_curl_headers());
+                       foreach ($h as $l) {
+                               list($k,$v) = array_map("trim", explode(":", trim($l), 2));
+                               $headers[$k] = $v;
+                       }
+                       if (array_key_exists('Content-Type', $headers))
+                               $type = $headers['Content-Type'];
+               }
+               if (is_null($type)) {
+                       // Guessing from extension? Isn't that... dangerous?
+                       if (class_exists('Imagick') && file_exists($filename) && is_readable($filename)) {
+                               /**
+                                * Well, this not much better,
+                                * but at least it comes from the data inside the image,
+                                * we won't be tricked by a manipulated extension
+                                */
+                               $image = new Imagick($filename);
+                               $type = $image->getImageMimeType();
+                               $image->setInterlaceScheme(Imagick::INTERLACE_PLANE);
+                       } else {
+                               $ext = pathinfo($filename, PATHINFO_EXTENSION);
+                               $types = $this->supportedTypes();
+                               $type = "image/jpeg";
+                               foreach ($types as $m => $e) {
+                                       if ($ext == $e) {
+                                               $type = $m;
+                                       }
                                }
                        }
                }
+               logger('Photo: guessImageType: type='.$type, LOGGER_DEBUG);
+               return $type;
        }
-       logger('Photo: guess_image_type: type='.$type, LOGGER_DEBUG);
-       return $type;
 
-}
-
-/**
- * @brief Updates the avatar links in a contact only if needed
- *
- * @param string $avatar Link to avatar picture
- * @param int $uid User id of contact owner
- * @param int $cid Contact id
- * @param bool $force force picture update
- *
- * @return array Returns array of the different avatar sizes
- */
-function update_contact_avatar($avatar, $uid, $cid, $force = false) {
-       $r = q("SELECT `avatar`, `photo`, `thumb`, `micro`, `nurl` FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
-       if (!DBM::is_result($r)) {
-               return false;
-       } else {
-               $data = array($r[0]["photo"], $r[0]["thumb"], $r[0]["micro"]);
-       }
+       /**
+        * @brief Updates the avatar links in a contact only if needed
+        *
+        * @param string $avatar Link to avatar picture
+        * @param int    $uid    User id of contact owner
+        * @param int    $cid    Contact id
+        * @param bool   $force  force picture update
+        *
+        * @return array Returns array of the different avatar sizes
+        */
+       public function updateContactAvatar($avatar, $uid, $cid, $force = false)
+       {
+               // Limit = 1 returns the row so no need for dba:inArray()
+               $r = dba::select('contact', array('avatar', 'photo', 'thumb', 'micro', 'nurl'), array('id' => $cid), array('limit' => 1));
+               if (!DBM::is_result($r)) {
+                       return false;
+               } else {
+                       $data = array($r["photo"], $r["thumb"], $r["micro"]);
+               }
 
-       if (($r[0]["avatar"] != $avatar) || $force) {
-               $photos = import_profile_photo($avatar, $uid, $cid, true);
+               if (($r["avatar"] != $avatar) || $force) {
+                       $photos = $this->importProfilePhoto($avatar, $uid, $cid, true);
 
-               if ($photos) {
-                       q("UPDATE `contact` SET `avatar` = '%s', `photo` = '%s', `thumb` = '%s', `micro` = '%s', `avatar-date` = '%s' WHERE `id` = %d",
-                               dbesc($avatar), dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),
-                               dbesc(datetime_convert()), intval($cid));
+                       if ($photos) {
+                               dba::update(
+                                       'contact',
+                                       array('avatar' => $avatar, 'photo' => $photos[0], 'thumb' => $photos[1], 'micro' => $photos[2], 'avatar-date' => datetime_convert()),
+                                       array('id' => $cid)
+                               );
 
-                       // Update the public contact (contact id = 0)
-                       if ($uid != 0) {
-                               $pcontact = dba::select('contact', array('id'), array('nurl' => $r[0]['nurl']), array('limit' => 1));
-                               if (DBM::is_result($pcontact)) {
-                                       update_contact_avatar($avatar, 0, $pcontact['id'], $force);
+                               // Update the public contact (contact id = 0)
+                               if ($uid != 0) {
+                                       $pcontact = dba::select('contact', array('id'), array('nurl' => $r[0]['nurl']), array('limit' => 1));
+                                       if (DBM::is_result($pcontact)) {
+                                               $this->updateContactAvatar($avatar, 0, $pcontact['id'], $force);
+                                       }
                                }
-                       }
 
-                       return $photos;
+                               return $photos;
+                       }
                }
-       }
-
-       return $data;
-}
 
-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),
-               intval($cid)
-       );
-       if (DBM::is_result($r) && strlen($r[0]['resource-id'])) {
-               $hash = $r[0]['resource-id'];
-       } else {
-               $hash = photo_new_resource();
+               return $data;
        }
 
-       $photo_failure = false;
-
-       $filename = basename($photo);
-       $img_str = fetch_url($photo, true);
-
-       if ($quit_on_error && ($img_str == "")) {
-               return false;
-       }
-
-       $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);
-
-               if ($r === false)
-                       $photo_failure = true;
-
-               $img->scaleImage(80);
-
-               $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);
+       /**
+        * @param string  $photo         photo
+        * @param integer $uid           user id
+        * @param integer $cid           contact id
+        * @param boolean $quit_on_error optional, default false
+        * @return array
+        */
+       private function importProfilePhoto($photo, $uid, $cid, $quit_on_error = false)
+       {
+               $r = dba::select(
+                       'photo',
+                       array('resource-id'),
+                       array('uid' => $uid, 'contact-id' => $cid, 'scale' => 4, 'album' => 'Contact Photos'),
+                       array('limit' => 1)
+               );
 
-               if ($r === false) {
-                       $photo_failure = true;
+               if (DBM::is_result($r) && strlen($r['resource-id'])) {
+                       $hash = $r['resource-id'];
+               } else {
+                       $hash = photo_new_resource();
+               }
+       
+               $photo_failure = false;
+       
+               $filename = basename($photo);
+               $img_str = fetch_url($photo, true);
+       
+               if ($quit_on_error && ($img_str == "")) {
+                       return false;
                }
-
-               $suffix = '?ts='.time();
-
-               $photo = System::baseUrl() . '/photo/' . $hash . '-4.' . $img->getExt() . $suffix;
-               $thumb = System::baseUrl() . '/photo/' . $hash . '-5.' . $img->getExt() . $suffix;
-               $micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $img->getExt() . $suffix;
-
-               // Remove the cached photo
-               $a = get_app();
-               $basepath = $a->get_basepath();
-
-               if (is_dir($basepath."/photo")) {
-                       $filename = $basepath.'/photo/'.$hash.'-4.'.$img->getExt();
-                       if (file_exists($filename)) {
-                               unlink($filename);
+       
+               $type = $this->guessImageType($photo, true);
+               $img = new Photo($img_str, $type);
+               if ($img->isValid()) {
+                       $img->scaleImageSquare(175);
+       
+                       $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 4);
+       
+                       if ($r === false) {
+                               $photo_failure = true;
                        }
-                       $filename = $basepath.'/photo/'.$hash.'-5.'.$img->getExt();
-                       if (file_exists($filename)) {
-                               unlink($filename);
+       
+                       $img->scaleImage(80);
+       
+                       $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 5);
+       
+                       if ($r === false) {
+                               $photo_failure = true;
                        }
-                       $filename = $basepath.'/photo/'.$hash.'-6.'.$img->getExt();
-                       if (file_exists($filename)) {
-                               unlink($filename);
+       
+                       $img->scaleImage(48);
+       
+                       $r = $img->store($uid, $cid, $hash, $filename, 'Contact Photos', 6);
+       
+                       if ($r === false) {
+                               $photo_failure = true;
                        }
-               }
-       } else {
-               $photo_failure = true;
-       }
-
-       if ($photo_failure && $quit_on_error) {
-               return false;
-       }
-
-       if ($photo_failure) {
-               $photo = System::baseUrl() . '/images/person-175.jpg';
-               $thumb = System::baseUrl() . '/images/person-80.jpg';
-               $micro = System::baseUrl() . '/images/person-48.jpg';
-       }
-
-       return(array($photo,$thumb,$micro));
-
-}
-
-function get_photo_info($url) {
-       $data = array();
-
-       $data = Cache::get($url);
-
-       if (is_null($data) || !$data || !is_array($data)) {
-               $img_str = fetch_url($url, true, $redirects, 4);
-               $filesize = strlen($img_str);
-
-               if (function_exists("getimagesizefromstring")) {
-                       $data = getimagesizefromstring($img_str);
-               } else {
-                       $tempfile = tempnam(get_temppath(), "cache");
-
+       
+                       $suffix = '?ts='.time();
+       
+                       $photo = System::baseUrl() . '/photo/' . $hash . '-4.' . $img->getExt() . $suffix;
+                       $thumb = System::baseUrl() . '/photo/' . $hash . '-5.' . $img->getExt() . $suffix;
+                       $micro = System::baseUrl() . '/photo/' . $hash . '-6.' . $img->getExt() . $suffix;
+       
+                       // Remove the cached photo
                        $a = get_app();
-                       $stamp1 = microtime(true);
-                       file_put_contents($tempfile, $img_str);
-                       $a->save_timestamp($stamp1, "file");
-
-                       $data = getimagesize($tempfile);
-                       unlink($tempfile);
+                       $basepath = $a->get_basepath();
+       
+                       if (is_dir($basepath."/photo")) {
+                               $filename = $basepath.'/photo/'.$hash.'-4.'.$img->getExt();
+                               if (file_exists($filename)) {
+                                       unlink($filename);
+                               }
+                               $filename = $basepath.'/photo/'.$hash.'-5.'.$img->getExt();
+                               if (file_exists($filename)) {
+                                       unlink($filename);
+                               }
+                               $filename = $basepath.'/photo/'.$hash.'-6.'.$img->getExt();
+                               if (file_exists($filename)) {
+                                       unlink($filename);
+                               }
+                       }
+               } else {
+                       $photo_failure = true;
                }
-
-               if ($data) {
-                       $data["size"] = $filesize;
+       
+               if ($photo_failure && $quit_on_error) {
+                       return false;
                }
-
-               Cache::set($url, $data);
+       
+               if ($photo_failure) {
+                       $photo = System::baseUrl() . '/images/person-175.jpg';
+                       $thumb = System::baseUrl() . '/images/person-80.jpg';
+                       $micro = System::baseUrl() . '/images/person-48.jpg';
+               }
+       
+               return(array($photo, $thumb, $micro));
        }
 
-       return $data;
-}
-
-function scale_image($width, $height, $max) {
-
-       $dest_width = $dest_height = 0;
-
-       if ((!$width) || (!$height)) {
-               return false;
+       /**
+        * @param string $url url
+        * @return object
+        */
+       public function getPhotoInfo($url)
+       {
+               $data = array();
+       
+               $data = Cache::get($url);
+       
+               if (is_null($data) || !$data || !is_array($data)) {
+                       $img_str = fetch_url($url, true, $redirects, 4);
+                       $filesize = strlen($img_str);
+       
+                       if (function_exists("getimagesizefromstring")) {
+                               $data = getimagesizefromstring($img_str);
+                       } else {
+                               $tempfile = tempnam(get_temppath(), "cache");
+       
+                               $a = get_app();
+                               $stamp1 = microtime(true);
+                               file_put_contents($tempfile, $img_str);
+                               $a->save_timestamp($stamp1, "file");
+       
+                               $data = getimagesize($tempfile);
+                               unlink($tempfile);
+                       }
+       
+                       if ($data) {
+                               $data["size"] = $filesize;
+                       }
+       
+                       Cache::set($url, $data);
+               }
+       
+               return $data;
        }
 
-       if ($width > $max && $height > $max) {
-
-               // very tall image (greater than 16:9)
-               // constrain the width - let the height float.
-
-               if ((($height * 9) / 16) > $width) {
-                       $dest_width = $max;
-                       $dest_height = intval(($height * $max) / $width);
-               } elseif ($width > $height) {
-                       // else constrain both dimensions
-                       $dest_width = $max;
-                       $dest_height = intval(($height * $max) / $width);
-               } else {
-                       $dest_width = intval(($width * $max) / $height);
-                       $dest_height = $max;
+       /**
+        * @param integer $width  width
+        * @param integer $height height
+        * @param integer $max    max
+        * @return array
+        */
+       public function scaleImageTo($width, $height, $max)
+       {
+               $dest_width = $dest_height = 0;
+       
+               if ((!$width) || (!$height)) {
+                       return false;
                }
-       } else {
-               if ($width > $max) {
-                       $dest_width = $max;
-                       $dest_height = intval(($height * $max) / $width);
+       
+               if ($width > $max && $height > $max) {
+                       // very tall image (greater than 16:9)
+                       // constrain the width - let the height float.
+       
+                       if ((($height * 9) / 16) > $width) {
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } elseif ($width > $height) {
+                               // else constrain both dimensions
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } else {
+                               $dest_width = intval(($width * $max) / $height);
+                               $dest_height = $max;
+                       }
                } else {
-                       if ($height > $max) {
-
-                               // very tall image (greater than 16:9)
-                               // but width is OK - don't do anything
-
-                               if ((($height * 9) / 16) > $width) {
+                       if ($width > $max) {
+                               $dest_width = $max;
+                               $dest_height = intval(($height * $max) / $width);
+                       } else {
+                               if ($height > $max) {
+                                       // very tall image (greater than 16:9)
+                                       // but width is OK - don't do anything
+       
+                                       if ((($height * 9) / 16) > $width) {
+                                               $dest_width = $width;
+                                               $dest_height = $height;
+                                       } else {
+                                               $dest_width = intval(($width * $max) / $height);
+                                               $dest_height = $max;
+                                       }
+                               } else {
                                        $dest_width = $width;
                                        $dest_height = $height;
-                               } else {
-                                       $dest_width = intval(($width * $max) / $height);
-                                       $dest_height = $max;
                                }
-                       } else {
-                               $dest_width = $width;
-                               $dest_height = $height;
                        }
                }
+               return array("width" => $dest_width, "height" => $dest_height);
        }
-       return array("width" => $dest_width, "height" => $dest_height);
-}
-
-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));
-
-       if (!DBM::is_result($r)) {
-               logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
-               return(array());
-       }
-
-       $page_owner_nick  = $r[0]['nickname'];
-
-       /// @TODO
-       /// $default_cid      = $r[0]['id'];
-       /// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
-
-       if ((strlen($imagedata) == 0) && ($url == "")) {
-               logger("No image data and no url provided", LOGGER_DEBUG);
-               return(array());
-       } elseif (strlen($imagedata) == 0) {
-               logger("Uploading picture from ".$url, LOGGER_DEBUG);
 
+       /**
+        * @brief This function doesn't seem to be used
+        * @param object  $a         App
+        * @param integer $uid       user id
+        * @param string  $imagedata optional, default empty
+        * @param string  $url       optional, default empty
+        * @return array
+        */
+       private function storePhoto(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)
+               );
+       
+               if (!DBM::is_result($r)) {
+                       logger("Can't detect user data for uid ".$uid, LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $page_owner_nick  = $r[0]['nickname'];
+       
+               /// @TODO
+               /// $default_cid      = $r[0]['id'];
+               /// $community_page   = (($r[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
+       
+               if ((strlen($imagedata) == 0) && ($url == "")) {
+                       logger("No image data and no url provided", LOGGER_DEBUG);
+                       return(array());
+               } elseif (strlen($imagedata) == 0) {
+                       logger("Uploading picture from ".$url, LOGGER_DEBUG);
+       
+                       $stamp1 = microtime(true);
+                       $imagedata = @file_get_contents($url);
+                       $a->save_timestamp($stamp1, "file");
+               }
+       
+               $maximagesize = Config::get('system', 'maximagesize');
+       
+               if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
+                       logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $tempfile = tempnam(get_temppath(), "cache");
+       
                $stamp1 = microtime(true);
-               $imagedata = @file_get_contents($url);
+               file_put_contents($tempfile, $imagedata);
                $a->save_timestamp($stamp1, "file");
-       }
-
-       $maximagesize = Config::get('system', 'maximagesize');
-
-       if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
-               logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
-               return(array());
-       }
-
-       $tempfile = tempnam(get_temppath(), "cache");
-
-       $stamp1 = microtime(true);
-       file_put_contents($tempfile, $imagedata);
-       $a->save_timestamp($stamp1, "file");
-
-       $data = getimagesize($tempfile);
-
-       if (!isset($data["mime"])) {
-               unlink($tempfile);
-               logger("File is no picture", LOGGER_DEBUG);
-               return(array());
-       }
-
-       $ph = new Photo($imagedata, $data["mime"]);
-
-       if (!$ph->is_valid()) {
-               unlink($tempfile);
-               logger("Picture is no valid picture", LOGGER_DEBUG);
-               return(array());
-       }
-
-       $ph->orient($tempfile);
-       unlink($tempfile);
-
-       $max_length = Config::get('system', 'max_image_length');
-       if (! $max_length) {
-               $max_length = MAX_IMAGE_LENGTH;
-       }
-       if ($max_length > 0) {
-               $ph->scaleImage($max_length);
-       }
-
-       $width = $ph->getWidth();
-       $height = $ph->getHeight();
-
-       $hash = photo_new_resource();
-
-       $smallest = 0;
-
-       // Pictures are always public by now
-       //$defperm = '<'.$default_cid.'>';
-       $defperm = "";
-       $visitor = 0;
-
-       $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
-
-       if (!$r) {
-               logger("Picture couldn't be stored", LOGGER_DEBUG);
-               return(array());
-       }
-
-       $image = array("page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
-                       "full" => System::baseUrl()."/photo/{$hash}-0.".$ph->getExt());
-
-       if ($width > 800 || $height > 800) {
-               $image["large"] = System::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"] = System::baseUrl()."/photo/{$hash}-1.".$ph->getExt();
+       
+               $data = getimagesize($tempfile);
+       
+               if (!isset($data["mime"])) {
+                       unlink($tempfile);
+                       logger("File is no picture", LOGGER_DEBUG);
+                       return(array());
                }
-       }
-
-       if ($width > 320 || $height > 320) {
-               $ph->scaleImage(320);
-               $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
-               if ($r) {
-                       $image["small"] = System::baseUrl()."/photo/{$hash}-2.".$ph->getExt();
+       
+               $ph = new Photo($imagedata, $data["mime"]);
+       
+               if (!$ph->isValid()) {
+                       unlink($tempfile);
+                       logger("Picture is no valid picture", LOGGER_DEBUG);
+                       return(array());
                }
-       }
-
-       if ($width > 160 && $height > 160) {
-               $x = 0;
-               $y = 0;
-
-               $min = $ph->getWidth();
-               if ($min > 160) {
-                       $x = ($min - 160) / 2;
+       
+               $ph->orient($tempfile);
+               unlink($tempfile);
+       
+               $max_length = Config::get('system', 'max_image_length');
+               if (! $max_length) {
+                       $max_length = MAX_IMAGE_LENGTH;
+               }
+               if ($max_length > 0) {
+                       $ph->scaleImage($max_length);
+               }
+       
+               $width = $ph->getWidth();
+               $height = $ph->getHeight();
+       
+               $hash = photo_new_resource();
+       
+               $smallest = 0;
+       
+               // Pictures are always public by now
+               //$defperm = '<'.$default_cid.'>';
+               $defperm = "";
+               $visitor = 0;
+       
+               $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 0, 0, $defperm);
+       
+               if (!$r) {
+                       logger("Picture couldn't be stored", LOGGER_DEBUG);
+                       return(array());
+               }
+       
+               $image = array("page" => System::baseUrl().'/photos/'.$page_owner_nick.'/image/'.$hash,
+                               "full" => System::baseUrl()."/photo/{$hash}-0.".$ph->getExt());
+       
+               if ($width > 800 || $height > 800) {
+                       $image["large"] = System::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"] = System::baseUrl()."/photo/{$hash}-1.".$ph->getExt();
+                       }
                }
-
-               if ($ph->getHeight() < $min) {
-                       $min = $ph->getHeight();
-                       if ($min > 160) {
-                               $y = ($min - 160) / 2;
+       
+               if ($width > 320 || $height > 320) {
+                       $ph->scaleImage(320);
+                       $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 2, 0, $defperm);
+                       if ($r) {
+                               $image["small"] = System::baseUrl()."/photo/{$hash}-2.".$ph->getExt();
                        }
                }
-
-               $min = 160;
-               $ph->cropImage(160, $x, $y, $min, $min);
-
-               $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
-               if ($r) {
-                       $image["thumb"] = System::baseUrl()."/photo/{$hash}-3.".$ph->getExt();
+       
+               if ($width > 160 && $height > 160) {
+                       $x = 0;
+                       $y = 0;
+       
+                       $min = $ph->getWidth();
+                       if ($min > 160) {
+                               $x = ($min - 160) / 2;
+                       }
+       
+                       if ($ph->getHeight() < $min) {
+                               $min = $ph->getHeight();
+                               if ($min > 160) {
+                                       $y = ($min - 160) / 2;
+                               }
+                       }
+       
+                       $min = 160;
+                       $ph->cropImage(160, $x, $y, $min, $min);
+       
+                       $r = $ph->store($uid, $visitor, $hash, $tempfile, t('Wall Photos'), 3, 0, $defperm);
+                       if ($r) {
+                               $image["thumb"] = System::baseUrl()."/photo/{$hash}-3.".$ph->getExt();
+                       }
                }
+       
+               // Set the full image as preview image. This will be overwritten, if the picture is larger than 640.
+               $image["preview"] = $image["full"];
+       
+               // Deactivated, since that would result in a cropped preview, if the picture wasn't larger than 320
+               //if (isset($image["thumb"]))
+               //      $image["preview"] = $image["thumb"];
+       
+               // Unsure, if this should be activated or deactivated
+               //if (isset($image["small"]))
+               //      $image["preview"] = $image["small"];
+       
+               if (isset($image["medium"])) {
+                       $image["preview"] = $image["medium"];
+               }
+       
+               return($image);
        }
-
-       // Set the full image as preview image. This will be overwritten, if the picture is larger than 640.
-       $image["preview"] = $image["full"];
-
-       // Deactivated, since that would result in a cropped preview, if the picture wasn't larger than 320
-       //if (isset($image["thumb"]))
-       //      $image["preview"] = $image["thumb"];
-
-       // Unsure, if this should be activated or deactivated
-       //if (isset($image["small"]))
-       //      $image["preview"] = $image["small"];
-
-       if (isset($image["medium"])) {
-               $image["preview"] = $image["medium"];
-       }
-
-       return($image);
 }
index c5c23d7d9c7fc5780eb101f6a86dba8f33d184fa..954ef5d48238d95c7299de7fded6652aa8b0d119 100644 (file)
@@ -353,7 +353,7 @@ class ParseUrl
                                }
 
                                $src = self::completeUrl($attr["src"], $url);
-                               $photodata = get_photo_info($src);
+                               $photodata = Photo::getPhotoInfo($src);
 
                                if (($photodata) && ($photodata[0] > 150) && ($photodata[1] > 150)) {
                                        if ($photodata[0] > 300) {
@@ -374,7 +374,7 @@ class ParseUrl
 
                        unset($siteinfo["image"]);
 
-                       $photodata = get_photo_info($src);
+                       $photodata = Photo::getPhotoInfo($src);
 
                        if (($photodata) && ($photodata[0] > 10) && ($photodata[1] > 10)) {
                                $siteinfo["images"][] = array("src" => $src,
index 47aeaf05e57e14dd47595fd45a972447f79606a7..db1ded496b7014b7f4cd713439a0d39e42029e31 100644 (file)
@@ -15,6 +15,7 @@ use Friendica\Core\Worker;
 use Friendica\Database\DBM;
 use Friendica\Model\GlobalContact;
 use Friendica\Object\Contact;
+use Friendica\Object\Photo;
 use Friendica\Object\Profile;
 use Friendica\Protocol\OStatus;
 use Friendica\Util\XML;
@@ -1659,7 +1660,7 @@ class DFRN
                                );
                        }
 
-                       update_contact_avatar(
+                       Photo::updateContactAvatar(
                                $author["avatar"],
                                $importer["uid"],
                                $contact["id"],
@@ -2034,7 +2035,7 @@ class DFRN
                        dbesc(normalise_link($old["url"]))
                );
 
-               update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
+               Photo::updateContactAvatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
 
                if ($x === false) {
                        return false;
index 2ffaac642ab80d6b0984b9217622ca76d7a2b6f1..bb1a3f46e95bc1e27f750283e8603d678c347c5a 100644 (file)
@@ -2211,7 +2211,7 @@ class Diaspora
                        $image_url = "http://".$handle_parts[1].$image_url;
                }
 
-               update_contact_avatar($image_url, $importer["uid"], $contact["id"]);
+               Photo::updateContactAvatar($image_url, $importer["uid"], $contact["id"]);
 
                // Generic birthday. We don't know the timezone. The year is irrelevant.
 
@@ -2471,7 +2471,7 @@ class Diaspora
                        group_add_member($importer["uid"], "", $contact_record["id"], $def_gid);
                }
 
-               update_contact_avatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
+               Photo::updateContactAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
 
                if ($importer["page-flags"] == PAGE_NORMAL) {
                        logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
@@ -2494,7 +2494,7 @@ class Diaspora
 
                        logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
 
-                       update_contact_avatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
+                       Photo::updateContactAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
 
                        // technically they are sharing with us (CONTACT_IS_SHARING),
                        // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
index 206d188f5c3bdfcb862e6d2c6ccab92d99c59156..8d48873150e47b9eb783628b897c810dfc06f6d6 100644 (file)
@@ -203,7 +203,7 @@ class OStatus
 
                        if (!empty($author["author-avatar"]) && ($author["author-avatar"] != $current['avatar'])) {
                                logger("Update profile picture for contact ".$contact["id"], LOGGER_DEBUG);
-                               update_contact_avatar($author["author-avatar"], $importer["uid"], $contact["id"]);
+                               Photo::updateContactAvatar($author["author-avatar"], $importer["uid"], $contact["id"]);
                        }
 
                        // Ensure that we are having this contact (with uid=0)
@@ -223,7 +223,7 @@ class OStatus
                                dba::update('contact', $fields, array('id' => $cid), $old_contact);
 
                                // Update the avatar
-                               update_contact_avatar($author["author-avatar"], 0, $cid);
+                               Photo::updateContactAvatar($author["author-avatar"], 0, $cid);
                        }
 
                        $contact["generation"] = 2;
@@ -1326,7 +1326,7 @@ class OStatus
 
                switch ($siteinfo["type"]) {
                        case 'photo':
-                               $imgdata = get_photo_info($siteinfo["image"]);
+                               $imgdata = Photo::getPhotoInfo($siteinfo["image"]);
                                $attributes = array("rel" => "enclosure",
                                                "href" => $siteinfo["image"],
                                                "type" => $imgdata["mime"],
@@ -1346,7 +1346,7 @@ class OStatus
                }
 
                if (!Config::get('system', 'ostatus_not_attach_preview') && ($siteinfo["type"] != "photo") && isset($siteinfo["image"])) {
-                       $imgdata = get_photo_info($siteinfo["image"]);
+                       $imgdata = Photo::getPhotoInfo($siteinfo["image"]);
                        $attributes = array("rel" => "enclosure",
                                        "href" => $siteinfo["image"],
                                        "type" => $imgdata["mime"],
index f228bf73519a95c81e221dea223fe51c123d9c2d..ba0867d3a8ca3cfd7c423c25c4486b2df41ecbcd 100644 (file)
@@ -154,7 +154,7 @@ function update_1014()
        if (DBM::is_result($r)) {
                foreach ($r as $rr) {
                        $ph = new Photo($rr['data']);
-                       if ($ph->is_valid()) {
+                       if ($ph->isValid()) {
                                $ph->scaleImage(48);
                                $ph->store($rr['uid'],$rr['contact-id'],$rr['resource-id'],$rr['filename'],$rr['album'],6,(($rr['profile']) ? 1 : 0));
                        }