From 5d5a94c88a173b95e902afc31a9a2e527b6d3098 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 7 Apr 2011 16:19:46 -0700 Subject: comment open/close anomolies in non-English languages --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 858eb19a8..5d604599b 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.941' ); +define ( 'FRIENDIKA_VERSION', '2.1.942' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); define ( 'DB_UPDATE_VERSION', 1047 ); -- cgit v1.2.3 From 0e033eaa433aa44eb1d2ffc96cbd1b26278cebb8 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 8 Apr 2011 16:52:58 +0200 Subject: Fix query for authors in item_photo_menu(), cache authors from extract_item_authors() --- boot.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 5d604599b..47e0a3afe 100644 --- a/boot.php +++ b/boot.php @@ -2662,14 +2662,19 @@ function extract_item_authors($arr,$uid) { // pre-quoted, don't put quotes on %s if(count($urls)) { - $r = q("SELECT `id`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `network` = 'dfrn' AND `self` = 0 AND `blocked` = 0 ", + $r = q("SELECT `id`,`network`,`url` FROM `contact` WHERE `uid` = %d AND `url` IN ( %s ) AND `self` = 0 AND `blocked` = 0 ", intval($uid), implode(',',$urls) ); if(count($r)) { $ret = array(); - foreach($r as $rr) - $ret[$rr['url']] = $rr['id']; + $authors = array(); + foreach($r as $rr){ + if ($rr['network']=='dfrn') + $ret[$rr['url']] = $rr['id']; + $authors[$r['url']]= $rr; + } + $a->authors = $authors; return $ret; } } @@ -2681,7 +2686,7 @@ function item_photo_menu($item){ $a = get_app(); if (!isset($a->authors)){ - $rr = q("SELECT id, network, url FROM contact WHERE uid=%d AND self!=1", intval(local_user())); + $rr = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `uid`=%d AND `self`=0 AND `blocked`=0 ", intval(local_user())); $authors = array(); foreach($rr as $r) $authors[$r['url']]= $r; $a->authors = $authors; -- cgit v1.2.3 From 263eb0c45638b34031d1c64493c7ccb0d16db2c4 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 8 Apr 2011 15:30:29 -0700 Subject: revup --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 5d604599b..c55da6480 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.942' ); +define ( 'FRIENDIKA_VERSION', '2.1.943' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); define ( 'DB_UPDATE_VERSION', 1047 ); -- cgit v1.2.3 From bf865f0210aee4c6742b10bb63cd05f0de9b9d12 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 10 Apr 2011 03:00:29 -0700 Subject: bug #34, line breaks double in retweet/share --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 6dd433fd8..3331c9867 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.943' ); +define ( 'FRIENDIKA_VERSION', '2.1.944' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); define ( 'DB_UPDATE_VERSION', 1047 ); -- cgit v1.2.3 From 12bc4a44cf051dda665fc4fa43624c47484b1864 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 10 Apr 2011 15:30:56 -0700 Subject: [privacy] use owner's default permission settings on "is now friends with..." msg --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 3331c9867..75f031908 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.944' ); +define ( 'FRIENDIKA_VERSION', '2.1.945' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); define ( 'DB_UPDATE_VERSION', 1047 ); -- cgit v1.2.3 From 940d216395406744f23fe4144f2a503688624b45 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 10 Apr 2011 18:38:55 -0700 Subject: initial dfrn update to pass perms --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 75f031908..669326dc6 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); define ( 'FRIENDIKA_VERSION', '2.1.945' ); define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); -define ( 'DB_UPDATE_VERSION', 1047 ); +define ( 'DB_UPDATE_VERSION', 1048 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 63030ca51e9e7f6fbd50aed6b9f6a3cf10084a3f Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 10 Apr 2011 18:40:43 -0700 Subject: protocol update --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 669326dc6..92741eaee 100644 --- a/boot.php +++ b/boot.php @@ -3,8 +3,8 @@ set_time_limit(0); define ( 'FRIENDIKA_VERSION', '2.1.945' ); -define ( 'DFRN_PROTOCOL_VERSION', '2.2' ); -define ( 'DB_UPDATE_VERSION', 1048 ); +define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); +define ( 'DB_UPDATE_VERSION', 1048 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From a0956ee9556d4daffdd3dff7eee408dc412bcb90 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 10 Apr 2011 23:01:38 -0700 Subject: some w3c validation issues --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 92741eaee..5d8417bd2 100644 --- a/boot.php +++ b/boot.php @@ -2301,9 +2301,9 @@ function profile_sidebar($profile) { $pubkey = ((x($profile,'pubkey') == 1) ? '' : ''); - $marital = ((x($profile,'marital') == 1) ? '
♥ ' . t('Status:') . ' ' . $profile['marital'] . '
' : ''); + $marital = ((x($profile,'marital') == 1) ? '
♥ ' . t('Status:') . ' ' . $profile['marital'] . '
' : ''); - $homepage = ((x($profile,'homepage') == 1) ? '
' . t('Homepage:') . ' ' . linkify($profile['homepage']) . '
' : ''); + $homepage = ((x($profile,'homepage') == 1) ? '
' . t('Homepage:') . ' ' . linkify($profile['homepage']) . '
' : ''); $tpl = load_view_file('view/profile_vcard.tpl'); -- cgit v1.2.3 From c8f32536ff77193689efe69702f91122f97c1f36 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 11 Apr 2011 03:22:09 -0700 Subject: pull in new 'writable' dfrn flag --- boot.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 5d8417bd2..2a4c29c1a 100644 --- a/boot.php +++ b/boot.php @@ -73,6 +73,18 @@ define ( 'PAGE_SOAPBOX', 1 ); define ( 'PAGE_COMMUNITY', 2 ); define ( 'PAGE_FREELOVE', 3 ); +/** + * Network and protocol family types + */ + +define ( 'NETWORK_DFRN', 'dfrn'); // Friendika, Mistpark, other DFRN implementations +define ( 'NETWORK_OSTATUS', 'stat'); // status.net, identi.ca, GNU-social, other OStatus implementations +define ( 'NETWORK_FEED', 'feed'); // RSS/Atom feeds with no known "post/notify" protocol +define ( 'NETWORK_DIASPORA', 'dspr'); // Diaspora +define ( 'NETWORK_MAIL', 'mail'); // IMAP/POP +define ( 'NETWORK_FACEBOOK', 'face'); // Facebook API + + /** * Maximum number of "people who like (or don't like) this" that we will list by name */ -- cgit v1.2.3 From ff15ea099310bab5cdcaa724274f3ef22301fcb4 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 11 Apr 2011 15:45:19 -0700 Subject: wrong variable passed --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 2a4c29c1a..7dfaa021e 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'FRIENDIKA_VERSION', '2.1.945' ); +define ( 'FRIENDIKA_VERSION', '2.1.946' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); define ( 'DB_UPDATE_VERSION', 1048 ); -- cgit v1.2.3 From a4836ac1ba1c92f54d286621592f3f332603ff07 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 11 Apr 2011 16:15:38 -0700 Subject: wallwall oddities on display page --- boot.php | 1 + 1 file changed, 1 insertion(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 7dfaa021e..7b6850592 100644 --- a/boot.php +++ b/boot.php @@ -201,6 +201,7 @@ class App { public $user; public $cid; public $contact; + public $page_contact; public $content; public $data; public $error = false; -- cgit v1.2.3 From 0ed2d19ac8e0b624dd4c971dd3f053f7b02b04d4 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 11 Apr 2011 20:11:21 -0700 Subject: death to comment box oddities (a slow death as it will take some time for everybody to upgrade) --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 7b6850592..f04b8c394 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); define ( 'FRIENDIKA_VERSION', '2.1.946' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1048 ); +define ( 'DB_UPDATE_VERSION', 1049 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From bfffd33ff9603f59e93207dfdc09481e17952726 Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 11 Apr 2011 21:30:50 -0700 Subject: table for email poll driver --- boot.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index f04b8c394..29e56c78c 100644 --- a/boot.php +++ b/boot.php @@ -4,7 +4,7 @@ set_time_limit(0); define ( 'FRIENDIKA_VERSION', '2.1.946' ); define ( 'DFRN_PROTOCOL_VERSION', '2.21' ); -define ( 'DB_UPDATE_VERSION', 1049 ); +define ( 'DB_UPDATE_VERSION', 1050 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); -- cgit v1.2.3 From 6da84027afa18633ac5d5dacce99bb244be2aa7b Mon Sep 17 00:00:00 2001 From: Friendika Date: Mon, 11 Apr 2011 22:47:16 -0700 Subject: visual display of group members --- boot.php | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 29e56c78c..5fac9df5a 100644 --- a/boot.php +++ b/boot.php @@ -2045,18 +2045,7 @@ function contact_block() { if(count($r)) { $o .= '

' . sprintf( tt('%d Contact','%d Contacts', $total),$total) . '

'; foreach($r as $rr) { - $redirect_url = $a->get_baseurl() . '/redir/' . $rr['id']; - if(local_user() && ($rr['uid'] == local_user()) - && ($rr['network'] === 'dfrn')) { - $url = $redirect_url; - $sparkle = ' sparkle'; - } - else { - $url = $rr['url']; - $sparkle = ''; - } - - $o .= '
' . $rr['name'] . '
' . "\r\n"; + $o .= micropro($rr,true,'mpfriend'); } $o .= '
'; $o .= ''; @@ -2070,6 +2059,31 @@ function contact_block() { }} +if(! function_exists('micropro')) { +function micropro($contact, $redirect = false, $class = '') { + + if($class) + $class = ' ' . $class; + + $url = $contact['url']; + $sparkle = ''; + + if($redirect) { + $a = get_app(); + $redirect_url = $a->get_baseurl() . '/redir/' . $contact['id']; + if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === 'dfrn')) { + $url = $redirect_url; + $sparkle = ' sparkle'; + } + } + + return '
' . $contact['name'] . '
' . "\r\n"; +}} + + + if(! function_exists('search')) { function search($s) { $a = get_app(); -- cgit v1.2.3