Merge pull request #7255 from annando/issue-7223
[friendica.git/.git] / update.php
index b802139..077a56e 100644 (file)
@@ -9,9 +9,11 @@ use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\Model\Contact;
+use Friendica\Model\GContact;
 use Friendica\Model\Item;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Worker\Delivery;
 
 /**
  *
@@ -50,9 +52,7 @@ function update_1178()
 
                $profile["pub_keywords"] = profile_clean_keywords($profile["pub_keywords"]);
 
-               $r = q(
-                       "UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s'
-                       WHERE `self` AND `uid` = %d",
+               $r = q("UPDATE `contact` SET `about` = '%s', `location` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `self` AND `uid` = %d",
                        DBA::escape($profile["about"]),
                        DBA::escape($profile["locality"]),
                        DBA::escape($profile["pub_keywords"]),
@@ -120,8 +120,7 @@ function update_1191()
        }
 
        // select old formlist addon entries
-       $r = q(
-               "SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%s' ",
+       $r = q("SELECT `uid`, `cat`, `k`, `v` FROM `pconfig` WHERE `cat` = '%s' ",
                DBA::escape('forumlist')
        );
 
@@ -162,11 +161,10 @@ function update_1191()
 
 function update_1203()
 {
-       $r = q(
-               "UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
-               DBA::escape(Contact::ACCOUNT_TYPE_COMMUNITY),
-               DBA::escape(Contact::PAGE_COMMUNITY),
-               DBA::escape(Contact::PAGE_PRVGROUP)
+       $r = q("UPDATE `user` SET `account-type` = %d WHERE `page-flags` IN (%d, %d)",
+               DBA::escape(User::ACCOUNT_TYPE_COMMUNITY),
+               DBA::escape(User::PAGE_FLAGS_COMMUNITY),
+               DBA::escape(User::PAGE_FLAGS_PRVGROUP)
        );
 }
 
@@ -261,11 +259,7 @@ function update_1260()
 function update_1261()
 {
        // This fixes the results of an issue in the develop branch of 2018-05.
-       DBA::update(
-               'contact',
-               ['blocked' => false, 'pending' => false],
-               ['uid' => 0, 'blocked' => true, 'pending' => true]
-       );
+       DBA::update('contact', ['blocked' => false, 'pending' => false], ['uid' => 0, 'blocked' => true, 'pending' => true]);
        return Update::SUCCESS;
 }
 
@@ -293,63 +287,85 @@ function update_1288()
 {
        // Updates missing `uri-id` values
 
-       DBA::e("UPDATE `item-activity`
-               INNER JOIN `item` ON `item`.`iaid` = `item-activity`.`id`
-               SET `item-activity`.`uri-id` = `item`.`uri-id`
-               WHERE `item-activity`.`uri-id` IS NULL OR `item-activity`.`uri-id` = 0");
-       DBA::e("UPDATE `item-content`
-               INNER JOIN `item` ON `item`.`icid` = `item-content`.`id`
-               SET `item-content`.`uri-id` = `item`.`uri-id`
-               WHERE `item-content`.`uri-id` IS NULL OR `item-content`.`uri-id` = 0");
+       DBA::e("UPDATE `item-activity` INNER JOIN `item` ON `item`.`iaid` = `item-activity`.`id` SET `item-activity`.`uri-id` = `item`.`uri-id` WHERE `item-activity`.`uri-id` IS NULL OR `item-activity`.`uri-id` = 0");
+       DBA::e("UPDATE `item-content` INNER JOIN `item` ON `item`.`icid` = `item-content`.`id` SET `item-content`.`uri-id` = `item`.`uri-id` WHERE `item-content`.`uri-id` IS NULL OR `item-content`.`uri-id` = 0");
 
        return Update::SUCCESS;
 }
 
-       
 // Post-update script of PR 5751
-function update_1293()
+function update_1298()
 {
-       $allGenders = DBA::select('contact', ['id', 'gender']);
-       $allLangs = L10n::getAvailableLanguages();
-       $success = 0;
-       $fail = 0;
-       foreach ($allGenders as $key => $gender) {
-               if ($gender['gender'] != '') {
-                       foreach ($allLangs as $key => $lang) {
-                               $a = new \stdClass();
-                               $a->strings = [];
-
-                               // First we get the the localizations
-                               if (file_exists("view/lang/$lang/strings.php")) {
-                                       include "view/lang/$lang/strings.php";
-                               }
-                               if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
-                                       include "addon/morechoice/lang/$lang/strings.php";
+       $keys = ['gender', 'marital', 'sexual'];
+       foreach ($keys as $translateKey) {
+               $allData = DBA::select('profile', ['id', $translateKey]);
+               $allLangs = L10n::getAvailableLanguages();
+               $success = 0;
+               $fail = 0;
+               foreach ($allData as $key => $data) {
+                       $toTranslate = $data[$translateKey];
+                       if ($toTranslate != '') {
+                               foreach ($allLangs as $key => $lang) {
+                                       $a = new \stdClass();
+                                       $a->strings = [];
+
+                                       // First we get the the localizations
+                                       if (file_exists("view/lang/$lang/strings.php")) {
+                                               include "view/lang/$lang/strings.php";
+                                       }
+                                       if (file_exists("addon/morechoice/lang/$lang/strings.php")) {
+                                               include "addon/morechoice/lang/$lang/strings.php";
+                                       }
+
+                                       $localizedStrings = $a->strings;
+                                       unset($a);
+
+                                       $key = array_search($toTranslate, $localizedStrings);
+                                       if ($key !== false) {
+                                               break;
+                                       }
+
+                                       // defaulting to empty string
+                                       $key = '';
                                }
 
-                               $localizedStrings = $a->strings;
-                               unset($a);
-
-                               $key = array_search($gender['gender'], $localizedStrings);
-                               if ($key !== false) {
-                                       break;
+                               if ($key == '') {
+                                       $fail++;
+                               } else {
+                                       DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
+                                       Logger::notice('Updated contact', ['action' => 'update', 'contact' => $data['id'], "$translateKey" => $key,
+                                               'was' => $data[$translateKey]]);
+                                       Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);
+                                       Contact::updateSelfFromUserID($data['id']);
+                                       GContact::updateForUser($data['id']);
+                                       $success++;
                                }
-
-                               // defaulting to empty string
-                               $key = '';
-                       }
-
-                       if ($key == '') {
-                               $fail++;
-                       } else {
-                               DBA::update('contact', ['gender' => $key], ['id' => $gender['id']]);
-                               logger::log('Updated contact ' . $gender['id'] . ' to gender ' . $key .
-                                       ' (was: ' . $gender['gender'] . ')');
-                               $success++;
                        }
                }
+
+               Logger::notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
        }
+       return Update::SUCCESS;
+}
 
-       Logger::log("Gender fix completed. Success: $success. Fail: $fail");
+function update_1309()
+{
+       $queue = DBA::select('queue', ['id', 'cid', 'guid']);
+       while ($entry = DBA::fetch($queue)) {
+               $contact = DBA::selectFirst('contact', ['uid'], ['id' => $entry['cid']]);
+               if (!DBA::isResult($contact)) {
+                       continue;
+               }
+
+               $item = Item::selectFirst(['id', 'gravity'], ['uid' => $contact['uid'], 'guid' => $entry['guid']]);
+               if (!DBA::isResult($item)) {
+                       continue;
+               }
+
+               $deliver_options = ['priority' => PRIORITY_MEDIUM, 'dont_fork' => true];
+               Worker::add($deliver_options, 'Delivery', Delivery::POST, $item['id'], $entry['cid']);
+               Logger::info('Added delivery worker', ['command' => $cmd, 'item' => $item['id'], 'contact' => $entry['cid']]);
+               DBA::delete('queue', ['id' => $entry['id']]);
+       }
        return Update::SUCCESS;
 }