remove items from export - too much memory consumed, will have to stream items,photos

[friendica.git] / mod / profiles.php

diff --git a/mod/profiles.php b/mod/profiles.php
index 9e19caa0b0a4ff60e10cf8561a03233ce4ce6e0e..434f58adf990d487c6fae8013f6a87025afcaaac 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -55,7 +55,8 @@ function profiles_post(&$a) {
                $region = notags(trim($_POST['region']));
                $postal_code = notags(trim($_POST['postal_code']));
                $country_name = notags(trim($_POST['country_name']));
-               $keywords = notags(trim($_POST['keywords']));
+               $pub_keywords = notags(trim($_POST['pub_keywords']));
+               $prv_keywords = notags(trim($_POST['prv_keywords']));
                $marital = notags(trim($_POST['marital']));
                if($marital != $orig[0]['marital'])
                        $maritalchanged = true;
@@ -147,7 +148,8 @@ function profiles_post(&$a) {
                        `homepage` = '%s',
                        `politic` = '%s',
                        `religion` = '%s',
-                       `keywords` = '%s',
+                       `pub_keywords` = '%s',
+                       `prv_keywords` = '%s',
                        `about` = '%s',
                        `interest` = '%s',
                        `contact` = '%s',
@@ -176,7 +178,8 @@ function profiles_post(&$a) {
                        dbesc($homepage),
                        dbesc($politic),
                        dbesc($religion),
-                       dbesc($keywords),
+                       dbesc($pub_keywords),
+                       dbesc($prv_keywords),
                        dbesc($about),
                        dbesc($interest),
                        dbesc($contact),
@@ -226,7 +229,7 @@ function profiles_content(&$a) {
        }
 
        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 AND `self` = 0 LIMIT 1",
+               $r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
                        intval($a->argv[2]),
                        intval(local_user())
                );
@@ -243,8 +246,9 @@ function profiles_content(&$a) {
                        intval($a->argv[2]),
                        intval(local_user())
                );
-               $r = q("DELETE FROM `profile` WHERE `id` = %d LIMIT 1",
-                       intval($a->argv[2])
+               $r = q("DELETE FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+                       intval($a->argv[2]),
+                       intval(local_user())
                );
                if($r)
                        notice( t('Profile deleted.') . EOL);
@@ -382,7 +386,8 @@ function profiles_content(&$a) {
                        '$homepage' => $r[0]['homepage'],
                        '$politic' => $r[0]['politic'],
                        '$religion' => $r[0]['religion'],
-                       '$keywords' => $r[0]['keywords'],
+                       '$pub_keywords' => $r[0]['pub_keywords'],
+                       '$prv_keywords' => $r[0]['prv_keywords'],
                        '$music' => $r[0]['music'],
                        '$book' => $r[0]['book'],
                        '$tv' => $r[0]['tv'],