From ce11d0f0055b29eea397764cdb1961398df21a12 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 29 Dec 2010 02:09:20 -0800 Subject: [PATCH 01/29] upd8 readme --- README | 108 +++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 70 insertions(+), 38 deletions(-) diff --git a/README b/README index 25fff8279f..3fd5180114 100644 --- a/README +++ b/README @@ -7,78 +7,110 @@ http://friendika.com -Did you ever wonder what might happen if you ever left Facebook? + + Since the dawn of the world-wide-web, the internet has been a battleground +between the "big boys" with all their resources, and a bunch of upstarts whose +goal is to topple the status quo - and bring the same powers of global reach +to anybody with a computer and an internet connection. -What if there was a social network which provided some of the same interaction -you've grown to love, *and* was free to use, open source - and where your -privacy is always under your control? + The latest battleground is social networking. Many of your friends would +have you believe that the world (and all the information in it) belongs to +Facebook. -And what if this social network could scale to encompass the entire internet, -and *not* require a central organisation to provide servers (in exchange for -selling your private information to advertisers)? + Friendika is here to rock that boat. -Look no further. + Granted, all your friends aren't here. Yet. The people who made fun of you +in high school (yet curiously wanted to be friends with you now) are still +poking each other and managing their virtual farms. Would you miss them? -Friendika is a social network without boundaries. Friendika installations can -link together into a global social network which is free from central -control. Besides the Friendika network [which is privacy enhanced]; you can -connect with and communicate with friends on identi.ca, Status.Net and many -other sites and social networks *today*. + I wouldn't. -We are currently developing connectors to seamlessly communicate with many + You probably have a handful of friends that are truly special. Tell them +that the world has changed. It's time to move on. + + What if there was a social network which provided some of the same +interaction you've grown to love, *and* was free to use, open source - and +where your privacy is always under your control? + + And what if this social network could scale to encompass the entire +internet, and *not* require a central organisation to provide servers (in +exchange for selling your private information to advertisers)? + + Look no further. + + Friendika is a social network without boundaries, and without ownership. +Friendika installations can link together into a global social network which +is free from central control. Besides the Friendika network [which is privacy +enhanced]; you can also connect with and communicate with friends on identi.ca, +Status.Net and many other sites and social networks *today*. + + Welcome to the federated social web. If you choose not to use Friendika, +you can choose any of 20-30 other providers of social networking software and +still be a part of this new social network. This is bigger than Facebook. + + Much bigger. + + We are currently developing connectors to seamlessly communicate with many other open social networks and providers - like Diaspora, GNU-Social, OneSocialWeb, and even some of the larger closed services such as Facebook and Twitter. -Over the coming months, the boundaries between these networks will start to -become indistinguishable as they all become part of your social circle. + Over the coming months, the boundaries between these networks will start +to become indistinguishable as they all become part of your social circle. -Our core belief is that your personal thoughts and conversations belong to + Our core belief is that your personal thoughts and conversations belong to you - and are only meant to be shared with those you wish to share them with. -Period. + Period. -Friendika is secure, and as private as you wish it to be. Our privacy settings -are straight-forward and simple, because we know that relationships rarely are -(straight-forward and simple). Whether you're communicating with drinking -buddies or potential employers, you can rest assured that each is only able to -see the side of you that you wish to present. If you send a private message to -your aunt Mary, we will encrypt it with military grade encryption. + Friendika is secure, and as private as you wish it to be. Our privacy +settings are straight-forward and simple, because we know that relationships +rarely are (straight-forward and simple). Whether you're communicating with +drinking buddies or potential employers, you can rest assured that each is +only able to see the side of you that you wish to present. If you send a +private message to your aunt Mary, we will encrypt it with military grade +encryption. We also won't share it with advertisers. -Other distributed social network projects talk about privacy and offering a -feature-rich social networking alternative, but all they can deliver is vapour -and vague promises. Friendika delivers the goods, time and time again. + Other distributed social network projects talk about privacy and offering +a feature-rich social networking alternative, but all they can deliver is +vapour and vague promises. You've probably heard about the four guys in New +York and their "Facebook killer". What a disaster that was. Eventually they +may get it right and release something that actually works, but they may not. +What are you going to use in the meantime? -A single instance of Friendika can easily support hundreds of (and up to + Friendika delivers. + + A single instance of Friendika can easily support hundreds of (and up to several thousand) people using commodity hosting hardware. Each of these people are able to connect with potentially hundreds or thousands of friends and associates on any other supported network anywhere in the world and share photos, links, status updates, etc. -But maybe you don't want to be connected to the world... That's OK too. + But maybe you don't want to be connected to the world... That's OK too. Friendika may also be closed off from the global community and used to support social networking amongst corporate, educational, religious, and other private communities. This makes it an excellent choice for the social networking needs of young teenagers and especially k-12 organisations. -Every person on Friendika has unlimited profiles available to them. There is a -"public profile" which can be seen by anybody. Additional profiles may be -tailored to specific groups or individuals. + Every person on Friendika has unlimited profiles available to them. There +is a "public profile" which can be seen by anybody. Additional profiles may be +tailored to specific groups or individuals. Try doing that on Twitter. -Groups may be created and used for closed conversations. In this way your + Groups may be created and used for closed conversations. In this way your conversations with one group of friends is completely isolated from other friends or groups of friends. -You may also create interactive band/celebrity pages, special interest groups, -and even organisational 'soapboxes' - for social communications that require -the ability to scale to global levels. Friendika provides for automatic + You may also create interactive band/celebrity pages, special interest +groups, and even organisational 'soapboxes' - for social communications that +require the ability to scale to global levels. Friendika provides for automatic relationship management in these extreme cases so that you can concentrate on your message and public persona - and not worry about being swamped by friend requests. You can even maintain private social contact with your closest friends and public updates to your hordes of fans - using the same interface. -No other social network offers this ability. + No other social network offers this ability. + + Join us. -IMPORTANT: Please see the file INSTALL.txt for system requirements. From edc7a920dd5a14ceb856cf6d109598396a419477 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 29 Dec 2010 02:45:25 -0800 Subject: [PATCH 02/29] more upd8 --- README | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README b/README index 3fd5180114..d01cf7a329 100644 --- a/README +++ b/README @@ -75,10 +75,12 @@ encryption. We also won't share it with advertisers. a feature-rich social networking alternative, but all they can deliver is vapour and vague promises. You've probably heard about the four guys in New York and their "Facebook killer". What a disaster that was. Eventually they -may get it right and release something that actually works, but they may not. +may get it right and release something that actually works (and lets you do +something besides drag your friends into categories), but they may not. What are you going to use in the meantime? - Friendika delivers. + Friendika delivers. We've got an incredibly rich social communications +interface you can make use of *right now*. A single instance of Friendika can easily support hundreds of (and up to several thousand) people using commodity hosting hardware. Each of these From 710f024de31246908d90513a6d4de29bca935989 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 29 Dec 2010 03:43:33 -0800 Subject: [PATCH 03/29] upd8 --- README | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README b/README index d01cf7a329..7ab4251c08 100644 --- a/README +++ b/README @@ -21,7 +21,9 @@ Facebook. Granted, all your friends aren't here. Yet. The people who made fun of you in high school (yet curiously wanted to be friends with you now) are still -poking each other and managing their virtual farms. Would you miss them? +"poking" each other and managing their virtual farms and telling you all about +their virtual gangwars. +Would you miss them? I wouldn't. From bf60ec070bb5af0eb1d37772cfdacda4f9c39a19 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 29 Dec 2010 12:31:38 -0800 Subject: [PATCH 04/29] more upd8s --- README | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/README b/README index 7ab4251c08..cd9738e679 100644 --- a/README +++ b/README @@ -22,8 +22,7 @@ Facebook. Granted, all your friends aren't here. Yet. The people who made fun of you in high school (yet curiously wanted to be friends with you now) are still "poking" each other and managing their virtual farms and telling you all about -their virtual gangwars. -Would you miss them? +their virtual gang wars. Would you miss them? I wouldn't. @@ -31,7 +30,7 @@ Would you miss them? that the world has changed. It's time to move on. What if there was a social network which provided some of the same -interaction you've grown to love, *and* was free to use, open source - and +interaction you've grown to love, *and* was free to use, open source, *and* where your privacy is always under your control? And what if this social network could scale to encompass the entire @@ -82,8 +81,15 @@ something besides drag your friends into categories), but they may not. What are you going to use in the meantime? Friendika delivers. We've got an incredibly rich social communications -interface you can make use of *right now*. - +interface you can make use of *right now*. + + And lest you think we're just trying to copy Facebook feature-for-feature, +you couldn't be further from the truth. We like the conversational style +because it feels natural, and that's why Facebook grew to be what it is today. +But we're creating something completely different. + + Something better. + A single instance of Friendika can easily support hundreds of (and up to several thousand) people using commodity hosting hardware. Each of these people are able to connect with potentially hundreds or thousands of friends From a8aba766bd0d2e0119ef144ccd654011231bf9ee Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 29 Dec 2010 13:57:47 -0800 Subject: [PATCH 05/29] upd8s --- README | 48 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 13 deletions(-) diff --git a/README b/README index cd9738e679..9ccb645b76 100644 --- a/README +++ b/README @@ -19,35 +19,44 @@ Facebook. Friendika is here to rock that boat. - Granted, all your friends aren't here. Yet. The people who made fun of you + Granted, all your friends aren't here - yet. The people who made fun of you in high school (yet curiously wanted to be friends with you now) are still "poking" each other and managing their virtual farms and telling you all about their virtual gang wars. Would you miss them? I wouldn't. - You probably have a handful of friends that are truly special. Tell them -that the world has changed. It's time to move on. + You probably have a handful of friends that are truly special. Tell those +friends that the world has changed - because it has. It's time to move on. A +year ago, if you had left Facebook, there was no place to go - at least a +place which offered the same kind of social interaction (and wasn't just +another huge company trying to make money off of all of your private +information). + + Today you have options. What if there was a social network which provided some of the same -interaction you've grown to love, *and* was free to use, open source, *and* -where your privacy is always under your control? +interaction you've grown to love, *and* was free to use, *and* was open source, +*and* where your privacy is always under your control? And what if this social network could scale to encompass the entire internet, and *not* require a central organisation to provide servers (in -exchange for selling your private information to advertisers)? +exchange for selling your private information - and everything else they can +find out about you from logging all of your online activities and +conversations)? Look no further. Friendika is a social network without boundaries, and without ownership. Friendika installations can link together into a global social network which -is free from central control. Besides the Friendika network [which is privacy -enhanced]; you can also connect with and communicate with friends on identi.ca, +is free from central control. Besides the Friendika network (which is privacy +enhanced); you can also connect with and communicate with friends on identi.ca, Status.Net and many other sites and social networks *today*. - Welcome to the federated social web. If you choose not to use Friendika, -you can choose any of 20-30 other providers of social networking software and -still be a part of this new social network. This is bigger than Facebook. + Welcome to the federated social web. If you choose not to use Friendika +(though we think you'd be foolish not to), you can choose any of 20-30 other +providers of federated social networking software and still be a part of this +vast new social network. This is going to be bigger than Facebook. Much bigger. @@ -83,7 +92,7 @@ What are you going to use in the meantime? Friendika delivers. We've got an incredibly rich social communications interface you can make use of *right now*. - And lest you think we're just trying to copy Facebook feature-for-feature, + And lest you think we're just trying to copy Facebook feature-for-feature, you couldn't be further from the truth. We like the conversational style because it feels natural, and that's why Facebook grew to be what it is today. But we're creating something completely different. @@ -120,7 +129,20 @@ friends and public updates to your hordes of fans - using the same interface. No other social network offers this ability. - Join us. + + Join us. + + ******************* + Friendika Demo Site + ******************* + + http://demo.friendika.com + + ******************* + Friendika Downloads + ******************* + + http://github.com/friendika/friendika/tarball/master From bcc7d885666d3c193b524e681db4ae8861e881a3 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 29 Dec 2010 14:03:44 -0800 Subject: [PATCH 06/29] strip tabs --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 9ccb645b76..49fa417fcd 100644 --- a/README +++ b/README @@ -132,7 +132,7 @@ friends and public updates to your hordes of fans - using the same interface. Join us. - ******************* + ******************* Friendika Demo Site ******************* From f632a4a53ac5da48c5ed6ee08f05c4d847029698 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 29 Dec 2010 14:13:49 -0800 Subject: [PATCH 07/29] yeah in the garage on an old PC too. --- README | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/README b/README index 49fa417fcd..d36c37ee41 100644 --- a/README +++ b/README @@ -100,10 +100,11 @@ But we're creating something completely different. Something better. A single instance of Friendika can easily support hundreds of (and up to -several thousand) people using commodity hosting hardware. Each of these -people are able to connect with potentially hundreds or thousands of friends -and associates on any other supported network anywhere in the world and share -photos, links, status updates, etc. +several thousand) people using commodity hosting hardware. You could even run +Friendika on an old PC in your closet or garage. Each of these people are able +to connect with potentially hundreds or thousands of friends and associates +on any other supported network anywhere in the world and share photos, links, +status updates, etc. But maybe you don't want to be connected to the world... That's OK too. Friendika may also be closed off from the global community and used to support From fd71d194636c0ebdf612597f56ae70fe79aecf9f Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 00:22:34 -0800 Subject: [PATCH 08/29] upd8 --- README | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/README b/README index d36c37ee41..7b9a51dea2 100644 --- a/README +++ b/README @@ -79,15 +79,12 @@ rarely are (straight-forward and simple). Whether you're communicating with drinking buddies or potential employers, you can rest assured that each is only able to see the side of you that you wish to present. If you send a private message to your aunt Mary, we will encrypt it with military grade -encryption. We also won't share it with advertisers. +encryption. Other distributed social network projects talk about privacy and offering a feature-rich social networking alternative, but all they can deliver is -vapour and vague promises. You've probably heard about the four guys in New -York and their "Facebook killer". What a disaster that was. Eventually they -may get it right and release something that actually works (and lets you do -something besides drag your friends into categories), but they may not. -What are you going to use in the meantime? +vapour and vague promises. Things like "Private mail will be in the next +release". Friendika delivers. We've got an incredibly rich social communications interface you can make use of *right now*. @@ -106,8 +103,8 @@ to connect with potentially hundreds or thousands of friends and associates on any other supported network anywhere in the world and share photos, links, status updates, etc. - But maybe you don't want to be connected to the world... That's OK too. -Friendika may also be closed off from the global community and used to support + But maybe you don't want to be connected to the world... and that's OK +too. Friendika may be closed off from the global community and used to support social networking amongst corporate, educational, religious, and other private communities. This makes it an excellent choice for the social networking needs of young teenagers and especially k-12 organisations. From 279469ab35596097e7942e7c2377bc50967ee953 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 14:21:05 -0800 Subject: [PATCH 09/29] plugin hooks for bbcode conversions --- addon/README | 6 ++++++ include/bbcode.php | 7 ++++++- include/html2bbcode.php | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/addon/README b/addon/README index 451b6ed726..23e1b5c6fe 100644 --- a/addon/README +++ b/addon/README @@ -107,6 +107,12 @@ Current hooks: 'contacts' => contact array of entries 'output' => the (string) generated HTML of the contact block +'bbcode' - called during conversion of bbcode to html + $b is (string) converted text + +'html2bbcode' - called during conversion of html to bbcode (e.g. remote message posting) + $b is (string) converted text + *** = subject to change diff --git a/include/bbcode.php b/include/bbcode.php index 351510f6d2..7e901bd412 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1,10 +1,13 @@ ", ">", $Text); @@ -82,5 +85,7 @@ function bbcode($Text) { $Text = preg_replace("/\[youtube\]http:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '', $Text); + call_hooks('bbcode',$Text); + return $Text; } diff --git a/include/html2bbcode.php b/include/html2bbcode.php index a2e53a81b8..1f3d63a0da 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -44,6 +44,8 @@ $bbtags = array( // Replace $htmltags in $text with $bbtags $text = preg_replace ($htmltags, $bbtags, $s); +call_hooks('html2bbcode', $text); + // Strip all other HTML tags $text = strip_tags($text); return $text; From 98dcc195117bab35363c75e14af08858b6dbba3d Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 14:36:35 -0800 Subject: [PATCH 10/29] page_header hook --- addon/README | 4 ++++ include/nav.php | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addon/README b/addon/README index 23e1b5c6fe..0264e6b24d 100644 --- a/addon/README +++ b/addon/README @@ -114,6 +114,10 @@ Current hooks: $b is (string) converted text +'page_header' - called after building the page navigation section + $b is (string) HTML of nav region + + *** = subject to change diff --git a/include/nav.php b/include/nav.php index af0c58710d..74b4defc38 100644 --- a/include/nav.php +++ b/include/nav.php @@ -49,7 +49,6 @@ $a->page['nav'] .= '' . t('Contacts') . "\r\n"; - } @@ -57,9 +56,10 @@ $banner = get_config('system','banner'); - if($banner === false) $banner .= 'logoFriendika'; $a->page['nav'] .= ''; + + call_hooks('page_header', $a->page['nav']); From 9296d178b3696a0cf408d006b7fb9832a3344dcb Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 18:32:49 -0800 Subject: [PATCH 11/29] html5 video/audio support - still needs multiple source selection, and check that it isn't blocked by html purifier --- include/bbcode.php | 7 ++++ include/html2bbcode.php | 92 +++++++++++++++++++++++------------------ 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 7e901bd412..646401ddb5 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -77,6 +77,13 @@ function bbcode($Text) { // Images // [img]pathtoimage[/img] $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '', $Text); + + // html5 video and audio + + $Text = preg_replace("/\[video\](.+?)\[\/video\]/", '', $Text); + + $Text = preg_replace("/\[audio\](.+?)\[\/audio\]/", '', $Text); + // [img=widthxheight]image source[/img] $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '', $Text); diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 1f3d63a0da..b993292300 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -1,52 +1,62 @@ (.*?)\<\/b\>/is', - '/\(.*?)\<\/i\>/is', - '/\(.*?)\<\/u\>/is', - '/\(.*?)\<\/ul\>/is', - '/\(.*?)\<\/li\>/is', - '/\/is', - '/\(.*?)\<\/div\>/is', - '/\/is', - '/\(.*?)\<\/strong\>/is', - '/\(.*?)\<\/a\>/is', - '/\(.*?)\<\/code\>/is', - '/\(.*?)\<\/span\>/is', - '/\(.*?)\<\/blockquote\>/is', + $htmltags = array( + '/\n/is', + '/\(.*?)\<\/b\>/is', + '/\(.*?)\<\/i\>/is', + '/\(.*?)\<\/u\>/is', + '/\(.*?)\<\/ul\>/is', + '/\(.*?)\<\/li\>/is', + '/\/is', + '/\(.*?)\<\/div\>/is', + '/\/is', + '/\(.*?)\<\/strong\>/is', + '/\(.*?)\<\/a\>/is', + '/\(.*?)\<\/code\>/is', + '/\(.*?)\<\/span\>/is', + '/\(.*?)\<\/blockquote\>/is', + '/\(.*?)/is', + '/\(.*?)/is', - ); + ); -// Replace with -$bbtags = array( - '', - '[b]$1[/b]', - '[i]$1[/i]', - '[u]$1[/u]', - '[list]$1[/list]', - '[*]$1', - '[img]$2[/img]', - '$2', - "\n", - '[b]$1[/b]', - '[url=$1]$3[/url]', - '[code]$1[/code]', - '[color="$1"]$2[/color]', - '[quote]$1[/quote]', - ); + // Replace with -// Replace $htmltags in $text with $bbtags -$text = preg_replace ($htmltags, $bbtags, $s); + $bbtags = array( + '', + '[b]$1[/b]', + '[i]$1[/i]', + '[u]$1[/u]', + '[list]$1[/list]', + '[*]$1', + '[img]$2[/img]', + '$2', + "\n", + '[b]$1[/b]', + '[url=$1]$3[/url]', + '[code]$1[/code]', + '[color="$1"]$2[/color]', + '[quote]$1[/quote]', + '[video]$1[/video]', + '[audio]$1[/audio]', + ); -call_hooks('html2bbcode', $text); + // Replace $htmltags in $text with $bbtags + $text = preg_replace ($htmltags, $bbtags, $s); + + call_hooks('html2bbcode', $text); + + // Strip all other HTML tags + $text = strip_tags($text); + return $text; +} -// Strip all other HTML tags -$text = strip_tags($text); -return $text; -} \ No newline at end of file From afaacd134c7127a66741c452818f9bfc00d48dd8 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 18:43:42 -0800 Subject: [PATCH 12/29] linkify audio/video links for non-html5 browsers (or those with unsupported codecs?) --- include/bbcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/bbcode.php b/include/bbcode.php index 646401ddb5..ef31f5a665 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -80,9 +80,9 @@ function bbcode($Text) { // html5 video and audio - $Text = preg_replace("/\[video\](.+?)\[\/video\]/", '', $Text); + $Text = preg_replace("/\[video\](.+?)\[\/video\]/", '$1', $Text); - $Text = preg_replace("/\[audio\](.+?)\[\/audio\]/", '', $Text); + $Text = preg_replace("/\[audio\](.+?)\[\/audio\]/", '', $Text); // [img=widthxheight]image source[/img] From 53928bec875bd15576d3157c678bf29e215eb63b Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 21:08:06 -0800 Subject: [PATCH 13/29] oops escape left angles in expressions --- include/html2bbcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index b993292300..1aaaffc557 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -24,8 +24,8 @@ function html2bbcode($s) { '/\(.*?)\<\/code\>/is', '/\(.*?)\<\/span\>/is', '/\(.*?)\<\/blockquote\>/is', - '/\(.*?)/is', - '/\(.*?)/is', + '/\(.*?)\/is', + '/\(.*?)\/is', ); From e490c9459d066d4658f46b4b37b5c9321b0e7956 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 21:09:58 -0800 Subject: [PATCH 14/29] and right angles --- include/html2bbcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index 1aaaffc557..f5790217a6 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -24,8 +24,8 @@ function html2bbcode($s) { '/\(.*?)\<\/code\>/is', '/\(.*?)\<\/span\>/is', '/\(.*?)\<\/blockquote\>/is', - '/\(.*?)\/is', - '/\(.*?)\/is', + '/\(.*?)\/is', + '/\(.*?)\/is', ); From cf88b283786c7421b2fe63f7da20c345e1e8672d Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 23:28:33 -0800 Subject: [PATCH 15/29] add twitter plugin --- addon/facebook/facebook.php | 4 +- addon/twitter/OAuth.php | 874 +++++++++++++++++++++++++++++++++ addon/twitter/twitter.php | 46 ++ addon/twitter/twitteroauth.php | 245 +++++++++ 4 files changed, 1167 insertions(+), 2 deletions(-) create mode 100644 addon/twitter/OAuth.php create mode 100644 addon/twitter/twitter.php create mode 100644 addon/twitter/twitteroauth.php diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index fbe4b31e67..acf37fcdbb 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -36,7 +36,7 @@ function facebook_post_hook(&$a,&$b) { if($appid && $secret) { - $fb_post = get_pconfig($local_user(),'facebook','post'); + $fb_post = get_pconfig(local_user(),'facebook','post'); if($fb_post) { require_once('library/facebook.php'); @@ -56,5 +56,5 @@ function facebook_post_hook(&$a,&$b) { } } } +} -} \ No newline at end of file diff --git a/addon/twitter/OAuth.php b/addon/twitter/OAuth.php new file mode 100644 index 0000000000..67a94c4790 --- /dev/null +++ b/addon/twitter/OAuth.php @@ -0,0 +1,874 @@ +key = $key; + $this->secret = $secret; + $this->callback_url = $callback_url; + } + + function __toString() { + return "OAuthConsumer[key=$this->key,secret=$this->secret]"; + } +} + +class OAuthToken { + // access tokens and request tokens + public $key; + public $secret; + + /** + * key = the token + * secret = the token secret + */ + function __construct($key, $secret) { + $this->key = $key; + $this->secret = $secret; + } + + /** + * generates the basic string serialization of a token that a server + * would respond to request_token and access_token calls with + */ + function to_string() { + return "oauth_token=" . + OAuthUtil::urlencode_rfc3986($this->key) . + "&oauth_token_secret=" . + OAuthUtil::urlencode_rfc3986($this->secret); + } + + function __toString() { + return $this->to_string(); + } +} + +/** + * A class for implementing a Signature Method + * See section 9 ("Signing Requests") in the spec + */ +abstract class OAuthSignatureMethod { + /** + * Needs to return the name of the Signature Method (ie HMAC-SHA1) + * @return string + */ + abstract public function get_name(); + + /** + * Build up the signature + * NOTE: The output of this function MUST NOT be urlencoded. + * the encoding is handled in OAuthRequest when the final + * request is serialized + * @param OAuthRequest $request + * @param OAuthConsumer $consumer + * @param OAuthToken $token + * @return string + */ + abstract public function build_signature($request, $consumer, $token); + + /** + * Verifies that a given signature is correct + * @param OAuthRequest $request + * @param OAuthConsumer $consumer + * @param OAuthToken $token + * @param string $signature + * @return bool + */ + public function check_signature($request, $consumer, $token, $signature) { + $built = $this->build_signature($request, $consumer, $token); + return $built == $signature; + } +} + +/** + * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104] + * where the Signature Base String is the text and the key is the concatenated values (each first + * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&' + * character (ASCII code 38) even if empty. + * - Chapter 9.2 ("HMAC-SHA1") + */ +class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod { + function get_name() { + return "HMAC-SHA1"; + } + + public function build_signature($request, $consumer, $token) { + $base_string = $request->get_signature_base_string(); + $request->base_string = $base_string; + + $key_parts = array( + $consumer->secret, + ($token) ? $token->secret : "" + ); + + $key_parts = OAuthUtil::urlencode_rfc3986($key_parts); + $key = implode('&', $key_parts); + + return base64_encode(hash_hmac('sha1', $base_string, $key, true)); + } +} + +/** + * The PLAINTEXT method does not provide any security protection and SHOULD only be used + * over a secure channel such as HTTPS. It does not use the Signature Base String. + * - Chapter 9.4 ("PLAINTEXT") + */ +class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod { + public function get_name() { + return "PLAINTEXT"; + } + + /** + * oauth_signature is set to the concatenated encoded values of the Consumer Secret and + * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is + * empty. The result MUST be encoded again. + * - Chapter 9.4.1 ("Generating Signatures") + * + * Please note that the second encoding MUST NOT happen in the SignatureMethod, as + * OAuthRequest handles this! + */ + public function build_signature($request, $consumer, $token) { + $key_parts = array( + $consumer->secret, + ($token) ? $token->secret : "" + ); + + $key_parts = OAuthUtil::urlencode_rfc3986($key_parts); + $key = implode('&', $key_parts); + $request->base_string = $key; + + return $key; + } +} + +/** + * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in + * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for + * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a + * verified way to the Service Provider, in a manner which is beyond the scope of this + * specification. + * - Chapter 9.3 ("RSA-SHA1") + */ +abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod { + public function get_name() { + return "RSA-SHA1"; + } + + // Up to the SP to implement this lookup of keys. Possible ideas are: + // (1) do a lookup in a table of trusted certs keyed off of consumer + // (2) fetch via http using a url provided by the requester + // (3) some sort of specific discovery code based on request + // + // Either way should return a string representation of the certificate + protected abstract function fetch_public_cert(&$request); + + // Up to the SP to implement this lookup of keys. Possible ideas are: + // (1) do a lookup in a table of trusted certs keyed off of consumer + // + // Either way should return a string representation of the certificate + protected abstract function fetch_private_cert(&$request); + + public function build_signature($request, $consumer, $token) { + $base_string = $request->get_signature_base_string(); + $request->base_string = $base_string; + + // Fetch the private key cert based on the request + $cert = $this->fetch_private_cert($request); + + // Pull the private key ID from the certificate + $privatekeyid = openssl_get_privatekey($cert); + + // Sign using the key + $ok = openssl_sign($base_string, $signature, $privatekeyid); + + // Release the key resource + openssl_free_key($privatekeyid); + + return base64_encode($signature); + } + + public function check_signature($request, $consumer, $token, $signature) { + $decoded_sig = base64_decode($signature); + + $base_string = $request->get_signature_base_string(); + + // Fetch the public key cert based on the request + $cert = $this->fetch_public_cert($request); + + // Pull the public key ID from the certificate + $publickeyid = openssl_get_publickey($cert); + + // Check the computed signature against the one passed in the query + $ok = openssl_verify($base_string, $decoded_sig, $publickeyid); + + // Release the key resource + openssl_free_key($publickeyid); + + return $ok == 1; + } +} + +class OAuthRequest { + private $parameters; + private $http_method; + private $http_url; + // for debug purposes + public $base_string; + public static $version = '1.0'; + public static $POST_INPUT = 'php://input'; + + function __construct($http_method, $http_url, $parameters=NULL) { + @$parameters or $parameters = array(); + $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters); + $this->parameters = $parameters; + $this->http_method = $http_method; + $this->http_url = $http_url; + } + + + /** + * attempt to build up a request from what was passed to the server + */ + public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) { + $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on") + ? 'http' + : 'https'; + @$http_url or $http_url = $scheme . + '://' . $_SERVER['HTTP_HOST'] . + ':' . + $_SERVER['SERVER_PORT'] . + $_SERVER['REQUEST_URI']; + @$http_method or $http_method = $_SERVER['REQUEST_METHOD']; + + // We weren't handed any parameters, so let's find the ones relevant to + // this request. + // If you run XML-RPC or similar you should use this to provide your own + // parsed parameter-list + if (!$parameters) { + // Find request headers + $request_headers = OAuthUtil::get_headers(); + + // Parse the query-string to find GET parameters + $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']); + + // It's a POST request of the proper content-type, so parse POST + // parameters and add those overriding any duplicates from GET + if ($http_method == "POST" + && @strstr($request_headers["Content-Type"], + "application/x-www-form-urlencoded") + ) { + $post_data = OAuthUtil::parse_parameters( + file_get_contents(self::$POST_INPUT) + ); + $parameters = array_merge($parameters, $post_data); + } + + // We have a Authorization-header with OAuth data. Parse the header + // and add those overriding any duplicates from GET or POST + if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") { + $header_parameters = OAuthUtil::split_header( + $request_headers['Authorization'] + ); + $parameters = array_merge($parameters, $header_parameters); + } + + } + + return new OAuthRequest($http_method, $http_url, $parameters); + } + + /** + * pretty much a helper function to set up the request + */ + public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) { + @$parameters or $parameters = array(); + $defaults = array("oauth_version" => OAuthRequest::$version, + "oauth_nonce" => OAuthRequest::generate_nonce(), + "oauth_timestamp" => OAuthRequest::generate_timestamp(), + "oauth_consumer_key" => $consumer->key); + if ($token) + $defaults['oauth_token'] = $token->key; + + $parameters = array_merge($defaults, $parameters); + + return new OAuthRequest($http_method, $http_url, $parameters); + } + + public function set_parameter($name, $value, $allow_duplicates = true) { + if ($allow_duplicates && isset($this->parameters[$name])) { + // We have already added parameter(s) with this name, so add to the list + if (is_scalar($this->parameters[$name])) { + // This is the first duplicate, so transform scalar (string) + // into an array so we can add the duplicates + $this->parameters[$name] = array($this->parameters[$name]); + } + + $this->parameters[$name][] = $value; + } else { + $this->parameters[$name] = $value; + } + } + + public function get_parameter($name) { + return isset($this->parameters[$name]) ? $this->parameters[$name] : null; + } + + public function get_parameters() { + return $this->parameters; + } + + public function unset_parameter($name) { + unset($this->parameters[$name]); + } + + /** + * The request parameters, sorted and concatenated into a normalized string. + * @return string + */ + public function get_signable_parameters() { + // Grab all parameters + $params = $this->parameters; + + // Remove oauth_signature if present + // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.") + if (isset($params['oauth_signature'])) { + unset($params['oauth_signature']); + } + + return OAuthUtil::build_http_query($params); + } + + /** + * Returns the base string of this request + * + * The base string defined as the method, the url + * and the parameters (normalized), each urlencoded + * and the concated with &. + */ + public function get_signature_base_string() { + $parts = array( + $this->get_normalized_http_method(), + $this->get_normalized_http_url(), + $this->get_signable_parameters() + ); + + $parts = OAuthUtil::urlencode_rfc3986($parts); + + return implode('&', $parts); + } + + /** + * just uppercases the http method + */ + public function get_normalized_http_method() { + return strtoupper($this->http_method); + } + + /** + * parses the url and rebuilds it to be + * scheme://host/path + */ + public function get_normalized_http_url() { + $parts = parse_url($this->http_url); + + $port = @$parts['port']; + $scheme = $parts['scheme']; + $host = $parts['host']; + $path = @$parts['path']; + + $port or $port = ($scheme == 'https') ? '443' : '80'; + + if (($scheme == 'https' && $port != '443') + || ($scheme == 'http' && $port != '80')) { + $host = "$host:$port"; + } + return "$scheme://$host$path"; + } + + /** + * builds a url usable for a GET request + */ + public function to_url() { + $post_data = $this->to_postdata(); + $out = $this->get_normalized_http_url(); + if ($post_data) { + $out .= '?'.$post_data; + } + return $out; + } + + /** + * builds the data one would send in a POST request + */ + public function to_postdata() { + return OAuthUtil::build_http_query($this->parameters); + } + + /** + * builds the Authorization: header + */ + public function to_header($realm=null) { + $first = true; + if($realm) { + $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"'; + $first = false; + } else + $out = 'Authorization: OAuth'; + + $total = array(); + foreach ($this->parameters as $k => $v) { + if (substr($k, 0, 5) != "oauth") continue; + if (is_array($v)) { + throw new OAuthException('Arrays not supported in headers'); + } + $out .= ($first) ? ' ' : ','; + $out .= OAuthUtil::urlencode_rfc3986($k) . + '="' . + OAuthUtil::urlencode_rfc3986($v) . + '"'; + $first = false; + } + return $out; + } + + public function __toString() { + return $this->to_url(); + } + + + public function sign_request($signature_method, $consumer, $token) { + $this->set_parameter( + "oauth_signature_method", + $signature_method->get_name(), + false + ); + $signature = $this->build_signature($signature_method, $consumer, $token); + $this->set_parameter("oauth_signature", $signature, false); + } + + public function build_signature($signature_method, $consumer, $token) { + $signature = $signature_method->build_signature($this, $consumer, $token); + return $signature; + } + + /** + * util function: current timestamp + */ + private static function generate_timestamp() { + return time(); + } + + /** + * util function: current nonce + */ + private static function generate_nonce() { + $mt = microtime(); + $rand = mt_rand(); + + return md5($mt . $rand); // md5s look nicer than numbers + } +} + +class OAuthServer { + protected $timestamp_threshold = 300; // in seconds, five minutes + protected $version = '1.0'; // hi blaine + protected $signature_methods = array(); + + protected $data_store; + + function __construct($data_store) { + $this->data_store = $data_store; + } + + public function add_signature_method($signature_method) { + $this->signature_methods[$signature_method->get_name()] = + $signature_method; + } + + // high level functions + + /** + * process a request_token request + * returns the request token on success + */ + public function fetch_request_token(&$request) { + $this->get_version($request); + + $consumer = $this->get_consumer($request); + + // no token required for the initial token request + $token = NULL; + + $this->check_signature($request, $consumer, $token); + + // Rev A change + $callback = $request->get_parameter('oauth_callback'); + $new_token = $this->data_store->new_request_token($consumer, $callback); + + return $new_token; + } + + /** + * process an access_token request + * returns the access token on success + */ + public function fetch_access_token(&$request) { + $this->get_version($request); + + $consumer = $this->get_consumer($request); + + // requires authorized request token + $token = $this->get_token($request, $consumer, "request"); + + $this->check_signature($request, $consumer, $token); + + // Rev A change + $verifier = $request->get_parameter('oauth_verifier'); + $new_token = $this->data_store->new_access_token($token, $consumer, $verifier); + + return $new_token; + } + + /** + * verify an api call, checks all the parameters + */ + public function verify_request(&$request) { + $this->get_version($request); + $consumer = $this->get_consumer($request); + $token = $this->get_token($request, $consumer, "access"); + $this->check_signature($request, $consumer, $token); + return array($consumer, $token); + } + + // Internals from here + /** + * version 1 + */ + private function get_version(&$request) { + $version = $request->get_parameter("oauth_version"); + if (!$version) { + // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present. + // Chapter 7.0 ("Accessing Protected Ressources") + $version = '1.0'; + } + if ($version !== $this->version) { + throw new OAuthException("OAuth version '$version' not supported"); + } + return $version; + } + + /** + * figure out the signature with some defaults + */ + private function get_signature_method(&$request) { + $signature_method = + @$request->get_parameter("oauth_signature_method"); + + if (!$signature_method) { + // According to chapter 7 ("Accessing Protected Ressources") the signature-method + // parameter is required, and we can't just fallback to PLAINTEXT + throw new OAuthException('No signature method parameter. This parameter is required'); + } + + if (!in_array($signature_method, + array_keys($this->signature_methods))) { + throw new OAuthException( + "Signature method '$signature_method' not supported " . + "try one of the following: " . + implode(", ", array_keys($this->signature_methods)) + ); + } + return $this->signature_methods[$signature_method]; + } + + /** + * try to find the consumer for the provided request's consumer key + */ + private function get_consumer(&$request) { + $consumer_key = @$request->get_parameter("oauth_consumer_key"); + if (!$consumer_key) { + throw new OAuthException("Invalid consumer key"); + } + + $consumer = $this->data_store->lookup_consumer($consumer_key); + if (!$consumer) { + throw new OAuthException("Invalid consumer"); + } + + return $consumer; + } + + /** + * try to find the token for the provided request's token key + */ + private function get_token(&$request, $consumer, $token_type="access") { + $token_field = @$request->get_parameter('oauth_token'); + $token = $this->data_store->lookup_token( + $consumer, $token_type, $token_field + ); + if (!$token) { + throw new OAuthException("Invalid $token_type token: $token_field"); + } + return $token; + } + + /** + * all-in-one function to check the signature on a request + * should guess the signature method appropriately + */ + private function check_signature(&$request, $consumer, $token) { + // this should probably be in a different method + $timestamp = @$request->get_parameter('oauth_timestamp'); + $nonce = @$request->get_parameter('oauth_nonce'); + + $this->check_timestamp($timestamp); + $this->check_nonce($consumer, $token, $nonce, $timestamp); + + $signature_method = $this->get_signature_method($request); + + $signature = $request->get_parameter('oauth_signature'); + $valid_sig = $signature_method->check_signature( + $request, + $consumer, + $token, + $signature + ); + + if (!$valid_sig) { + throw new OAuthException("Invalid signature"); + } + } + + /** + * check that the timestamp is new enough + */ + private function check_timestamp($timestamp) { + if( ! $timestamp ) + throw new OAuthException( + 'Missing timestamp parameter. The parameter is required' + ); + + // verify that timestamp is recentish + $now = time(); + if (abs($now - $timestamp) > $this->timestamp_threshold) { + throw new OAuthException( + "Expired timestamp, yours $timestamp, ours $now" + ); + } + } + + /** + * check that the nonce is not repeated + */ + private function check_nonce($consumer, $token, $nonce, $timestamp) { + if( ! $nonce ) + throw new OAuthException( + 'Missing nonce parameter. The parameter is required' + ); + + // verify that the nonce is uniqueish + $found = $this->data_store->lookup_nonce( + $consumer, + $token, + $nonce, + $timestamp + ); + if ($found) { + throw new OAuthException("Nonce already used: $nonce"); + } + } + +} + +class OAuthDataStore { + function lookup_consumer($consumer_key) { + // implement me + } + + function lookup_token($consumer, $token_type, $token) { + // implement me + } + + function lookup_nonce($consumer, $token, $nonce, $timestamp) { + // implement me + } + + function new_request_token($consumer, $callback = null) { + // return a new token attached to this consumer + } + + function new_access_token($token, $consumer, $verifier = null) { + // return a new access token attached to this consumer + // for the user associated with this token if the request token + // is authorized + // should also invalidate the request token + } + +} + +class OAuthUtil { + public static function urlencode_rfc3986($input) { + if (is_array($input)) { + return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input); + } else if (is_scalar($input)) { + return str_replace( + '+', + ' ', + str_replace('%7E', '~', rawurlencode($input)) + ); + } else { + return ''; + } +} + + + // This decode function isn't taking into consideration the above + // modifications to the encoding process. However, this method doesn't + // seem to be used anywhere so leaving it as is. + public static function urldecode_rfc3986($string) { + return urldecode($string); + } + + // Utility function for turning the Authorization: header into + // parameters, has to do some unescaping + // Can filter out any non-oauth parameters if needed (default behaviour) + public static function split_header($header, $only_allow_oauth_parameters = true) { + $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/'; + $offset = 0; + $params = array(); + while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) { + $match = $matches[0]; + $header_name = $matches[2][0]; + $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0]; + if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) { + $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content); + } + $offset = $match[1] + strlen($match[0]); + } + + if (isset($params['realm'])) { + unset($params['realm']); + } + + return $params; + } + + // helper to try to sort out headers for people who aren't running apache + public static function get_headers() { + if (function_exists('apache_request_headers')) { + // we need this to get the actual Authorization: header + // because apache tends to tell us it doesn't exist + $headers = apache_request_headers(); + + // sanitize the output of apache_request_headers because + // we always want the keys to be Cased-Like-This and arh() + // returns the headers in the same case as they are in the + // request + $out = array(); + foreach( $headers AS $key => $value ) { + $key = str_replace( + " ", + "-", + ucwords(strtolower(str_replace("-", " ", $key))) + ); + $out[$key] = $value; + } + } else { + // otherwise we don't have apache and are just going to have to hope + // that $_SERVER actually contains what we need + $out = array(); + if( isset($_SERVER['CONTENT_TYPE']) ) + $out['Content-Type'] = $_SERVER['CONTENT_TYPE']; + if( isset($_ENV['CONTENT_TYPE']) ) + $out['Content-Type'] = $_ENV['CONTENT_TYPE']; + + foreach ($_SERVER as $key => $value) { + if (substr($key, 0, 5) == "HTTP_") { + // this is chaos, basically it is just there to capitalize the first + // letter of every word that is not an initial HTTP and strip HTTP + // code from przemek + $key = str_replace( + " ", + "-", + ucwords(strtolower(str_replace("_", " ", substr($key, 5)))) + ); + $out[$key] = $value; + } + } + } + return $out; + } + + // This function takes a input like a=b&a=c&d=e and returns the parsed + // parameters like this + // array('a' => array('b','c'), 'd' => 'e') + public static function parse_parameters( $input ) { + if (!isset($input) || !$input) return array(); + + $pairs = explode('&', $input); + + $parsed_parameters = array(); + foreach ($pairs as $pair) { + $split = explode('=', $pair, 2); + $parameter = OAuthUtil::urldecode_rfc3986($split[0]); + $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : ''; + + if (isset($parsed_parameters[$parameter])) { + // We have already recieved parameter(s) with this name, so add to the list + // of parameters with this name + + if (is_scalar($parsed_parameters[$parameter])) { + // This is the first duplicate, so transform scalar (string) into an array + // so we can add the duplicates + $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]); + } + + $parsed_parameters[$parameter][] = $value; + } else { + $parsed_parameters[$parameter] = $value; + } + } + return $parsed_parameters; + } + + public static function build_http_query($params) { + if (!$params) return ''; + + // Urlencode both keys and values + $keys = OAuthUtil::urlencode_rfc3986(array_keys($params)); + $values = OAuthUtil::urlencode_rfc3986(array_values($params)); + $params = array_combine($keys, $values); + + // Parameters are sorted by name, using lexicographical byte value ordering. + // Ref: Spec: 9.1.1 (1) + uksort($params, 'strcmp'); + + $pairs = array(); + foreach ($params as $parameter => $value) { + if (is_array($value)) { + // If two or more parameters share the same name, they are sorted by their value + // Ref: Spec: 9.1.1 (1) + natsort($value); + foreach ($value as $duplicate_value) { + $pairs[] = $parameter . '=' . $duplicate_value; + } + } else { + $pairs[] = $parameter . '=' . $value; + } + } + // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61) + // Each name-value pair is separated by an '&' character (ASCII code 38) + return implode('&', $pairs); + } +} + +?> diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php new file mode 100644 index 0000000000..9fccefbee0 --- /dev/null +++ b/addon/twitter/twitter.php @@ -0,0 +1,46 @@ +post('statuses/update', array('status' => bbcode($b['body']))); + } + } + } +} + + diff --git a/addon/twitter/twitteroauth.php b/addon/twitter/twitteroauth.php new file mode 100644 index 0000000000..cc771391f8 --- /dev/null +++ b/addon/twitter/twitteroauth.php @@ -0,0 +1,245 @@ +http_status; } + function lastAPICall() { return $this->last_api_call; } + + /** + * construct TwitterOAuth object + */ + function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) { + $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1(); + $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret); + if (!empty($oauth_token) && !empty($oauth_token_secret)) { + $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret); + } else { + $this->token = NULL; + } + } + + + /** + * Get a request_token from Twitter + * + * @returns a key/value array containing oauth_token and oauth_token_secret + */ + function getRequestToken($oauth_callback = NULL) { + $parameters = array(); + if (!empty($oauth_callback)) { + $parameters['oauth_callback'] = $oauth_callback; + } + $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters); + $token = OAuthUtil::parse_parameters($request); + $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']); + return $token; + } + + /** + * Get the authorize URL + * + * @returns a string + */ + function getAuthorizeURL($token, $sign_in_with_twitter = TRUE) { + if (is_array($token)) { + $token = $token['oauth_token']; + } + if (empty($sign_in_with_twitter)) { + return $this->authorizeURL() . "?oauth_token={$token}"; + } else { + return $this->authenticateURL() . "?oauth_token={$token}"; + } + } + + /** + * Exchange request token and secret for an access token and + * secret, to sign API calls. + * + * @returns array("oauth_token" => "the-access-token", + * "oauth_token_secret" => "the-access-secret", + * "user_id" => "9436992", + * "screen_name" => "abraham") + */ + function getAccessToken($oauth_verifier = FALSE) { + $parameters = array(); + if (!empty($oauth_verifier)) { + $parameters['oauth_verifier'] = $oauth_verifier; + } + $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters); + $token = OAuthUtil::parse_parameters($request); + $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']); + return $token; + } + + /** + * One time exchange of username and password for access token and secret. + * + * @returns array("oauth_token" => "the-access-token", + * "oauth_token_secret" => "the-access-secret", + * "user_id" => "9436992", + * "screen_name" => "abraham", + * "x_auth_expires" => "0") + */ + function getXAuthToken($username, $password) { + $parameters = array(); + $parameters['x_auth_username'] = $username; + $parameters['x_auth_password'] = $password; + $parameters['x_auth_mode'] = 'client_auth'; + $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters); + $token = OAuthUtil::parse_parameters($request); + $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']); + return $token; + } + + /** + * GET wrapper for oAuthRequest. + */ + function get($url, $parameters = array()) { + $response = $this->oAuthRequest($url, 'GET', $parameters); + if ($this->format === 'json' && $this->decode_json) { + return json_decode($response); + } + return $response; + } + + /** + * POST wrapper for oAuthRequest. + */ + function post($url, $parameters = array()) { + $response = $this->oAuthRequest($url, 'POST', $parameters); + if ($this->format === 'json' && $this->decode_json) { + return json_decode($response); + } + return $response; + } + + /** + * DELETE wrapper for oAuthReqeust. + */ + function delete($url, $parameters = array()) { + $response = $this->oAuthRequest($url, 'DELETE', $parameters); + if ($this->format === 'json' && $this->decode_json) { + return json_decode($response); + } + return $response; + } + + /** + * Format and sign an OAuth / API request + */ + function oAuthRequest($url, $method, $parameters) { + if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) { + $url = "{$this->host}{$url}.{$this->format}"; + } + $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters); + $request->sign_request($this->sha1_method, $this->consumer, $this->token); + switch ($method) { + case 'GET': + return $this->http($request->to_url(), 'GET'); + default: + return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata()); + } + } + + /** + * Make an HTTP request + * + * @return API results + */ + function http($url, $method, $postfields = NULL) { + $this->http_info = array(); + $ci = curl_init(); + /* Curl settings */ + curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent); + curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout); + curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout); + curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE); + curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:')); + curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer); + curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader')); + curl_setopt($ci, CURLOPT_HEADER, FALSE); + + switch ($method) { + case 'POST': + curl_setopt($ci, CURLOPT_POST, TRUE); + if (!empty($postfields)) { + curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields); + } + break; + case 'DELETE': + curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE'); + if (!empty($postfields)) { + $url = "{$url}?{$postfields}"; + } + } + + curl_setopt($ci, CURLOPT_URL, $url); + $response = curl_exec($ci); + $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE); + $this->http_info = array_merge($this->http_info, curl_getinfo($ci)); + $this->url = $url; + curl_close ($ci); + return $response; + } + + /** + * Get the header info to store. + */ + function getHeader($ch, $header) { + $i = strpos($header, ':'); + if (!empty($i)) { + $key = str_replace('-', '_', strtolower(substr($header, 0, $i))); + $value = trim(substr($header, $i + 2)); + $this->http_header[$key] = $value; + } + return strlen($header); + } +} From ca83d24c0253a769f3e55c312dfd3bcd5fa7dfc7 Mon Sep 17 00:00:00 2001 From: Friendika Date: Thu, 30 Dec 2010 23:48:11 -0800 Subject: [PATCH 16/29] and slashes - sigh... --- include/html2bbcode.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/html2bbcode.php b/include/html2bbcode.php index f5790217a6..688c014526 100644 --- a/include/html2bbcode.php +++ b/include/html2bbcode.php @@ -24,8 +24,8 @@ function html2bbcode($s) { '/\(.*?)\<\/code\>/is', '/\(.*?)\<\/span\>/is', '/\(.*?)\<\/blockquote\>/is', - '/\(.*?)\/is', - '/\(.*?)\/is', + '/\(.*?)\<\/video\>/is', + '/\(.*?)\<\/audio\>/is', ); From e68f68007cf5dca510a16aad6018659c131149b3 Mon Sep 17 00:00:00 2001 From: Friendika Date: Fri, 31 Dec 2010 15:48:57 -0800 Subject: [PATCH 17/29] new year --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 01fe880bdd..fd3ca3b61e 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ * Friendika -* Copyright (c) 2010, Mike Macgirvin +* Copyright (c) 2010, 2011 Mike Macgirvin * All rights reserved. * * Redistribution and use in source and binary forms, with or without From d8985b3a548422dca8a8d659f4c66975366818df Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 1 Jan 2011 13:12:31 -0800 Subject: [PATCH 18/29] try to auto-fill the profile address if we actually do know it. --- README | 4 ++-- include/items.php | 1 - mod/dfrn_request.php | 32 ++++++++++++++++++++++++++++++-- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/README b/README index 7b9a51dea2..e5c5e02d69 100644 --- a/README +++ b/README @@ -41,8 +41,8 @@ interaction you've grown to love, *and* was free to use, *and* was open source, And what if this social network could scale to encompass the entire internet, and *not* require a central organisation to provide servers (in -exchange for selling your private information - and everything else they can -find out about you from logging all of your online activities and +exchange for selling your private information; and everything else they can +find out about you - from logging all of your online activities and conversations)? Look no further. diff --git a/include/items.php b/include/items.php index 22d47d44fe..6f73984e2b 100644 --- a/include/items.php +++ b/include/items.php @@ -157,7 +157,6 @@ function get_feed_for(&$a, $dfrn_id, $owner_id, $last_update, $direction = 0) { '$namdate' => xmlify(datetime_convert('UTC','UTC',$owner['name-date'] . '+00:00' , ATOM_TIME)) )); - call_hooks('atom_feed', $atom); if(! count($items)) { diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 93ef4097b8..844fbbf6d0 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -544,12 +544,40 @@ function dfrn_request_content(&$a) { return; // NOTREACHED } else { - $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : ''); - // Normal web request. Display our user's introduction form. + + /** + * Normal web request. Display our user's introduction form. + */ + + /** + * Try to auto-fill the profile address + */ + + if(local_user()) { + if(strlen($a->path)) { + $myaddr = $a->get_baseurl() . '/profile/' . $a->user['nickname']; + } + else { + $myaddr = $a->user['nickname'] . '@' . substr($a->get_baseurl(), strpos($a->get_baseurl(),'://') + 3 ); + } + } + else { + $myaddr = ((x($_GET,'address')) ? urldecode($_GET['address']) : ''); + } + + /** + * + * The auto_request form only has the profile address + * because nobody is going to read the comments and + * it doesn't matter if they know you or not. + * + */ + if($a->profile['page-flags'] == PAGE_NORMAL) $tpl = load_view_file('view/dfrn_request.tpl'); else $tpl = load_view_file('view/auto_request.tpl'); + $o .= replace_macros($tpl,array( '$header' => t('Friend/Connection Request'), '$pls_answer' => t('Please answer the following:'), From be3cfe8b65031103b195854e0770ed6b3f57d9a1 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sat, 1 Jan 2011 15:03:49 -0800 Subject: [PATCH 19/29] add plugin hooks to personal XRD --- addon/README | 6 ++++++ mod/xrd.php | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/addon/README b/addon/README index 0264e6b24d..83407d6a17 100644 --- a/addon/README +++ b/addon/README @@ -118,6 +118,12 @@ Current hooks: $b is (string) HTML of nav region +'personal_xrd' - called prior to output of personal XRD file. + $b is an array + 'user' => the user record for the person + 'xml' => the complete XML to be output + + *** = subject to change diff --git a/mod/xrd.php b/mod/xrd.php index 0b4bd0d1e7..a0ecbaea80 100644 --- a/mod/xrd.php +++ b/mod/xrd.php @@ -39,6 +39,10 @@ function xrd_content(&$a) { '$modexp' => 'data:application/magic-public-key,' . $salmon_key )); + + $arr = array('user' => $r[0], 'xml' => $o); + call_hooks('personal_xrd', $arr); + echo $o; killme(); From 4f796c68d2db16813b0115f8b7f983326b9a072d Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 14:12:22 -0800 Subject: [PATCH 20/29] declare key size/algorithm to ensure key gets generated --- mod/register.php | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/mod/register.php b/mod/register.php index bd169fbbb8..68c7297c90 100644 --- a/mod/register.php +++ b/mod/register.php @@ -123,7 +123,20 @@ function register_post(&$a) { $pkey = openssl_pkey_get_details($res); $pubkey = $pkey["key"]; + /** + * + * Create another keypair for signing/verifying + * salmon protocol messages. We have to use a slightly + * less robust key because this won't be using openssl + * but the phpseclib. Since it is PHP interpreted code + * it is not nearly as efficient, and the larger keys + * will take several minutes each to process. + * + */ + $sres=openssl_pkey_new(array( + 'digest_alg' => 'sha1', + 'private_key_bits' => 512, 'encrypt_key' => false )); // Get private key From c907c22edac95552958c7c070cd77420b032e9d0 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 14:26:23 -0800 Subject: [PATCH 21/29] missing thumbnail in new profiles --- mod/profiles.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/profiles.php b/mod/profiles.php index e99e0f288c..1c75dc0eb1 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -265,13 +265,14 @@ function profiles_content(&$a) { dbesc($name), dbesc($r1[0]['name']), dbesc($r1[0]['photo']), - dbesc($ra[0]['thumb']) + dbesc($r1[0]['thumb']) ); $r3 = q("SELECT `id` FROM `profile` WHERE `uid` = %d AND `profile-name` = '%s' LIMIT 1", intval(local_user()), dbesc($name) ); + notice( t('New profile created.') . EOL); if(count($r3) == 1) goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']); From b3f39aa2b09f025c3eb3ecb269b86681e775bc43 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 14:30:17 -0800 Subject: [PATCH 22/29] alt profiles not clickable --- view/profile_entry.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/profile_entry.tpl b/view/profile_entry.tpl index db28c0a8fe..5c6952af60 100644 --- a/view/profile_entry.tpl +++ b/view/profile_entry.tpl @@ -4,7 +4,7 @@ Profile Image
-
$profile_name
+
From b381dfa6c64719099c9f07c746f2ce9370d3a37a Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 14:36:30 -0800 Subject: [PATCH 23/29] typo slipped through --- mod/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/install.php b/mod/install.php index 643f9a55cc..dc91f848e6 100644 --- a/mod/install.php +++ b/mod/install.php @@ -19,7 +19,7 @@ function install_post(&$a) { if(mysqli_connect_errno()) { $db = new dba($dbhost, $dbuser, $dbpass, '', true); - if(! mysql_connect_errno()) { + if(! mysqli_connect_errno()) { $r = q("CREATE DATABASE '%s'", dbesc($dbdata) ); From 0fb3aa1b57dc2a1d58a839bc99d2098003778d33 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 19:05:11 -0800 Subject: [PATCH 24/29] valid host checks were returning true on TXT records and other useless garbage --- boot.php | 4 ++-- index.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index 197b6d2381..e4a13ce92c 100644 --- a/boot.php +++ b/boot.php @@ -1481,7 +1481,7 @@ function validate_url(&$url) { $url = 'http://' . $url; $h = parse_url($url); - if(($h) && (checkdnsrr($h['host'], 'ANY'))) { + if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR))) { return true; } return false; @@ -1496,7 +1496,7 @@ function validate_email($addr) { return false; $h = substr($addr,strpos($addr,'@') + 1); - if(($h) && (checkdnsrr($h, 'ANY'))) { + if(($h) && (dns_get_record($h['host'], DNS_A + DNS_CNAME + DNS_PTR + DNS_MX))) { return true; } return false; diff --git a/index.php b/index.php index f6ea0c9a80..abc02521a2 100644 --- a/index.php +++ b/index.php @@ -127,6 +127,7 @@ else * further processing. */ + if(strlen($a->module)) { if(file_exists("mod/{$a->module}.php")) { include("mod/{$a->module}.php"); From 0a485e66647fb58e58e1a4bcab350109ff28cb22 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 21:01:07 -0800 Subject: [PATCH 25/29] don't use openid CURL wrapper if open_basedir is set (even if safe_mode isn't) --- library/openid.php | 2 +- mod/directory.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/library/openid.php b/library/openid.php index eec652bb18..3c58beb8a5 100644 --- a/library/openid.php +++ b/library/openid.php @@ -276,7 +276,7 @@ class LightOpenID protected function request($url, $method='GET', $params=array()) { - if(function_exists('curl_init') && !ini_get('safe_mode')) { + if(function_exists('curl_init') && !ini_get('safe_mode') && (! strlen(ini_get('open_basedir')))) { return $this->request_curl($url, $method, $params); } return $this->request_streams($url, $method, $params); diff --git a/mod/directory.php b/mod/directory.php index 062aae516f..e1c83f05e3 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -40,6 +40,8 @@ function directory_content(&$a) { $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : ""); + + $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra "); if(count($r)) $a->set_pager_total($r[0]['total']); From 03e15bd22f41ad24eba2b97442e2dc1920efb149 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 21:20:17 -0800 Subject: [PATCH 26/29] don't update openidserver if openid is empty --- mod/settings.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mod/settings.php b/mod/settings.php index 273e8baa82..079c835b5a 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -117,11 +117,15 @@ function settings_post(&$a) { // If openid has changed or if there's an openid but no openidserver, try and discover it. if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) { - logger('updating openidserver'); - require_once('library/openid.php'); - $open_id_obj = new LightOpenID; - $open_id_obj->identity = $openid; - $openidserver = $open_id_obj->discover($open_id_obj->identity); + if(strlen($openid)) { + logger('updating openidserver'); + require_once('library/openid.php'); + $open_id_obj = new LightOpenID; + $open_id_obj->identity = $openid; + $openidserver = $open_id_obj->discover($open_id_obj->identity); + } + else + $openidserver = ''; } $r = q("UPDATE `user` SET `username` = '%s', `email` = '%s', `openid` = '%s', `timezone` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s', `notify-flags` = %d, `page-flags` = %d, `default-location` = '%s', `allow_location` = %d, `theme` = '%s', `maxreq` = %d, `openidserver` = '%s' WHERE `uid` = %d LIMIT 1", From 527ff13f77af4a392e93b92e51774938a5ce9885 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 21:25:38 -0800 Subject: [PATCH 27/29] validate the openid url as well. We won't change it if it's bogus, but we won't use it either. --- mod/settings.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/settings.php b/mod/settings.php index 079c835b5a..eb27de06ef 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -117,7 +117,8 @@ function settings_post(&$a) { // If openid has changed or if there's an openid but no openidserver, try and discover it. if($openid != $a->user['openid'] || (strlen($openid) && (! strlen($openidserver)))) { - if(strlen($openid)) { + $tmp_str = $openid; + if(strlen($tmp_str) && validate_url($tmp_str)) { logger('updating openidserver'); require_once('library/openid.php'); $open_id_obj = new LightOpenID; From de5495f90b0327f565888d6cae9b9ae9cfa2664f Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 21:53:00 -0800 Subject: [PATCH 28/29] don't process empty or non-existent group array --- mod/group.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mod/group.php b/mod/group.php index 01875d01f6..fcdc6a7582 100644 --- a/mod/group.php +++ b/mod/group.php @@ -56,13 +56,14 @@ function group_post(&$a) { notice( t('Group name changed.') . EOL ); } $members = $_POST['group_members_select']; - array_walk($members,'validate_members'); + if(is_array($members)) + array_walk($members,'validate_members'); $r = q("DELETE FROM `group_member` WHERE `gid` = %d AND `uid` = %d", intval($a->argv[1]), intval(local_user()) ); $result = true; - if(count($members)) { + if(is_array($members) && count($members)) { foreach($members as $member) { $r = q("INSERT INTO `group_member` ( `uid`, `gid`, `contact-id`) VALUES ( %d, %d, %d )", From d92659560b8edd0594b587103b43ad5bd5012639 Mon Sep 17 00:00:00 2001 From: Friendika Date: Sun, 2 Jan 2011 22:09:54 -0800 Subject: [PATCH 29/29] site config to force publish in site directory --- mod/directory.php | 6 +++--- mod/settings.php | 17 ++++++++++------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/mod/directory.php b/mod/directory.php index e1c83f05e3..b0cee76cb7 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -39,16 +39,16 @@ function directory_content(&$a) { $search = dbesc($search); $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`,`keywords` ) AGAINST ('$search' IN BOOLEAN MODE) " : ""); + $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " ); - - $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra "); + $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra "); if(count($r)) $a->set_pager_total($r[0]['total']); - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ", + $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra ORDER BY `name` ASC LIMIT %d , %d ", intval($a->pager['start']), intval($a->pager['itemspage']) ); diff --git a/mod/settings.php b/mod/settings.php index eb27de06ef..0f01807a20 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -247,13 +247,16 @@ function settings_content(&$a) { } - - - $opt_tpl = load_view_file("view/profile-in-directory.tpl"); - $profile_in_dir = replace_macros($opt_tpl,array( - '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""), - '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "") - )); + if(get_config('system','publish_all')) { + $profile_in_dir = ''; + } + else { + $opt_tpl = load_view_file("view/profile-in-directory.tpl"); + $profile_in_dir = replace_macros($opt_tpl,array( + '$yes_selected' => (($profile['publish']) ? " checked=\"checked\" " : ""), + '$no_selected' => (($profile['publish'] == 0) ? " checked=\"checked\" " : "") + )); + } if(strlen(get_config('system','directory_submit_url'))) { $opt_tpl = load_view_file("view/profile-in-netdir.tpl");