Merge pull request #5967 from annando/ap-nick

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 7d0c3178cf0600831055aed9b20d906d7f4a6208..22f192b4ce6fa8f34f5308fdae4f80c2109f3f47 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -4,6 +4,7 @@
  */
 
 use Friendica\App;
+use Friendica\BaseModule;
 use Friendica\Content\ContactSelector;
 use Friendica\Content\Feature;
 use Friendica\Content\Nav;
@@ -20,6 +21,7 @@ use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
+use Friendica\Module\Login;
 
 function profiles_init(App $a) {
 
@@ -40,7 +42,7 @@ function profiles_init(App $a) {
                        return; // NOTREACHED
                }
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_drop', 't');
 
                // move every contact using this profile as their default to the user default
 
@@ -63,7 +65,7 @@ function profiles_init(App $a) {
 
        if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_new', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
@@ -99,7 +101,7 @@ function profiles_init(App $a) {
 
        if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_clone', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
@@ -194,7 +196,7 @@ function profiles_post(App $a) {
                        return;
                }
 
-               check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
+               BaseModule::checkFormSecurityTokenRedirectOnError('/profiles', 'profile_edit');
 
                $is_default = (($orig[0]['is-default']) ? 1 : 0);
 
@@ -509,7 +511,7 @@ function profiles_content(App $a) {
 
        if (! local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $o = '';
@@ -564,10 +566,10 @@ function profiles_content(App $a) {
                        ],
 
                        '$multi_profiles'               => Feature::isEnabled(local_user(), 'multi_profiles'),
-                       '$form_security_token'          => get_form_security_token("profile_edit"),
-                       '$form_security_token_photo'    => get_form_security_token("profile_photo"),
-                       '$profile_clone_link'           => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone") : ""),
-                       '$profile_drop_link'            => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
+                       '$form_security_token'          => BaseModule::getFormSecurityToken("profile_edit"),
+                       '$form_security_token_photo'    => BaseModule::getFormSecurityToken("profile_photo"),
+                       '$profile_clone_link'           => ((Feature::isEnabled(local_user(), 'multi_profiles')) ? 'profiles/clone/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_clone") : ""),
+                       '$profile_drop_link'            => 'profiles/drop/' . $r[0]['id'] . '?t=' . BaseModule::getFormSecurityToken("profile_drop"),
 
                        '$profile_action' => L10n::t('Profile Actions'),
                        '$banner'       => L10n::t('Edit Profile Details'),
@@ -666,7 +668,7 @@ function profiles_content(App $a) {
                        $profiles = '';
                        foreach ($r as $rr) {
                                $profiles .= replace_macros($tpl, [
-                                       '$photo'        => $a->remove_baseurl($rr['thumb']),
+                                       '$photo'        => $a->removeBaseURL($rr['thumb']),
                                        '$id'           => $rr['id'],
                                        '$alt'          => L10n::t('Profile Image'),
                                        '$profile_name' => $rr['profile-name'],
@@ -680,7 +682,7 @@ function profiles_content(App $a) {
                                '$header'      => L10n::t('Edit/Manage Profiles'),
                                '$chg_photo'   => L10n::t('Change profile photo'),
                                '$cr_new'      => L10n::t('Create New Profile'),
-                               '$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new"),
+                               '$cr_new_link' => 'profiles/new?t=' . BaseModule::getFormSecurityToken("profile_new"),
                                '$profiles'    => $profiles
                        ]);
                }