Merge pull request #3985 from hoergen/develop

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 9b1ff8adb8e9c5b2ba3a01fc4891c9c9f1927ae4..e80b9ee84e02a15024be814d3e070a8ad243222c 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,19 +1,23 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+
 require_once("include/Photo.php");
 
-function profile_photo_init(App &$a) {
+function profile_photo_init(App $a) {
 
        if (! local_user()) {
                return;
        }
 
        profile_load($a,$a->user['nickname']);
-
 }
 
-
-function profile_photo_post(App &$a) {
+function profile_photo_post(App $a) {
 
        if (! local_user()) {
                notice ( t('Permission denied.') . EOL );
@@ -32,7 +36,7 @@ function profile_photo_post(App &$a) {
                                intval($_REQUEST['profile']),
                                intval(local_user())
                        );
-                       if (dbm::is_result($r) && (! intval($r[0]['is-default'])))
+                       if (DBM::is_result($r) && (! intval($r[0]['is-default'])))
                                $is_default_profile = 0;
                }
 
@@ -63,7 +67,7 @@ function profile_photo_post(App &$a) {
                        dbesc(local_user()),
                        intval($scale));
 
-               if (dbm::is_result($r)) {
+               if (DBM::is_result($r)) {
 
                        $base_image = $r[0];
 
@@ -102,15 +106,15 @@ function profile_photo_post(App &$a) {
                                        );
 
                                        $r = q("UPDATE `contact` SET `photo` = '%s', `thumb` = '%s', `micro` = '%s'  WHERE `self` AND `uid` = %d",
-                                               dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
-                                               dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
-                                               dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
+                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
+                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
+                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-6.' . $im->getExt()),
                                                intval(local_user())
                                        );
                                } else {
                                        $r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
-                                               dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
-                                               dbesc(App::get_baseurl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
+                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $im->getExt()),
+                                               dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $im->getExt()),
                                                intval($_REQUEST['profile']),
                                                intval(local_user())
                                        );
@@ -126,19 +130,18 @@ function profile_photo_post(App &$a) {
 
                                info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
                                // Update global directory in background
-                               $url = App::get_baseurl() . '/profile/' . $a->user['nickname'];
-                               if ($url && strlen(get_config('system','directory'))) {
-                                       proc_run(PRIORITY_LOW, "include/directory.php", $url);
+                               $url = System::baseUrl() . '/profile/' . $a->user['nickname'];
+                               if ($url && strlen(Config::get('system','directory'))) {
+                                       Worker::add(PRIORITY_LOW, "Directory", $url);
                                }
 
-                               require_once('include/profile_update.php');
-                               profile_change();
-                       }
-                       else
+                               Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
+                       } else {
                                notice( t('Unable to process image') . EOL);
+                       }
                }
 
-               goaway(App::get_baseurl() . '/profiles');
+               goaway(System::baseUrl() . '/profiles');
                return; // NOTREACHED
        }
 
@@ -146,11 +149,13 @@ function profile_photo_post(App &$a) {
        $filename = basename($_FILES['userfile']['name']);
        $filesize = intval($_FILES['userfile']['size']);
        $filetype = $_FILES['userfile']['type'];
-    if ($filetype=="") $filetype=guess_image_type($filename);
-    
-       $maximagesize = get_config('system','maximagesize');
+       if ($filetype == "") {
+               $filetype = guess_image_type($filename);
+       }
 
-       if(($maximagesize) && ($filesize > $maximagesize)) {
+       $maximagesize = Config::get('system','maximagesize');
+
+       if (($maximagesize) && ($filesize > $maximagesize)) {
                notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
                @unlink($src);
                return;
@@ -159,7 +164,7 @@ function profile_photo_post(App &$a) {
        $imagedata = @file_get_contents($src);
        $ph = new Photo($imagedata, $filetype);
 
-       if(! $ph->is_valid()) {
+       if (! $ph->is_valid()) {
                notice( t('Unable to process image.') . EOL );
                @unlink($src);
                return;
@@ -168,18 +173,17 @@ function profile_photo_post(App &$a) {
        $ph->orient($src);
        @unlink($src);
        return profile_photo_crop_ui_head($a, $ph);
-       
 }
 
 
 if(! function_exists('profile_photo_content')) {
-function profile_photo_content(App &$a) {
+function profile_photo_content(App $a) {
 
        if (! local_user()) {
                notice( t('Permission denied.') . EOL );
                return;
        }
-       
+
        $newuser = false;
 
        if($a->argc == 2 && $a->argv[1] === 'new')
@@ -190,16 +194,16 @@ function profile_photo_content(App &$a) {
                        notice( t('Permission denied.') . EOL );
                        return;
                };
-               
+
 //             check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
-        
+
                $resource_id = $a->argv[2];
                //die(":".local_user());
                $r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
                        intval(local_user()),
                        dbesc($resource_id)
                        );
-               if (!dbm::is_result($r)){
+               if (!DBM::is_result($r)){
                        notice( t('Permission denied.') . EOL );
                        return;
                }
@@ -227,11 +231,11 @@ function profile_photo_content(App &$a) {
 
                        // Update global directory in background
                        $url = $_SESSION['my_url'];
-                       if ($url && strlen(get_config('system','directory'))) {
-                               proc_run(PRIORITY_LOW, "include/directory.php", $url);
+                       if ($url && strlen(Config::get('system','directory'))) {
+                               Worker::add(PRIORITY_LOW, "Directory", $url);
                        }
 
-                       goaway(App::get_baseurl() . '/profiles');
+                       goaway(System::baseUrl() . '/profiles');
                        return; // NOTREACHED
                }
                $ph = new Photo($r[0]['data'], $r[0]['type']);
@@ -245,7 +249,7 @@ function profile_photo_content(App &$a) {
 
 
        if(! x($a->config,'imagecrop')) {
-       
+
                $tpl = get_markup_template('profile_photo.tpl');
 
                $o .= replace_macros($tpl,array(
@@ -256,7 +260,7 @@ function profile_photo_content(App &$a) {
                        '$submit' => t('Upload'),
                        '$profiles' => $profiles,
                        '$form_security_token' => get_form_security_token("profile_photo"),
-                       '$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . App::get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. App::get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
+                       '$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
                ));
 
                return $o;
@@ -269,7 +273,7 @@ function profile_photo_content(App &$a) {
                        '$filename' => $filename,
                        '$profile' => intval($_REQUEST['profile']),
                        '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
-                       '$image_url' => App::get_baseurl() . '/photo/' . $filename,
+                       '$image_url' => System::baseUrl() . '/photo/' . $filename,
                        '$title' => t('Crop Image'),
                        '$desc' => t('Please adjust the image cropping for optimum viewing.'),
                        '$form_security_token' => get_form_security_token("profile_photo"),
@@ -283,8 +287,8 @@ function profile_photo_content(App &$a) {
 
 
 if(! function_exists('profile_photo_crop_ui_head')) {
-function profile_photo_crop_ui_head(&$a, $ph){
-       $max_length = get_config('system','max_image_length');
+function profile_photo_crop_ui_head(App $a, $ph) {
+       $max_length = Config::get('system','max_image_length');
        if (! $max_length) {
                $max_length = MAX_IMAGE_LENGTH;
        }
@@ -302,11 +306,11 @@ function profile_photo_crop_ui_head(&$a, $ph){
        }
 
        $hash = photo_new_resource();
-       
+
 
        $smallest = 0;
 
-       $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );   
+       $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 0 );
 
        if ($r) {
                info( t('Image uploaded successfully.') . EOL );
@@ -316,7 +320,7 @@ function profile_photo_crop_ui_head(&$a, $ph){
 
        if ($width > 640 || $height > 640) {
                $ph->scaleImage(640);
-               $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );   
+               $r = $ph->store(local_user(), 0 , $hash, $filename, t('Profile Photos'), 1 );
 
                if ($r === false) {
                        notice( sprintf(t('Image size reduction [%s] failed.'),"640") . EOL );