]> git.mxchange.org Git - friendica.git/blobdiff - mod/profiles.php
Ops, one more left ...
[friendica.git] / mod / profiles.php
index aa991cb4bda35e5bbe9e57dfa470ecb06995aa68..d951a470d7605db79ea8f97af1eeba3278b39c0e 100644 (file)
@@ -13,10 +13,9 @@ use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
-use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Util\DateTimeFormat;
@@ -35,7 +34,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 +53,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 +68,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 +78,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 +104,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 +120,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]);
+               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 +144,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 +152,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 +189,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 +281,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'];
                                        }
@@ -403,9 +400,6 @@ function profiles_post(App $a) {
                                $comma2 = (($region && $country_name) ? ', ' : '');
                                $value = $locality . $comma1 . $region . $comma2 . $country_name;
                        }
-
-                       profile_activity($changes,$value);
-
                }
 
                $r = q("UPDATE `profile`
@@ -444,45 +438,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);
                }
@@ -490,7 +484,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())
                                );
                        }
@@ -511,96 +505,6 @@ function profiles_post(App $a) {
        }
 }
 
-
-function profile_activity($changed, $value) {
-       $a = get_app();
-
-       if (! local_user() || ! is_array($changed) || ! count($changed)) {
-               return;
-       }
-
-       if ($a->user['hidewall'] || Config::get('system', 'block_public')) {
-               return;
-       }
-
-       if (! PConfig::get(local_user(), 'system', 'post_profilechange')) {
-               return;
-       }
-
-       require_once 'include/items.php';
-
-       $self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-               intval(local_user())
-       );
-
-       if (! DBM::is_result($self)) {
-               return;
-       }
-
-       $arr = [];
-
-       $arr['guid'] = get_guid(32);
-       $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), local_user());
-       $arr['uid'] = local_user();
-       $arr['contact-id'] = $self[0]['id'];
-       $arr['wall'] = 1;
-       $arr['type'] = 'wall';
-       $arr['gravity'] = 0;
-       $arr['origin'] = 1;
-       $arr['author-name'] = $arr['owner-name'] = $self[0]['name'];
-       $arr['author-link'] = $arr['owner-link'] = $self[0]['url'];
-       $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
-       $arr['verb'] = ACTIVITY_UPDATE;
-       $arr['object-type'] = ACTIVITY_OBJ_PROFILE;
-
-       $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
-
-
-       $changes = '';
-       $t = count($changed);
-       $z = 0;
-       foreach ($changed as $ch) {
-               if (strlen($changes)) {
-                       if ($z == ($t - 1)) {
-                               $changes .= L10n::t(' and ');
-                       } else {
-                               $changes .= ', ';
-                       }
-               }
-               $z ++;
-               $changes .= $ch;
-       }
-
-       $prof = '[url=' . $self[0]['url'] . '?tab=profile' . ']' . L10n::t('public profile') . '[/url]';
-
-       if ($t == 1 && strlen($value)) {
-               $message = L10n::t('%1$s changed %2$s to “%3$s”', $A, $changes, $value);
-               $message .= "\n\n" . L10n::t(' - Visit %1$s\'s %2$s', $A, $prof);
-       } else {
-               $message =      L10n::t('%1$s has an updated %2$s, changing %3$s.', $A, $prof, $changes);
-       }
-
-
-       $arr['body'] = $message;
-
-       $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PROFILE . '</type><title>' . $self[0]['name'] . '</title>'
-       . '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';
-       $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $self[0]['url'] . '?tab=profile' . '" />' . "\n");
-       $arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $self[0]['thumb'] . '" />' . "\n");
-       $arr['object'] .= '</link></object>' . "\n";
-
-       $arr['allow_cid'] = $a->user['allow_cid'];
-       $arr['allow_gid'] = $a->user['allow_gid'];
-       $arr['deny_cid']  = $a->user['deny_cid'];
-       $arr['deny_gid']  = $a->user['deny_gid'];
-
-       $i = Item::insert($arr);
-       if ($i) {
-               Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
-       }
-}
-
-
 function profiles_content(App $a) {
 
        if (! local_user()) {
@@ -615,7 +519,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;
                }
@@ -644,7 +548,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);
 
@@ -672,7 +576,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'),
@@ -747,7 +653,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']);
                        }
@@ -756,7 +662,7 @@ 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');