aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriendika <info@friendika.com>2011-06-25 19:10:38 -0700
committerFriendika <info@friendika.com>2011-06-25 19:10:38 -0700
commit59d9070d13949d596d24524acaef9d35e8feba8c (patch)
treede2fb7e6f68adb9abbc8259f73b38b216cd24d75
parent39b5263e352b8763cfc421f287751b65becf1153 (diff)
downloadvolse-hubzilla-59d9070d13949d596d24524acaef9d35e8feba8c.tar.gz
volse-hubzilla-59d9070d13949d596d24524acaef9d35e8feba8c.tar.bz2
volse-hubzilla-59d9070d13949d596d24524acaef9d35e8feba8c.zip
suggestion template
-rw-r--r--boot.php2
-rw-r--r--mod/dfrn_notify.php8
-rw-r--r--view/atom_suggest.tpl10
3 files changed, 15 insertions, 5 deletions
diff --git a/boot.php b/boot.php
index d042ffdca..9321b43c0 100644
--- 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 );
diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index dd0172243..6cb4f69a0 100644
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -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
index 000000000..8df011bfd
--- /dev/null
+++ b/view/atom_suggest.tpl
@@ -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>
+