Merge branch 'htts-if-available' into 'develop'

Use https instead of http (if available)

See merge request ispconfig/ispconfig3!1177

Author: Till Brehm

TODO.txt

@@ -1,4 +1,3 @@
+Please see our GitLab issues for feature requests and bug reports.
 
-Please see issue tracker for feature requests and bug reports.
-
-http://git.ispconfig.org/ispconfig/ispconfig3/issues
+https://git.ispconfig.org/ispconfig/ispconfig3/issues

docs/INSTALL.txt

@@ -1,6 +1,6 @@
 
 The installation instructions for ISPConfig can be found here:
 
-http://www.ispconfig.org/page/en/documentation.html
+https://www.ispconfig.org/page/en/documentation.html
 
 

docs/under_development/DEV_CHROOTED_DEBIAN_5.0.txt

@@ -96,7 +96,7 @@ echo "ChrootDir /var/www" > /etc/apache2/conf.d/mod_chroot.conf
 # Install ISPConfig
 
 cd /tmp
-wget http://www.ispconfig.org/downloads/ISPConfig-3.0.1.4-beta-2.tar.gz
+wget https://www.ispconfig.org/downloads/ISPConfig-3.0.1.4-beta-2.tar.gz
 tar xvfz ISPConfig-3.0.1.4-beta-2.tar.gz
 cd ispconfig3_install/install/
 php -q install.php

install/tpl/config.inc.php.master

@@ -117,7 +117,7 @@ define('CLASSES_ROOT',INCLUDE_ROOT.FS_DIV.'classes');
 //** Server
 $conf['app_title'] = ISPC_APP_TITLE;
 $conf['app_version'] = ISPC_APP_VERSION;
-$conf['app_link'] = 'http://www.ispconfig.org/';
+$conf['app_link'] = 'https://www.ispconfig.org/';
 $conf['modules_available'] = 'dashboard,admin,mail,sites,monitor,client,dns,help';
 $conf['server_id'] = '{server_id}';
 $conf['init_scripts'] = '/etc/init.d';

interface/lib/classes/tools_monitor.inc.php

@@ -490,7 +490,7 @@ function showFail2ban() {
 			if ($data == '') {
 				$html .= '<p>'.
 					'fail2ban is not installed on this server.<br />' .
-					'See more (for debian) <a href="http://www.howtoforge.com/fail2ban_debian_etch" target="htf">here...</a>'.
+					'See more (for debian) <a href="https://www.howtoforge.com/fail2ban_debian_etch" target="htf">here...</a>'.
 					'</p>';
 			}
 			else {

interface/lib/config.inc.php

@@ -105,7 +105,7 @@
 //** Server
 $conf['app_title'] = ISPC_APP_TITLE;
 $conf['app_version'] = ISPC_APP_VERSION;
-$conf['app_link'] = 'http://www.howtoforge.com/forums/showthread.php?t=26988';
+$conf['app_link'] = 'https://www.howtoforge.com/forums/showthread.php?t=26988';
 $conf['modules_available'] = 'admin,mail,sites,monitor,client,dns,help';
 $conf['server_id'] = '1';
 

interface/web/admin/form/system_config.tform.php

@@ -568,7 +568,7 @@
 					1 => array( 'event' => 'SAVE',
 					'type' => 'STRIPNL')
 			),
-			'default' => 'http://www.ispconfig.org/atom',
+			'default' => 'https://www.ispconfig.org/atom',
 			'value'  => ''
 		),
 		'dashboard_atom_url_reseller' => array (
@@ -580,7 +580,7 @@
 					1 => array( 'event' => 'SAVE',
 					'type' => 'STRIPNL')
 			),
-			'default' => 'http://www.ispconfig.org/atom',
+			'default' => 'https://www.ispconfig.org/atom',
 			'value'  => ''
 		),
 		'dashboard_atom_url_client' => array (
@@ -592,7 +592,7 @@
 					1 => array( 'event' => 'SAVE',
 					'type' => 'STRIPNL')
 			),
-			'default' => 'http://www.ispconfig.org/atom',
+			'default' => 'https://www.ispconfig.org/atom',
 			'value'  => ''
 		),
 		'tab_change_discard' => array (

interface/web/admin/lib/lang/ar_language_add.lng

@@ -2,7 +2,7 @@
 $wb['list_head_txt'] = 'Add new language';
 $wb['language_select_txt'] = 'Select language basis';
 $wb['language_new_txt'] = 'New language';
-$wb['language_new_hint_txt'] = '2 characters ISO 639-1 language-code (See http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['language_new_hint_txt'] = '2 characters ISO 639-1 language-code (See https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
 $wb['btn_save_txt'] = 'Create new language file set';
 $wb['btn_cancel_txt'] = 'Back';
 ?>

interface/web/admin/lib/lang/ar_remote_action.lng

@@ -8,5 +8,5 @@ $wb['do_ispcupdate_desc'] = 'This action does a ISPConfig3 update at your select
 $wb['action_scheduled'] = 'The action is scheduled for execution';
 $wb['select_all_server'] = 'All server';
 $wb['ispconfig_update_title'] = 'ISPConfig update instructions';
-$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=http://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
+$wb['ispconfig_update_text'] = 'Login as root user on the shell of your server and execute the command<br /><br /> <strong>ispconfig_update.sh</strong><br /><br />to start the ISPConfig update.<br /><br /><a href=https://www.faqforge.com/linux/controlpanels/ispconfig3/how-to-update-ispconfig-3/ target=_blank>Click here for detailed update instructions</a>';
 ?>

interface/web/admin/lib/lang/bg_language_add.lng

@@ -4,5 +4,5 @@ $wb['language_select_txt'] = 'Изберете изходен език';
 $wb['language_new_txt'] = 'Нов език';
 $wb['btn_save_txt'] = 'Създаване на файловете за новия език';
 $wb['btn_cancel_txt'] = 'Отказ';
-$wb['language_new_hint_txt'] = '2 знака ISO 639-1 език, код (Виж http://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
+$wb['language_new_hint_txt'] = '2 знака ISO 639-1 език, код (Виж https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)';
 ?>