Update links in comments and config to https where available (#9759)

Author: johndoh

config/defaults.inc.php

@@ -25,8 +25,13 @@
 
 // Database connection string (DSN) for read+write operations
 // Format (compatible with PEAR MDB2): db_provider://user:password@host/database
+<<<<<<< HEAD
 // Currently supported db_providers: mysql, pgsql, sqlite, mssql, sqlsrv, oracle
 // For examples see http://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
+=======
+// Currently supported db_providers: mysql, pgsql, sqlite
+// For examples see https://pear.php.net/manual/en/package.database.mdb2.intro-dsn.php
+>>>>>>> ccede1f27 (Update links in comments and config to https where available (#9759))
 // Note: for SQLite use absolute path (Linux): 'sqlite:////full/path/to/sqlite.db?mode=0646'
 //       or (Windows): 'sqlite:///C:/full/path/to/sqlite.db'
 // Note: Various drivers support various additional arguments for connection,
@@ -44,7 +49,7 @@
 
 // use persistent db-connections
 // beware this will not "always" work as expected
-// see: http://www.php.net/manual/en/features.persistent-connections.php
+// see: https://www.php.net/manual/en/features.persistent-connections.php
 $config['db_persistent'] = false;
 
 // you can define specific table (and sequence) names prefix
@@ -75,7 +80,7 @@
 $config['log_driver'] = 'file';
 
 // date format for log entries
-// (read http://php.net/manual/en/function.date.php for all format characters)
+// (read https://php.net/manual/en/function.date.php for all format characters)
 $config['log_date_format'] = 'd-M-Y H:i:s O';
 
 // length of the session ID to prepend each log line with
@@ -89,8 +94,13 @@
 $config['syslog_id'] = 'roundcube';
 
 // Syslog facility to use, if using the 'syslog' log driver.
+<<<<<<< HEAD
 // For possible values see installer or http://php.net/manual/en/function.openlog.php
 $config['syslog_facility'] = LOG_USER;
+=======
+// For possible values see installer or https://php.net/manual/en/function.openlog.php
+$config['syslog_facility'] = \LOG_USER;
+>>>>>>> ccede1f27 (Update links in comments and config to https where available (#9759))
 
 // Activate this option if logs should be written to per-user directories.
 // Data will only be logged if a directory <log_dir>/<username>/ exists and is writable.
@@ -153,14 +163,35 @@
 $config['imap_auth_type'] = null;
 
 // IMAP socket context options
-// See http://php.net/manual/en/context.ssl.php
+// See https://php.net/manual/en/context.ssl.php
 // The example below enables server certificate validation
+<<<<<<< HEAD
 //$config['imap_conn_options'] = [
 //  'ssl'         => [
 //     'verify_peer'  => true,
 //     'verify_depth' => 3,
 //     'cafile'       => '/etc/openssl/certs/ca.crt',
 //   ],
+=======
+//
+// proxy_protocol is used to inject HAproxy style headers in the TCP stream
+// See https://www.haproxy.org/download/1.6/doc/proxy-protocol.txt
+// WARNING: Please note this is currently incompatible with implicit ssl,
+// since the proxy protocol preamble is expected before the ssl handshake.
+// $config['imap_conn_options'] = [
+//    'ssl' => [
+//        'verify_peer'  => true,
+//        'verify_depth' => 3,
+//        'cafile'       => '/etc/openssl/certs/ca.crt',
+//    ],
+//    'proxy_protocol' => 1 | 2 | [ // required (either version number (1|2) or array with 'version' key)
+//        'version'       => 1 | 2, // required, if array
+//        'remote_addr'   => $_SERVER['REMOTE_ADDR'], // optional
+//        'remote_port'   => $_SERVER['REMOTE_PORT'], // optional
+//        'local_addr'    => $_SERVER['SERVER_ADDR'], // optional
+//        'local_port'    => $_SERVER['SERVER_PORT'], // optional
+//    ],
+>>>>>>> ccede1f27 (Update links in comments and config to https where available (#9759))
 // ];
 // Note: These can be also specified as an array of options indexed by hostname
 $config['imap_conn_options'] = null;
@@ -307,7 +338,7 @@
 $config['smtp_timeout'] = 0;
 
 // SMTP socket context options
-// See http://php.net/manual/en/context.ssl.php
+// See https://php.net/manual/en/context.ssl.php
 // The example below enables server certificate validation, and
 // requires 'smtp_timeout' to be non zero.
 // $config['smtp_conn_options'] = [
@@ -347,7 +378,7 @@
 $config['oauth_identity_uri'] = null;
 
 // Optional: disable SSL certificate check on HTTP requests to OAuth server
-// See http://docs.guzzlephp.org/en/stable/request-options.html#verify for possible values
+// See https://docs.guzzlephp.org/en/stable/request-options.html#verify for possible values
 $config['oauth_verify_peer'] = true;
 
 // Mandatory: OAuth scopes to request (space-separated string)
@@ -426,16 +457,16 @@
 $config['memcache_hosts'] = null;
 
 // Controls the use of a persistent connections to memcache servers
-// See http://php.net/manual/en/memcache.addserver.php
+// See https://php.net/manual/en/memcache.addserver.php
 $config['memcache_pconnect'] = true;
 
 // Value in seconds which will be used for connecting to the daemon
-// See http://php.net/manual/en/memcache.addserver.php
+// See https://php.net/manual/en/memcache.addserver.php
 $config['memcache_timeout'] = 1;
 
 // Controls how often a failed server will be retried (value in seconds).
 // Setting this parameter to -1 disables automatic retry.
-// See http://php.net/manual/en/memcache.addserver.php
+// See https://php.net/manual/en/memcache.addserver.php
 $config['memcache_retry_interval'] = 15;
 
 // Use these hosts for accessing Redis.
@@ -777,7 +808,7 @@
 // Absolute path to a local mime.types mapping table file.
 // This is used to derive mime-types from the filename extension or vice versa.
 // Such a file is usually part of the apache webserver. If you don't find a file named mime.types on your system,
-// download it from http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
+// download it from https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
 $config['mime_types'] = null;
 
 // path to imagemagick identify binary (if not set we'll use Imagick or GD extensions)
@@ -942,16 +973,16 @@
 // - 'googie'  - the default (also used for connecting to Nox Spell Server, see 'spellcheck_uri' setting)
 // - 'pspell'  - requires the PHP Pspell module and aspell installed
 // - 'enchant' - requires the PHP Enchant module
-// - 'atd'     - install your own After the Deadline server or check with the people at http://www.afterthedeadline.com before using their API
+// - 'atd'     - install your own After the Deadline server or check with the people at https://www.afterthedeadline.com before using their API
 // Since Google shut down their public spell checking service, the default settings
-// connect to http://spell.roundcube.net which is a hosted service provided by Roundcube.
+// connect to https://spell.roundcube.net which is a hosted service provided by Roundcube.
 // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
 $config['spellcheck_engine'] = 'googie';
 
 // For locally installed Nox Spell Server or After the Deadline services,
 // please specify the URI to call it.
 // Get Nox Spell Server from http://orangoo.com/labs/?page_id=72 or
-// the After the Deadline package from http://www.afterthedeadline.com.
+// the After the Deadline package from https://www.afterthedeadline.com.
 // Leave empty to use the public API of service.afterthedeadline.com
 $config['spellcheck_uri'] = '';
 

index.php

@@ -28,7 +28,7 @@
  | GNU General Public License for more details.                            |
  |                                                                         |
  | You should have received a copy of the GNU General Public License       |
- | along with this program.  If not, see http://www.gnu.org/licenses/.     |
+ | along with this program.  If not, see https://www.gnu.org/licenses/.    |
  |                                                                         |
  +-------------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                          |

installer/config.php

@@ -492,7 +492,7 @@
 
 ?>
 <div>The default locale setting. This also defines the language of the login screen.<br/>Leave it empty to auto-detect the user agent language.</div>
-<p class="hint">Enter a <a href="http://www.faqs.org/rfcs/rfc1766">RFC1766</a> formatted language name. Examples: en_US, de_DE, de_CH, fr_FR, pt_BR</p>
+<p class="hint">Enter a <a href="https://www.faqs.org/rfcs/rfc1766">RFC1766</a> formatted language name. Examples: en_US, de_DE, de_CH, fr_FR, pt_BR</p>
 </dd>
 
 <dt class="propname">skin <span class="userconf">*</span></dt>

installer/index.php

@@ -29,7 +29,7 @@
  | GNU General Public License for more details.                            |
  |                                                                         |
  | You should have received a copy of the GNU General Public License       |
- | along with this program.  If not, see http://www.gnu.org/licenses/.     |
+ | along with this program.  If not, see https://www.gnu.org/licenses/.    |
  |                                                                         |
  +-------------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                          |
@@ -105,7 +105,7 @@
 
 <div id="banner">
   <div class="banner-bg"></div>
-  <div class="banner-logo"><a href="http://roundcube.net"><img src="images/roundcube_logo.png" width="210" height="55" border="0" alt="Roundcube - open source webmail software" /></a></div>
+  <div class="banner-logo"><a href="https://roundcube.net"><img src="images/roundcube_logo.png" width="210" height="55" border="0" alt="Roundcube - open source webmail software" /></a></div>
 </div>
 
 <div id="topnav">

installer/test.php

@@ -252,9 +252,8 @@
     $RCI->fail('Fileinfo/mime_content_type configuration');
     if (!empty($RCI->config['mime_magic'])) {
         echo '<p class="hint">Try setting the <tt>mime_magic</tt> config option to <tt>null</tt>.</p>';
-    }
-    else {
-        echo '<p class="hint">Check the <a href="http://www.php.net/manual/en/function.finfo-open.php">Fileinfo functions</a> of your PHP installation.<br/>';
+    } else {
+        echo '<p class="hint">Check the <a href="https://www.php.net/manual/en/function.finfo-open.php">Fileinfo functions</a> of your PHP installation.<br/>';
         echo 'The path to the magic.mime file can be set using the <tt>mime_magic</tt> config option in Roundcube.</p>';
     }
 }
@@ -267,9 +266,8 @@
 if ($errors = $RCI->check_mime_extensions()) {
     $RCI->fail('Mimetype to file extension mapping');
     echo '<p class="hint">Please set a valid path to your webserver\'s mime.types file to the <tt>mime_types</tt> config option.<br/>';
-    echo 'If you can\'t find such a file, download it from <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types">svn.apache.org</a>.</p>';
-}
-else {
+    echo 'If you can\'t find such a file, download it from <a href="https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types">svn.apache.org</a>.</p>';
+} else {
     $RCI->pass('Mimetype to file extension mapping');
     echo "<br/>";
 }

plugins/acl/acl.php

@@ -18,7 +18,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see http://www.gnu.org/licenses/.
+ * along with this program. If not, see https://www.gnu.org/licenses/.
  */
 
 class acl extends rcube_plugin

plugins/additional_message_headers/additional_message_headers.php

@@ -10,7 +10,7 @@
  * $config['additional_message_headers'] = ['User-Agent' => 'My-Very-Own-Webmail'];
  *
  * @author Ziba Scott
- * @website http://roundcube.net
+ * @website https://roundcube.net
  */
 class additional_message_headers extends rcube_plugin
 {

plugins/attachment_reminder/attachment_reminder.php

@@ -21,7 +21,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>
+ * along with this program. If not, see <https://www.gnu.org/licenses/>
  */
 
 class attachment_reminder extends rcube_plugin

plugins/debug_logger/debug_logger.php

@@ -16,7 +16,7 @@
  * log types and files.
  *
  * @author Ziba Scott
- * @website http://roundcube.net
+ * @website https://roundcube.net
  *
  * Example:
  *

plugins/enigma/lib/enigma_subkey.php

@@ -56,7 +56,7 @@ function get_fingerprint()
      */
     function get_algorithm()
     {
-        // http://tools.ietf.org/html/rfc4880#section-9.1
+        // https://datatracker.ietf.org/doc/html/rfc4880#section-9.1
         switch ($this->algorithm) {
         case 1:
         case 2: