]> git.mxchange.org Git - friendica.git/blobdiff - mod/profiles.php
Merge pull request #5912 from MrPetovan/bug/fix-code-tag-nonsense
[friendica.git] / mod / profiles.php
index 448463554d4ab055470f2dd2dabb2426d0016f43..3e6bd1cb0d0ff29bacf720540dcf125cd2132e1c 100644 (file)
@@ -14,13 +14,13 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 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) {
 
@@ -35,7 +35,7 @@ function profiles_init(App $a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if (! DBM::is_result($r)) {
+               if (! DBA::isResult($r)) {
                        notice(L10n::t('Profile not found.') . EOL);
                        goaway('profiles');
                        return; // NOTREACHED
@@ -54,7 +54,7 @@ function profiles_init(App $a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
                        info(L10n::t('Profile deleted.').EOL);
                }
 
@@ -69,7 +69,7 @@ function profiles_init(App $a) {
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
 
-               $num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
+               $num_profiles = (DBA::isResult($r0) ? count($r0) : 0);
 
                $name = L10n::t('Profile-') . ($num_profiles + 1);
 
@@ -79,19 +79,19 @@ function profiles_init(App $a) {
                $r2 = q("INSERT INTO `profile` (`uid` , `profile-name` , `name`, `photo`, `thumb`)
                        VALUES ( %d, '%s', '%s', '%s', '%s' )",
                        intval(local_user()),
-                       dbesc($name),
-                       dbesc($r1[0]['name']),
-                       dbesc($r1[0]['photo']),
-                       dbesc($r1[0]['thumb'])
+                       DBA::escape($name),
+                       DBA::escape($r1[0]['name']),
+                       DBA::escape($r1[0]['photo']),
+                       DBA::escape($r1[0]['thumb'])
                );
 
                $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
                        intval(local_user()),
-                       dbesc($name)
+                       DBA::escape($name)
                );
 
                info(L10n::t('New profile created.') . EOL);
-               if (DBM::is_result($r3) && count($r3) == 1) {
+               if (DBA::isResult($r3) && count($r3) == 1) {
                        goaway('profiles/' . $r3[0]['id']);
                }
 
@@ -105,14 +105,14 @@ function profiles_init(App $a) {
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
 
-               $num_profiles = (DBM::is_result($r0) ? count($r0) : 0);
+               $num_profiles = (DBA::isResult($r0) ? count($r0) : 0);
 
                $name = L10n::t('Profile-') . ($num_profiles + 1);
                $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
                        intval(local_user()),
                        intval($a->argv[2])
                );
-               if(! DBM::is_result($r1)) {
+               if(! DBA::isResult($r1)) {
                        notice(L10n::t('Profile unavailable to clone.') . EOL);
                        killme();
                        return;
@@ -121,16 +121,16 @@ function profiles_init(App $a) {
                $r1[0]['is-default'] = 0;
                $r1[0]['publish'] = 0;
                $r1[0]['net-publish'] = 0;
-               $r1[0]['profile-name'] = dbesc($name);
+               $r1[0]['profile-name'] = DBA::escape($name);
 
                DBA::insert('profile', $r1[0]);
 
                $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1",
                        intval(local_user()),
-                       dbesc($name)
+                       DBA::escape($name)
                );
                info(L10n::t('New profile created.') . EOL);
-               if ((DBM::is_result($r3)) && (count($r3) == 1)) {
+               if ((DBA::isResult($r3)) && (count($r3) == 1)) {
                        goaway('profiles/'.$r3[0]['id']);
                }
 
@@ -145,7 +145,7 @@ function profiles_init(App $a) {
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if (! DBM::is_result($r)) {
+               if (! DBA::isResult($r)) {
                        notice(L10n::t('Profile not found.') . EOL);
                        killme();
                        return;
@@ -153,12 +153,10 @@ function profiles_init(App $a) {
 
                Profile::load($a, $a->user['nickname'], $r[0]['id']);
        }
-
-
-
 }
 
-function profile_clean_keywords($keywords) {
+function profile_clean_keywords($keywords)
+{
        $keywords = str_replace(",", " ", $keywords);
        $keywords = explode(" ", $keywords);
 
@@ -192,7 +190,7 @@ function profiles_post(App $a) {
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if (! DBM::is_result($orig)) {
+               if (! DBA::isResult($orig)) {
                        notice(L10n::t('Profile not found.') . EOL);
                        return;
                }
@@ -284,16 +282,16 @@ function profiles_post(App $a) {
                                        $newname = $lookup;
 
                                        $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
-                                               dbesc($newname),
+                                               DBA::escape($newname),
                                                intval(local_user())
                                        );
-                                       if (! DBM::is_result($r)) {
+                                       if (! DBA::isResult($r)) {
                                                $r = q("SELECT * FROM `contact` WHERE `nick` = '%s' AND `uid` = %d LIMIT 1",
-                                                       dbesc($lookup),
+                                                       DBA::escape($lookup),
                                                        intval(local_user())
                                                );
                                        }
-                                       if (DBM::is_result($r)) {
+                                       if (DBA::isResult($r)) {
                                                $prf = $r[0]['url'];
                                                $newname = $r[0]['name'];
                                        }
@@ -441,45 +439,45 @@ function profiles_post(App $a) {
                        `education` = '%s',
                        `hide-friends` = %d
                        WHERE `id` = %d AND `uid` = %d",
-                       dbesc($profile_name),
-                       dbesc($name),
-                       dbesc($pdesc),
-                       dbesc($gender),
-                       dbesc($dob),
-                       dbesc($address),
-                       dbesc($locality),
-                       dbesc($region),
-                       dbesc($postal_code),
-                       dbesc($country_name),
-                       dbesc($marital),
-                       dbesc($with),
-                       dbesc($howlong),
-                       dbesc($sexual),
-                       dbesc($xmpp),
-                       dbesc($homepage),
-                       dbesc($hometown),
-                       dbesc($politic),
-                       dbesc($religion),
-                       dbesc($pub_keywords),
-                       dbesc($prv_keywords),
-                       dbesc($likes),
-                       dbesc($dislikes),
-                       dbesc($about),
-                       dbesc($interest),
-                       dbesc($contact),
-                       dbesc($music),
-                       dbesc($book),
-                       dbesc($tv),
-                       dbesc($film),
-                       dbesc($romance),
-                       dbesc($work),
-                       dbesc($education),
+                       DBA::escape($profile_name),
+                       DBA::escape($name),
+                       DBA::escape($pdesc),
+                       DBA::escape($gender),
+                       DBA::escape($dob),
+                       DBA::escape($address),
+                       DBA::escape($locality),
+                       DBA::escape($region),
+                       DBA::escape($postal_code),
+                       DBA::escape($country_name),
+                       DBA::escape($marital),
+                       DBA::escape($with),
+                       DBA::escape($howlong),
+                       DBA::escape($sexual),
+                       DBA::escape($xmpp),
+                       DBA::escape($homepage),
+                       DBA::escape($hometown),
+                       DBA::escape($politic),
+                       DBA::escape($religion),
+                       DBA::escape($pub_keywords),
+                       DBA::escape($prv_keywords),
+                       DBA::escape($likes),
+                       DBA::escape($dislikes),
+                       DBA::escape($about),
+                       DBA::escape($interest),
+                       DBA::escape($contact),
+                       DBA::escape($music),
+                       DBA::escape($book),
+                       DBA::escape($tv),
+                       DBA::escape($film),
+                       DBA::escape($romance),
+                       DBA::escape($work),
+                       DBA::escape($education),
                        intval($hide_friends),
                        intval($a->argv[1]),
                        intval(local_user())
                );
 
-               /// @TODO decide to use dbm::is_result() here and check $r
+               /// @TODO decide to use DBA::isResult() here and check $r
                if ($r) {
                        info(L10n::t('Profile updated.') . EOL);
                }
@@ -487,7 +485,7 @@ function profiles_post(App $a) {
                if ($is_default) {
                        if ($namechanged) {
                                $r = q("UPDATE `user` set `username` = '%s' where `uid` = %d",
-                                       dbesc($name),
+                                       DBA::escape($name),
                                        intval(local_user())
                                );
                        }
@@ -512,7 +510,7 @@ function profiles_content(App $a) {
 
        if (! local_user()) {
                notice(L10n::t('Permission denied.') . EOL);
-               return;
+               return Login::form();
        }
 
        $o = '';
@@ -522,7 +520,7 @@ function profiles_content(App $a) {
                        intval($a->argv[1]),
                        intval(local_user())
                );
-               if (! DBM::is_result($r)) {
+               if (! DBA::isResult($r)) {
                        notice(L10n::t('Profile not found.') . EOL);
                        return;
                }
@@ -530,9 +528,6 @@ function profiles_content(App $a) {
                $a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), [
                        '$baseurl' => System::baseUrl(true),
                ]);
-               $a->page['end'] .= replace_macros(get_markup_template('profed_end.tpl'), [
-                       '$baseurl' => System::baseUrl(true),
-               ]);
 
                $opt_tpl = get_markup_template("profile-hide-friends.tpl");
                $hide_friends = replace_macros($opt_tpl,[
@@ -551,7 +546,7 @@ function profiles_content(App $a) {
                ]);
 
                $personal_account = !(in_array($a->user["page-flags"],
-                                       [PAGE_COMMUNITY, PAGE_PRVGROUP]));
+                                       [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP]));
 
                $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
 
@@ -579,7 +574,9 @@ function profiles_content(App $a) {
                        '$banner'       => L10n::t('Edit Profile Details'),
                        '$submit'       => L10n::t('Submit'),
                        '$profpic'      => L10n::t('Change Profile Photo'),
+                       '$profpiclink'  => '/photos/' . $a->user['nickname'],
                        '$viewprof'     => L10n::t('View this profile'),
+                       '$viewallprof'  => L10n::t('View all profiles'),
                        '$editvis'      => L10n::t('Edit visibility'),
                        '$cr_prof'      => L10n::t('Create a new profile using these settings'),
                        '$cl_prof'      => L10n::t('Clone this profile'),
@@ -619,10 +616,10 @@ function profiles_content(App $a) {
                        '$country_name' => ['country_name', L10n::t('Country:'), $r[0]['country-name']],
                        '$age' => ((intval($r[0]['dob'])) ? '(' . L10n::t('Age: ') . Temporal::getAgeByTimezone($r[0]['dob'],$a->user['timezone'],$a->user['timezone']) . ')' : ''),
                        '$gender' => ContactSelector::gender($r[0]['gender']),
-                       '$marital' => ContactSelector::maritalStatus($r[0]['marital']),
+                       '$marital' => ['selector' => ContactSelector::maritalStatus($r[0]['marital']), 'value' => $r[0]['marital']],
                        '$with' => ['with', L10n::t("Who: \x28if applicable\x29"), strip_tags($r[0]['with']), L10n::t('Examples: cathy123, Cathy Williams, cathy@example.com')],
                        '$howlong' => ['howlong', L10n::t('Since [date]:'), ($r[0]['howlong'] <= NULL_DATE ? '' : DateTimeFormat::local($r[0]['howlong']))],
-                       '$sexual' => ContactSelector::sexualPreference($r[0]['sexual']),
+                       '$sexual' => ['selector' => ContactSelector::sexualPreference($r[0]['sexual']), 'value' => $r[0]['sexual']],
                        '$about' => ['about', L10n::t('Tell us about yourself...'), $r[0]['about']],
                        '$xmpp' => ['xmpp', L10n::t("XMPP \x28Jabber\x29 address:"), $r[0]['xmpp'], L10n::t("The XMPP address will be propagated to your contacts so that they can follow you.")],
                        '$homepage' => ['homepage', L10n::t('Homepage URL:'), $r[0]['homepage']],
@@ -654,7 +651,7 @@ function profiles_content(App $a) {
                        $r = q("SELECT * FROM `profile` WHERE `uid` = %d AND `is-default`=1",
                                local_user()
                        );
-                       if (DBM::is_result($r)) {
+                       if (DBA::isResult($r)) {
                                //Go to the default profile.
                                goaway('profiles/' . $r[0]['id']);
                        }
@@ -663,14 +660,14 @@ function profiles_content(App $a) {
                $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
                        local_user());
 
-               if (DBM::is_result($r)) {
+               if (DBA::isResult($r)) {
 
                        $tpl = get_markup_template('profile_entry.tpl');
 
                        $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'],