aboutsummaryrefslogtreecommitdiffstats
path: root/include/delivery.php
diff options
context:
space:
mode:
Diffstat (limited to 'include/delivery.php')
-rwxr-xr-xinclude/delivery.php44
1 files changed, 1 insertions, 43 deletions
diff --git a/include/delivery.php b/include/delivery.php
index 2407f11c0..794b8f27a 100755
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -321,51 +321,9 @@ function delivery_run($argv, $argc){
$x[0]['writable'] = 1;
}
-
$ssl_policy = get_config('system','ssl_policy');
- // if contact's ssl policy changed, update our links
-
- $ssl_changed = false;
-
- if($ssl_policy == SSL_POLICY_SELFSIGN && strstr($x[0]['url'],'https:')) {
- $ssl_changed = true;
- $x[0]['url'] = str_replace('https:','http:',$x[0]['url']);
- $x[0]['request'] = str_replace('https:','http:',$x[0]['request']);
- $x[0]['notify'] = str_replace('https:','http:',$x[0]['notify']);
- $x[0]['poll'] = str_replace('https:','http:',$x[0]['poll']);
- $x[0]['confirm'] = str_replace('https:','http:',$x[0]['confirm']);
- $x[0]['poco'] = str_replace('https:','http:',$x[0]['poco']);
- }
-
- if($ssl_policy == SSL_POLICY_FULL && strstr($x[0]['url'],'http:')) {
- $ssl_changed = true;
- $x[0]['url'] = str_replace('http:','https:',$x[0]['url']);
- $x[0]['request'] = str_replace('http:','https:',$x[0]['request']);
- $x[0]['notify'] = str_replace('http:','https:',$x[0]['notify']);
- $x[0]['poll'] = str_replace('http:','https:',$x[0]['poll']);
- $x[0]['confirm'] = str_replace('http:','https:',$x[0]['confirm']);
- $x[0]['poco'] = str_replace('http:','https:',$x[0]['poco']);
- }
+ fix_contact_ssl_policy($x[0],$ssl_policy);
- if($ssl_changed) {
- q("update contact set
- url = '%s',
- request = '%s',
- notify = '%s',
- poll = '%s',
- confirm = '%s',
- poco = '%s'
- where id = %d limit 1",
- dbesc($x[0]['url']),
- dbesc($x[0]['request']),
- dbesc($x[0]['notify']),
- dbesc($x[0]['poll']),
- dbesc($x[0]['confirm']),
- dbesc($x[0]['poco']),
- intval($x[0]['id'])
- );
- }
-
// If we are setup as a soapbox we aren't accepting input from this person
if($x[0]['page-flags'] == PAGE_SOAPBOX)