friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Now it could work

This commit is contained in:
Michael 2017-10-13 09:41:01 +00:00
parent 2b80bf4683
commit b31b29c557
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/delivery.php
View File

@ -509,7 +509,7 @@ function delivery_run(&$argv, &$argc){
Diaspora::send_retraction($target_item,$owner,$contact,$public_message); Diaspora::send_retraction($target_item,$owner,$contact,$public_message);
break; break;
} elseif ($relocate) { } elseif ($relocate) {
Diaspora::sendAccountMigration($owner, $uid); Diaspora::sendAccountMigration($owner, $contact, $uid);
break; break;
} elseif ($followup) { } elseif ($followup) {
// send comments and likes to owner to relay // send comments and likes to owner to relay

5
include/diaspora.php
View File

@ -2963,17 +2963,18 @@ class Diaspora {
* @brief sends an account migration * @brief sends an account migration
* *
* @param array $owner the array of the item owner * @param array $owner the array of the item owner
* @param array $contact Target of the communication
* @param int $uid User ID * @param int $uid User ID
* *
* @return int The result of the transmission * @return int The result of the transmission
*/ */
public static function sendAccountMigration($owner, $uid) { public static function sendAccountMigration($owner, $contact, $uid) {
$old_handle = PConfig::get($uid, 'system', 'previous_addr'); $old_handle = PConfig::get($uid, 'system', 'previous_addr');
$profile = self::createProfileData($uid); $profile = self::createProfileData($uid);
$signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author']; $signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
$signature = rsa_sign($signed_text, $owner["uprvkey"], "sha256"); $signature = base64_encode(rsa_sign($signed_text, $owner["uprvkey"], "sha256"));
$message = array("author" => $old_handle, $message = array("author" => $old_handle,
"profile" => $profile, "profile" => $profile,