]> git.mxchange.org Git - friendica.git/commitdiff
suggestion template
authorFriendika <info@friendika.com>
Sun, 26 Jun 2011 02:10:38 +0000 (19:10 -0700)
committerFriendika <info@friendika.com>
Sun, 26 Jun 2011 02:10:38 +0000 (19:10 -0700)
boot.php
mod/dfrn_notify.php
view/atom_suggest.tpl [new file with mode: 0644]

index d042ffdca61b78ac4490ad3891cf3e67506ed0e1..9321b43c096e4f0b4b6eef3609b6353fe26d662b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1020' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1022' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1067      );
 
index dd0172243589c249c1bad2cd0e93710bb09ee558..6cb4f69a0f731ebabc9457d66894167d8c4509e2 100644 (file)
@@ -171,7 +171,7 @@ function dfrn_notify_post(&$a) {
 
                $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `url` = '%s' AND `uid` = %d LIMIT 1",
                        dbesc($fsugg['name']),
-                       dbesc($fsuff['url']),
+                       dbesc($fsugg['url']),
                        intval($fsugg['uid'])
                );
                if(count($r))
@@ -182,7 +182,7 @@ function dfrn_notify_post(&$a) {
                $fid = 0;
                $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `photo` = '%s' LIMIT 1",
                        dbesc($fsugg['url']),
-                       dbesc($fsuff['name']),
+                       dbesc($fsugg['name']),
                        dbesc($fsugg['photo'])
                );
                if(count($r)) {
@@ -190,13 +190,13 @@ function dfrn_notify_post(&$a) {
                }
                if(! $fid)
                        $r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo` ) VALUES ( '%s', '%s', '%s' ) ",
-                       dbesc($fsuff['name']),
+                       dbesc($fsugg['name']),
                        dbesc($fsugg['url']),
                        dbesc($fsugg['photo'])
                );
                $r = q("SELECT * FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `photo` = '%s' LIMIT 1",
                        dbesc($fsugg['url']),
-                       dbesc($fsuff['name']),
+                       dbesc($fsugg['name']),
                        dbesc($fsugg['photo'])
                );
                if(count($r)) {
diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl
new file mode 100644 (file)
index 0000000..8df011b
--- /dev/null
@@ -0,0 +1,10 @@
+
+<dfrn:suggest>
+
+       <dfrn:url>$url</dfrn:url>
+       <dfrn:name>$name</dfrn:name>
+       <dfrn:photo>$photo</dfrn:photo>
+       <dfrn:note>$note</dfrn:note>
+
+</dfrn:suggest>
+