Fix profile wrong DISTINCT + ORDER BY

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index a034f670eae76194bb9f98a08c830f40bd7b1011..2b8d812c18da19c30400f769540db3478a501064 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -10,7 +10,7 @@ function profiles_init(App $a) {
                return;
        }
 
-       if(($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
+       if (($a->argc > 2) && ($a->argv[1] === "drop") && intval($a->argv[2])) {
                $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
                        intval($a->argv[2]),
                        intval(local_user())
@@ -34,24 +34,22 @@ function profiles_init(App $a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               if($r)
+               if (dbm::is_result($r)) {
                        info(t('Profile deleted.').EOL);
+               }
 
                goaway('profiles');
                return; // NOTREACHED
        }
 
-
-
-
-
-       if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+       if (($a->argc > 1) && ($a->argv[1] === 'new')) {
 
                check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
-               $num_profiles = count($r0);
+
+               $num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
 
                $name = t('Profile-') . ($num_profiles + 1);
 
@@ -73,19 +71,21 @@ function profiles_init(App $a) {
                );
 
                info( t('New profile created.') . EOL);
-               if(count($r3) == 1)
-                       goaway('profiles/'.$r3[0]['id']);
+               if (dbm::is_result($r3) && count($r3) == 1) {
+                       goaway('profiles/' . $r3[0]['id']);
+               }
 
                goaway('profiles');
        }
 
-       if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+       if (($a->argc > 2) && ($a->argv[1] === 'clone')) {
 
                check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
 
                $r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
                        intval(local_user()));
-               $num_profiles = count($r0);
+
+               $num_profiles = (dbm::is_result($r0) ? count($r0) : 0);
 
                $name = t('Profile-') . ($num_profiles + 1);
                $r1 = q("SELECT * FROM `profile` WHERE `uid` = %d AND `id` = %d LIMIT 1",
@@ -116,8 +116,9 @@ function profiles_init(App $a) {
                        dbesc($name)
                );
                info( t('New profile created.') . EOL);
-               if ((dbm::is_result($r3)) && (count($r3) == 1))
+               if ((dbm::is_result($r3)) && (count($r3) == 1)) {
                        goaway('profiles/'.$r3[0]['id']);
+               }
 
                goaway('profiles');
 
@@ -125,7 +126,7 @@ function profiles_init(App $a) {
        }
 
 
-       if(($a->argc > 1) && (intval($a->argv[1]))) {
+       if (($a->argc > 1) && (intval($a->argv[1]))) {
                $r = q("SELECT id FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
                        intval($a->argv[1]),
                        intval(local_user())
@@ -136,7 +137,7 @@ function profiles_init(App $a) {
                        return;
                }
 
-               profile_load($a,$a->user['nickname'],$r[0]['id']);
+               profile_load($a,$a->user['nickname'], $r[0]['id']);
        }
 
 
@@ -144,15 +145,16 @@ function profiles_init(App $a) {
 }
 
 function profile_clean_keywords($keywords) {
-       $keywords = str_replace(","," ",$keywords);
+       $keywords = str_replace(",", " ", $keywords);
        $keywords = explode(" ", $keywords);
 
        $cleaned = array();
        foreach ($keywords as $keyword) {
                $keyword = trim(strtolower($keyword));
                $keyword = trim($keyword, "#");
-               if ($keyword != "")
+               if ($keyword != "") {
                        $cleaned[] = $keyword;
+               }
        }
 
        $keywords = implode(", ", $cleaned);
@@ -193,14 +195,14 @@ function profiles_post(App $a) {
 
                $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated?
 
-               $y = substr($dob,0,4);
+               $y = substr($dob, 0, 4);
                if ((! ctype_digit($y)) || ($y < 1900)) {
                        $ignore_year = true;
                } else {
                        $ignore_year = false;
                }
                if ($dob != '0000-00-00') {
-                       if (strpos($dob,'0000-') === 0) {
+                       if (strpos($dob, '0000-') === 0) {
                                $ignore_year = true;
                                $dob = substr($dob, 5);
                        }
@@ -213,7 +215,7 @@ function profiles_post(App $a) {
 
                $name = notags(trim($_POST['name']));
 
-               if(! strlen($name)) {
+               if (! strlen($name)) {
                        $name = '[No Name]';
                }
 
@@ -235,10 +237,10 @@ function profiles_post(App $a) {
 
                $with = ((x($_POST,'with')) ? notags(trim($_POST['with'])) : '');
 
-               if(! strlen($howlong)) {
+               if (! strlen($howlong)) {
                        $howlong = NULL_DATE;
                } else {
-                       $howlong = datetime_convert(date_default_timezone_get(),'UTC',$howlong);
+                       $howlong = datetime_convert(date_default_timezone_get(), 'UTC', $howlong);
                }
                // linkify the relationship target if applicable
 
@@ -249,7 +251,7 @@ function profiles_post(App $a) {
                                $withchanged = true;
                                $prf = '';
                                $lookup = $with;
-                               if (strpos($lookup,'@') === 0) {
+                               if (strpos($lookup, '@') === 0) {
                                        $lookup = substr($lookup, 1);
                                }
                                $lookup = str_replace('_',' ', $lookup);
@@ -635,7 +637,7 @@ function profiles_content(App $a) {
                                t('Hide contacts and friends:'), //Label
                                !!$r[0]['hide-friends'], //Value
                                '', //Help string
-                               array(t('No'),t('Yes')) //Off - On strings
+                               array(t('No'), t('Yes')) //Off - On strings
                        ),
                        '$desc' => t('Hide your contact/friend list from viewers of this profile?'),
                        '$yes_str' => t('Yes'),
@@ -737,7 +739,7 @@ function profiles_content(App $a) {
                        '$tv' => array('tv', t('Television'), $r[0]['tv']),
                        '$film' => array('film', t('Film/dance/culture/entertainment'), $r[0]['film']),
                        '$interest' => array('interest', t('Hobbies/Interests'), $r[0]['interest']),
-                       '$romance' => array('romance',t('Love/romance'), $r[0]['romance']),
+                       '$romance' => array('romance', t('Love/romance'), $r[0]['romance']),
                        '$work' => array('work', t('Work/employment'), $r[0]['work']),
                        '$education' => array('education', t('School/education'), $r[0]['education']),
                        '$contact' => array('contact', t('Contact information and Social Networks'), $r[0]['contact']),