moveme: fix contact photos

diff --git a/include/notifier.php b/include/notifier.php
index 1d2c26fb2df2229277dab49e03d83e995b2a65f8..c78d2f1a763473584ff720b23977a9fcf2390996 100644 (file)
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -42,7 +42,7 @@ require_once('include/html2plain.php');
  */
 
 
-function notifier_run($argv, $argc){
+function notifier_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)){
@@ -422,12 +422,20 @@ function notifier_run($argv, $argc){
                        set_config('system','site_pubkey', $res['pubkey']);
                }
                
+               $rp = q("SELECT `resource-id` , `scale`, type FROM `photo` 
+                                               WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;", $uid);
+               $photos = array();
+               $ext = Photo::supportedTypes();
+               foreach($rp as $p){
+                       $photos[$p['scale']] = $a->get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+               }
+               unset($rp, $ext);
                
         $atom .= replace_macros($sugg_template, array(
             '$name' => xmlify($owner['name']),
-            '$photo' => xmlify($owner['photo']),
-            '$thumb' => xmlify($owner['thumb']),
-            '$micro' => xmlify($owner['micro']),
+            '$photo' => xmlify($photos[4]),
+            '$thumb' => xmlify($photos[5]),
+            '$micro' => xmlify($photos[6]),
             '$url' => xmlify($owner['url']),
             '$request' => xmlify($owner['request']),
             '$confirm' => xmlify($owner['confirm']),
@@ -438,7 +446,7 @@ function notifier_run($argv, $argc){
             //'$prvkey' => xmlify($owner['prvkey']),
                )); 
         $recipients_relocate = q("SELECT * FROM contact WHERE uid = %d  AND self = 0 AND network = '%s'" , intval($uid), NETWORK_DFRN);
-        
+               unset($photos);
     }
        else {
                if($followup) {

diff --git a/view/atom_relocate.tpl b/view/atom_relocate.tpl
index 3976a0037f2e555bf07226ff8f2d8dda2b5c9085..f7db934d7af90beb5929b9bffa6bff297afcf084 100644 (file)
--- a/view/atom_relocate.tpl
+++ b/view/atom_relocate.tpl
@@ -4,8 +4,8 @@
        <dfrn:url>$url</dfrn:url>
        <dfrn:name>$name</dfrn:name>
        <dfrn:photo>$photo</dfrn:photo>
-       <dfrn:photo>$thumb</dfrn:photo>
-       <dfrn:photo>$micro</dfrn:photo>
+       <dfrn:thumb>$thumb</dfrn:thumb>
+       <dfrn:micro>$micro</dfrn:micro>
        <dfrn:request>$request</dfrn:request>
        <dfrn:confirm>$confirm</dfrn:confirm>
        <dfrn:notify>$notify</dfrn:notify>