don't allow multiple friends with http/https same person, don't show mail2 coming...

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 4acb5c9bb51905d01f8d970cded159551c0f1c12..c2d37dac7e094d625a085d7571d80bac58b89387 100755 (executable)
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -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)) {
@@ -668,7 +669,21 @@ function dfrn_request_content(&$a) {
 
                $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
 
-               $emailnet = t("<strike>Connect as an email follower</strike> \x28Coming soon\x29");
+               // 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>.');