queue optimisation - back off delivery attempts to once per hour after the first...

[friendica.git] / mod / dfrn_request.php

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
old mode 100644 (file)
new mode 100755 (executable)
index aa14bc4..c2d37da
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -43,7 +43,7 @@ function dfrn_request_post(&$a) {
                return;
 
 
-       if($_POST['cancel']) {
+       if(x($_POST, 'cancel')) {
                goaway(z_root());
        } 
 
@@ -77,9 +77,10 @@ function dfrn_request_post(&$a) {
                                 * Lookup the contact based on their URL (which is the only unique thing we have at the moment)
                                 */
        
-                               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
+                               $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND (`url` = '%s' OR `nurl` = '%s') AND `self` = 0 LIMIT 1",
                                        intval(local_user()),
-                                       dbesc($dfrn_url)
+                                       dbesc($dfrn_url),
+                                       dbesc(normalise_link($dfrn_url))
                                );
        
                                if(count($r)) {
@@ -577,6 +578,7 @@ function dfrn_request_content(&$a) {
                                                'language'     => $r[0]['language'],
                                                'to_name'      => $r[0]['username'],
                                                'to_email'     => $r[0]['email'],
+                                               'uid'          => $r[0]['uid'],
                                                'link'             => $a->get_baseurl() . '/notifications/intros',
                                                'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
                                                'source_link'  => $r[0]['url'],
@@ -665,7 +667,25 @@ function dfrn_request_content(&$a) {
                $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:");
+               $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+
+               // see if we are allowed to have NETWORK_MAIL2 contacts
+
+               $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+               if(get_config('system','dfrn_only'))
+                       $mail_disabled = 1;
+
+               if(! $mail_disabled) {
+                       $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
+                               intval($a->profile['uid'])
+                       );
+                       if(! count($r))
+                               $mail_disabled = 1;
+               }
+
+               $emailnet = (($mail_disabled) ? '' : t("<strike>Connect as an email follower</strike> \x28Coming soon\x29"));
+
+               $invite_desc = t('If you are not yet a member of the free social web, <a href="http://dir.friendica.com/siteinfo">follow this link to find a public Friendica site and join us today</a>.');
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Friend/Connection Request'),
@@ -676,11 +696,13 @@ function dfrn_request_content(&$a) {
                        '$no' => t('No'),
                        '$add_note' => t('Add a personal note:'),
                        '$page_desc' => $page_desc,
-                       '$friendika' => t('Friendica'),
+                       '$friendica' => t('Friendica'),
                        '$statusnet' => t('StatusNet/Federated Social Web'),
                        '$diaspora' => t('Diaspora'),
                        '$diasnote' => t('- please share from your own site as noted above'),
                        '$your_address' => t('Your Identity Address:'),
+                       '$invite_desc' => $invite_desc,
+                       '$emailnet' => $emailnet,
                        '$submit' => t('Submit Request'),
                        '$cancel' => t('Cancel'),
                        '$nickname' => $a->argv[1],