extend checkbox template for customized attributes

[friendica.git] / mod / profile_photo.php

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index f9bf60cf543605b0322a01903d115669baa3bd24..b4723b215ff1e5bd8aeba1edfee74167c7b5c2a6 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,5 +1,8 @@
 <?php
 
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once("include/Photo.php");
 
 function profile_photo_init(App $a) {
@@ -9,10 +12,8 @@ function profile_photo_init(App $a) {
        }
 
        profile_load($a,$a->user['nickname']);
-
 }
 
-
 function profile_photo_post(App $a) {
 
        if (! local_user()) {
@@ -102,15 +103,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 +127,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'];
+                               $url = System::baseUrl() . '/profile/' . $a->user['nickname'];
                                if ($url && strlen(get_config('system','directory'))) {
                                        proc_run(PRIORITY_LOW, "include/directory.php", $url);
                                }
 
-                               require_once('include/profile_update.php');
-                               profile_change();
+                               proc_run(PRIORITY_LOW, 'include/profile_update.php', local_user());
                        } else {
                                notice( t('Unable to process image') . EOL);
                        }
                }
 
-               goaway(App::get_baseurl() . '/profiles');
+               goaway(System::baseUrl() . '/profiles');
                return; // NOTREACHED
        }
 
@@ -232,7 +232,7 @@ function profile_photo_content(App $a) {
                                proc_run(PRIORITY_LOW, "include/directory.php", $url);
                        }
 
-                       goaway(App::get_baseurl() . '/profiles');
+                       goaway(System::baseUrl() . '/profiles');
                        return; // NOTREACHED
                }
                $ph = new Photo($r[0]['data'], $r[0]['type']);
@@ -257,7 +257,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;
@@ -270,7 +270,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"),