From: Matteo Nastasi <nastasi@alternativeoutput.it>
Date: Fri, 5 Jan 2018 12:06:25 +0000 (+0100)
Subject: url protocol parametrization and some typo
X-Git-Tag: v5.6.0~18
X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=8d0f6233af195d6439d7c57bd715686df4cfcb33;p=brisk.git

url protocol parametrization and some typo
---

diff --git a/web/Obj/brisk.conf-templ.pho b/web/Obj/brisk.conf-templ.pho
index 837e4ed..b4c7829 100644
--- a/web/Obj/brisk.conf-templ.pho
+++ b/web/Obj/brisk.conf-templ.pho
@@ -25,6 +25,7 @@ $G_dbasetype="pgsql";
 $G_dbauth = "host=... port=... user=... password=... dbname=... options='--client_encoding=UTF8'";
 $G_dbpfx = "bsk_";
 
+$G_proto      = "https";
 $G_domain     = "brisk.example.com";
 $G_webbase    = "brisk";
 $G_admin_mail = "admin@$G_domain";
diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 05c24ce..df6de09 100644
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -35,7 +35,7 @@ $_globals_list = array(
 'G_admin_mail', 'G_alarm_passwd', 'G_all_points', 'G_ban_list', 'G_base',
 'G_black_list', 'G_brisk_version', 'G_btrace_pref_sub', 'G_cloud_smasher',
 'G_crypt_key', 'G_dbasetype', 'G_dbauth', 'G_dbpfx', 'G_doc_path',
-'G_domain', 'G_donors_all', 'G_donors_cur', 'G_is_local', 'G_lang', 'G_lng',
+'G_proto', 'G_domain', 'G_donors_all', 'G_donors_cur', 'G_is_local', 'G_lang', 'G_lng',
 'G_mail_seed', 'G_notguar_code', 'G_PG_cons', 'G_PG_cons_n', 'G_PG_vow',
 'G_PG_vow_n', 'G_poll_entries', 'G_poll_name', 'G_poll_title',
 'G_provider_proxy', 'G_proxy_white_list', 'G_room_about', 'G_room_help',
diff --git a/web/index_wr.php b/web/index_wr.php
index 002a76e..6701425 100644
--- a/web/index_wr.php
+++ b/web/index_wr.php
@@ -131,7 +131,7 @@ define('LICMGR_CHO_AFTER',  2);
 
 function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
 {
-    GLOBAL $G_domain, $G_webbase, $G_mail_seed, $G_notguar_code;
+    GLOBAL $G_proto, $G_domain, $G_webbase, $G_mail_seed, $G_notguar_code;
     GLOBAL $G_shutdown, $G_alarm_passwd, $G_ban_list, $G_black_list, $G_lang, $G_room_help, $G_room_about;
     GLOBAL $G_room_passwdhowto, $mlang_indwr;
     GLOBAL $G_tos_vers;
@@ -289,8 +289,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
                 }
                 $hash = md5($curtime . $G_alarm_passwd . $cli_name . $cli_email);
 
-                $confirm_page = sprintf("http://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
-                                        $G_domain, $G_webbase, $mail_code, $hash);
+                $confirm_page = sprintf("%s://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
+                                        $G_proto, $G_domain, $G_webbase, $mail_code, $hash);
                 $subj = $mlang_indwr['nu_msubj'][$G_lang];
                 $body_txt = sprintf($mlang_indwr['ap_mtext'][$G_lang],
                                     $cli_name, $confirm_page);
@@ -488,8 +488,8 @@ function index_wr_main(&$brisk, $remote_addr_full, $get, $post, $cookie)
                     }
                     $hash = md5($curtime . $G_alarm_passwd . $cli_name . $cli_email);
 
-                    $confirm_page = sprintf("http://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
-                                            $G_domain, $G_webbase, $mail_code, $hash);
+                    $confirm_page = sprintf("%s://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
+                                            $G_proto, $G_domain, $G_webbase, $mail_code, $hash);
                     $subj = $mlang_indwr['nu_msubj'][$G_lang];
                     $body_txt = sprintf($mlang_indwr['nu_mtext'][$G_lang],
                                         $user->name, $cli_name, $confirm_page);
diff --git a/web/usermgmt.php b/web/usermgmt.php
index e5689e7..51681d7 100644
--- a/web/usermgmt.php
+++ b/web/usermgmt.php
@@ -132,7 +132,7 @@ $s_style = "
 </style>";
 
 function main() {
-    GLOBAL $s_style, $G_dbpfx, $G_lang, $G_alarm_passwd, $G_domain, $G_webbase;
+    GLOBAL $s_style, $G_dbpfx, $G_lang, $G_alarm_passwd, $G_proto, $G_domain, $G_webbase;
     GLOBAL $mlang_umgmt, $mlang_indwr, $f_mailusers, $sess, $_POST, $_SERVER;
 
 
@@ -216,8 +216,8 @@ SELECT usr.*, guar.login AS guar_login
                     }
                     $hash = md5($curtime . $G_alarm_passwd . $usr_obj->login . $usr_obj->email);
 
-                    $confirm_page = sprintf("http://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
-                                            $G_domain, $G_webbase, $mail_code, $hash);
+                    $confirm_page = sprintf("%s://%s/%s/mailmgr.php?f_act=checkmail&f_code=%d&f_hash=%s",
+                                            $G_proto, $G_domain, $G_webbase, $mail_code, $hash);
                     $subj = $mlang_indwr['nu_msubj'][$G_lang];
                     if (($usr_obj->type & USER_FLAG_TY_APPR) == USER_FLAG_TY_APPR) {
                         $body_txt = sprintf($mlang_indwr['ap_mtext'][$G_lang],
@@ -577,7 +577,7 @@ SELECT usr.*, guar.login AS guar_login
 Ti volevo segnalare che il nickname \'%s\' con cui ti volevi registrare
 non ha superato la fase di verifica manuale; il motivo può essere
 la sua illeggibilità per gli altri utenti o il contenuto poco ortodosso
-o troppo aggressivo o o ci sono troppe cifre consecutive o qualcosa del genere.
+o troppo aggressivo o ci sono troppe cifre consecutive o qualcosa del genere.
 
 La procedura di registrazione va ripetuta.
 
@@ -587,7 +587,7 @@ Saluti e buone partite, mop.', $usr_obj->login);
 Ti volevo segnalare che il nickname \'%s\' con cui ti volevi registrare
 non ha superato la fase di verifica manuale; il motivo può essere
 la sua illeggibilità per gli altri utenti o il contenuto poco ortodosso
-o troppo aggressivo o o ci sono troppe cifre consecutive o qualcosa del genere.<br><br>
+o troppo aggressivo o ci sono troppe cifre consecutive o qualcosa del genere.<br><br>
 La procedura di registrazione va ripetuta.<br><br>
 Saluti e buone partite, mop.', $usr_obj->login);
                     /* } */