bug #363 and a couple of other reported ssl link issues

diff --git a/boot.php b/boot.php
index c2690f6ef0e0024eda0f5bd834f4f5e87ae534d9..bcc51a99581e991481d2f523190b5f7dec5e0c9b 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1299' );
+define ( 'FRIENDICA_VERSION',      '2.3.1300' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1134      );
 

diff --git a/mod/admin.php b/mod/admin.php
index 53b5ee35447a1984cd1eeeb40733e548e3d7acf3..8caa763707b45c0106006022f99e461813536f10 100755 (executable)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -208,6 +208,38 @@ function admin_page_site_post(&$a){
        $diaspora_enabled   =   ((x($_POST,'diaspora_enabled')) ? True   :  False);
        $ssl_policy         =   ((x($_POST,'ssl_policy')) ? intval($_POST['ssl_policy']) : 0);
 
+       if($ssl_policy != intval(get_config('system','ssl_policy'))) {
+               if($ssl_policy == SSL_POLICY_FULL) {
+                       q("update `contact` set 
+                               `url`     = replace(`url`    , 'http:' , 'https:'),
+                               `photo`   = replace(`photo`  , 'http:' , 'https:'),
+                               `thumb`   = replace(`thumb`  , 'http:' , 'https:'),
+                               `micro`   = replace(`micro`  , 'http:' , 'https:'),
+                               `request` = replace(`request`, 'http:' , 'https:'),
+                               `notify`  = replace(`notify` , 'http:' , 'https:'),
+                               `poll`    = replace(`poll`   , 'http:' , 'https:'),
+                               `confirm` = replace(`confirm`, 'http:' , 'https:'),
+                               `poco`    = replace(`poco`   , 'http:' , 'https:')
+                               where `self` = 1"
+                       );
+               }
+               elseif($ssl_policy == SSL_POLICY_SELFSIGN) {
+                       q("update `contact` set 
+                               `url`     = replace(`url`    , 'https:' , 'http:'),
+                               `photo`   = replace(`photo`  , 'https:' , 'http:'),
+                               `thumb`   = replace(`thumb`  , 'https:' , 'http:'),
+                               `micro`   = replace(`micro`  , 'https:' , 'http:'),
+                               `request` = replace(`request`, 'https:' , 'http:'),
+                               `notify`  = replace(`notify` , 'https:' , 'http:'),
+                               `poll`    = replace(`poll`   , 'https:' , 'http:'),
+                               `confirm` = replace(`confirm`, 'https:' , 'http:'),
+                               `poco`    = replace(`poco`   , 'https:' , 'http:')
+                               where `self` = 1"
+                       );
+               }
+       }
+       set_config('system','ssl_policy',$ssl_policy);
+
        set_config('config','sitename',$sitename);
        if ($banner==""){
                // don't know why, but del_config doesn't work...
@@ -218,7 +250,6 @@ function admin_page_site_post(&$a){
        } else {
                set_config('system','banner', $banner);
        }
-       set_config('system','ssl_policy',$ssl_policy);
        set_config('system','language', $language);
        set_config('system','theme', $theme);
        set_config('system','maximagesize', $maximagesize);