From f4721955dbfb23992c4acdadd05108cb1b92e2af Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 2 Apr 2012 21:01:19 -0700
Subject: more ssl policy fixes and prevent delivery to soapbox when using 
 local delivery

---
 mod/dfrn_notify.php | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'mod')

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 4ce324652..5d44e8144 100755
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -106,7 +106,6 @@ function dfrn_notify_post(&$a) {
 	if($ssl_policy == 'self' && strstr($importer['url'],'https:')) {
 		$ssl_changed = true;
 		$importer['url']     = 	str_replace('https:','http:',$importer['url']);
-		$importer['nurl']    = normalise_link($importer['url']);
 		$importer['request'] = 	str_replace('https:','http:',$importer['request']);
 		$importer['notify']  = 	str_replace('https:','http:',$importer['notify']);
 		$importer['poll']    = 	str_replace('https:','http:',$importer['poll']);
@@ -117,7 +116,6 @@ function dfrn_notify_post(&$a) {
 	if($ssl_policy == 'full' && strstr($importer['url'],'http:')) {
 		$ssl_changed = true;
 		$importer['url']     = 	str_replace('http:','https:',$importer['url']);
-		$importer['nurl']    = normalise_link($importer['url']);
 		$importer['request'] = 	str_replace('http:','https:',$importer['request']);
 		$importer['notify']  = 	str_replace('http:','https:',$importer['notify']);
 		$importer['poll']    = 	str_replace('http:','https:',$importer['poll']);
@@ -129,9 +127,6 @@ function dfrn_notify_post(&$a) {
 		q("update contact set 
 			url = '%s', 
 			nurl = '%s',
-			photo = '%s',
-			thumb = '%s',
-			micro = '%s',
 			request = '%s',
 			notify = '%s',
 			poll = '%s',
-- 
cgit v1.2.3