bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security...

diff --git a/boot.php b/boot.php
index a196ccadc416eb377aa9fba7c724d9a8b9214b0d..b17d948601a4fa0e8f5c281edef3b24252fa8b39 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1093' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1094' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1087      );
 

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index ca0c961b371c365f575fcd9ffa0980c32884d1a7..591aaf7fa9d0c6d096482cd11ef9464414e55e7c 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -8,6 +8,10 @@ require_once('include/event.php');
 
 function diaspora2bb($s) {
 
+       // bug #127
+       $s = preg_replace('/\[(.+?)\]\((.+?)[^\\\]_(.+?)\)/','[$1]($2\\_$3)',$s);
+
+
        $s = str_replace(array('\\**','\\__','\\*','\\_'), array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'),$s);
        $s = preg_replace("/\*\*\*(.+?)\*\*\*/", '[b][i]$1[/i][/b]', $s);
        $s = preg_replace("/\_\_\_(.+?)\_\_\_/", '[b][i]$1[/i][/b]', $s);
@@ -15,6 +19,7 @@ function diaspora2bb($s) {
        $s = preg_replace("/\_\_(.+?)\_\_/", '[b]$1[/b]', $s);
        $s = preg_replace("/\*(.+?)\*/", '[i]$1[/i]', $s);
        $s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
+
        $s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
        $s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
        $s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 98901e9f56c80c4e10745c0e9d4a0eb4128ab37d..ce83001b480de9ae6bd4800ae84a880b0b33830f 100644 (file)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -611,6 +611,9 @@ function dfrn_request_content(&$a) {
                        $myaddr = ((x($_GET,'address')) ? $_GET['address'] : '');
                }
 
+               $target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
+
+
                /**
                 *
                 * The auto_request form only has the profile address
@@ -624,6 +627,11 @@ function dfrn_request_content(&$a) {
                else
                        $tpl = get_markup_template('auto_request.tpl');
 
+               $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), 
+                       $target_addr) . EOL . EOL;
+
+               $page_desc .= t("Please enter your 'Identity Address' from one of the following supported social networks:");
+
                $o .= replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),
                        '$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
@@ -632,11 +640,11 @@ function dfrn_request_content(&$a) {
                        '$yes' => t('Yes'),
                        '$no' => t('No'),
                        '$add_note' => t('Add a personal note:'),
-                       '$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
+                       '$page_desc' => $page_desc,
                        '$friendika' => t('Friendika'),
                        '$statusnet' => t('StatusNet/Federated Social Web'),
-                       '$private_net' => t("Private \x28secure\x29 network"),
-                       '$public_net' => t("Public \x28insecure\x29 network"),
+                       '$diaspora' => t('Diaspora'),
+                       '$diasnote' => t('- please share from your own site as noted above'),
                        '$your_address' => t('Your Identity Address:'),
                        '$submit' => t('Submit Request'),
                        '$cancel' => t('Cancel'),

diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index b8d2d1a7298957cc1cd1f13b7d4701ae20ccea5b..377da25c53eacbdea8d741275ffa2134bb6a6b1d 100644 (file)
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -4,8 +4,9 @@
 <p id="dfrn-request-intro">
 $page_desc<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="$private_net">$friendika</a> <img src="images/lock_icon.gif" alt="$private_net" title="$private_net" /></li>
-<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a> <img src="images/unlock_icon.gif" alt="$public_net" title="$public_net"/></li>
+<li><a href="http://friendika.com" title="$friendika">$friendika</a></li>
+<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
+<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
 </ul>
 </p>
 

diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index 034da332daeadcd35406e274d21065f964ed2099..3f4300da6b827b2bed5a106ccabdc5969d812f73 100644 (file)
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -4,8 +4,9 @@
 <p id="dfrn-request-intro">
 $page_desc<br />
 <ul id="dfrn-request-networks">
-<li><a href="http://friendika.com" title="$private_net">$friendika</a> <img src="images/lock_icon.gif" alt="$private_net" title="$private_net" /></li>
-<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a> <img src="images/unlock_icon.gif" alt="$public_net" title="$public_net"/></li>
+<li><a href="http://friendika.com" title="$friendika">$friendika</a></li>
+<li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
+<li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
 </ul>
 $desc
 </p>