Tidying links to bitweaver.org to avoid redirect from http

11 files changed, 19 insertions, 20 deletions

diff --git a/includes/install_checks.php b/includes/install_checks.php
index 465b94a..fc70527 100755
--- a/includes/install_checks.php
+++ b/includes/install_checks.php
@@ -87,8 +87,7 @@ function check_settings() {
 	$php_ext = [
 		'zlib'       => '<a class="external" href="http://www.zlib.net/">The zlib compression libraries</a> are used to pack and unpack compressed files such as .zip files.',
 		'gd'         => '<a class="external" href="http://www.boutell.com/gd/">GD Libraries</a> are used to manipulate images. Bitweaver uses these libraries to create thumbnails and convert images from one format to another. If you are running Red Hat or Fedora Core, you can try: <kbd>yum install php-gd</kbd>. The GD libaries are quite limited and <em>don\'t support</em> a number of image formats including <em>.bmp</em>. If you are planning on uploading and using a lot of images, we recommend you use one of the other image processors.',
-		'imagick'    => 'ImageMagick supports a multitude of different image and video formats and <em>can be used instead of the GD Libraries</em>. Using these libraries will allow you to upload most image formats without any difficulties. For installation help, please view <a class="external" href="http://www.bitweaver.org/wiki/ImageMagick">ImageMagick and MagickWand installation instructions</a> or visit the <a class="external" href="http://www.imagemagick.org">ImageMagick homepage</a>.',
-		'magickwand' => 'MagickWand is a newer PHP extension for ImageMagick. For installation help, please view Bitweaver\'s: <a class="external" href="http://www.bitweaver.org/wiki/ImageMagick">ImageMagick and MagickWand installation instructions</a> or visit the <a class="external" href="http://www.imagemagick.org">ImageMagick homepage</a>.',
+		'imagick'    => 'ImageMagick supports a multitude of different image and video formats and <em>can be used instead of the GD Libraries</em>. Using these libraries will allow you to upload most image formats without any difficulties. For installation help, please view <a class="external" href="https://www.bitweaver.org/wiki/ImageMagick">ImageMagick and MagickWand installation instructions</a> or visit the <a class="external" href="http://www.imagemagick.org">ImageMagick homepage</a>.',
 //		'ffmpeg'       => '<a class="external" href="http://ffmpeg-php.sourceforge.net/">ffmpeg-php</a> is an extension that will allow you to better process uploaded videos. This extension requires ffmpeg to be installed on your server as well.',
 	];
 	foreach( $php_ext as $ext => $note ) {
@@ -123,7 +122,7 @@ function check_settings() {
 			'command'     => 'tar -xvf',
 			'dest_params' => '-C',
 			'testfile'    => 'test.tar',
-			'note'        => '<strong>Tarball</strong> is a common archiving format on Linux and <a class="external" href="http://www.gnu.org/software/tar/">tar</a> is used to extract .tar files. For windows use <a class="external" href="http://gnuwin32.sourceforge.net/downlinks/libarchive.php">bsdtar</a> from gnuwin32 ( See <a class="external" href="http://www.bitweaver.org/wiki/Windows+installation+notes">Windows notes for installation help</a> ).',
+			'note'        => '<strong>Tarball</strong> is a common archiving format on Linux and <a class="external" href="http://www.gnu.org/software/tar/">tar</a> is used to extract .tar files. For windows use <a class="external" href="http://gnuwin32.sourceforge.net/downlinks/libarchive.php">bsdtar</a> from gnuwin32 ( See <a class="external" href="https://www.bitweaver.org/wiki/Windows+installation+notes">Windows notes for installation help</a> ).',
 		],
 		'bzip2'    => [
 			'command'     => 'tar -jvxf',
@@ -224,7 +223,7 @@ function check_settings() {
 		],
 //		'HTMLPurifier'   => [
 //			'path'            => 'HTMLPurifier.php',
-//			'note'            => 'HTMLPurifier is an advanced system for defending against Cross Site Scripting (XSS) attacks and ensuring that all code on your site is standards compliant. It is highly recommended if you are going to allow HTML submission to your site. It is not required if you are only going to allow the input of a Wiki format like Tikiwiki or BBcode. You also need to enable it in the Liberty plugins administration after installation. See <a class="external" href="http://www.bitweaver.org/wiki/HTMLPurifier">http://www.bitweaver.org/wiki/HTMLPurifier</a> and <a class = "external" href = "http: // htmlpurifier.org">http://htmlpurifier.org</a> for more information.',
+//			'note'            => 'HTMLPurifier is an advanced system for defending against Cross Site Scripting (XSS) attacks and ensuring that all code on your site is standards compliant. It is highly recommended if you are going to allow HTML submission to your site. It is not required if you are only going to allow the input of a Wiki format like Tikiwiki or BBcode. You also need to enable it in the Liberty plugins administration after installation. See <a class="external" href="https://www.bitweaver.org/wiki/HTMLPurifier">https://www.bitweaver.org/wiki/HTMLPurifier</a> and <a class = "external" href = "http: // htmlpurifier.org">http://htmlpurifier.org</a> for more information.',
 //			'install_command' => 'pear channel-discover htmlpurifier.org;<br />pear install hp/HTMLPurifier;',
 //		],
 		'HTTP_Download'  => [
diff --git a/templates/install.tpl b/templates/install.tpl
index ee39d1f..6499b9a 100755
--- a/templates/install.tpl
+++ b/templates/install.tpl
@@ -40,7 +40,7 @@
 
 				<nav class="pull-right width60p" style="padding:10px 20px 0 0;">
 					<div class="pull-right">
-						<a href="http://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc"><i class="icon-question-sign"></i> Help</a>
+						<a href="https://www.bitweaver.org/wiki/index.php?page={$section|default:"Install"}bitweaverDoc"><i class="icon-question-sign"></i> Help</a>
 					</div>
 
 					<div class="pull-right width50p" style="padding:0 10px;">
diff --git a/templates/install_checks.tpl b/templates/install_checks.tpl
index c403147..400207a 100644..100755
--- a/templates/install_checks.tpl
+++ b/templates/install_checks.tpl
@@ -148,7 +148,7 @@
 							href="http://pear.php.net/manual/en/installation.shared.php">a
 							shared environment</a> (requires ssh access or ftp access),</li>
 					<li>or download a pre-packed set of <a class="external"
-							href="http://www.bitweaver.org/downloads/file/11619">Bitweaver
+							href="https://www.bitweaver.org/downloads/file/11619">Bitweaver
 							PEAR extensions</a> and extract this to<br />
 						<kbd>{$smarty.const.UTIL_PKG_INCLUDE_PATH}pear/</kbd></li>
 				</ul>
diff --git a/templates/install_database.tpl b/templates/install_database.tpl
index 05c673c..9ca9b77 100644..100755
--- a/templates/install_database.tpl
+++ b/templates/install_database.tpl
@@ -55,11 +55,11 @@
 				{formhelp note="The type of database you intend to use."}
 				{if $mysqlWarning}
 					<p class="alert alert-block">
-						Versions of MySQL less than 4.1 are not supported by some packages due to the <a href="http://dev.mysql.com/doc/refman/4.1/en/subqueries.html">lack of subquery support</a>. Notable among these are the <a href="http://www.bitweaver.org/wiki/BoardsPackage">Boards</a> and <a href="http://www.bitweaver.org/wiki/MessagesPackage">Messages</a> packages. Other packages may also have issues. It is recommended that you use MySQL version 4.1 or higher for the best experience with Bitweaver. It <em>may</em> be possible to use a lower versions of MySQL if you do not install these packages.
+						Versions of MySQL less than 4.1 are not supported by some packages due to the <a href="http://dev.mysql.com/doc/refman/4.1/en/subqueries.html">lack of subquery support</a>. Notable among these are the <a href="https://www.bitweaver.org/wiki/BoardsPackage">Boards</a> and <a href="https://www.bitweaver.org/wiki/MessagesPackage">Messages</a> packages. Other packages may also have issues. It is recommended that you use MySQL version 4.1 or higher for the best experience with Bitweaver. It <em>may</em> be possible to use a lower versions of MySQL if you do not install these packages.
 					</p>
 				{/if}
 			{else}
-				<p class="alert alert-block">You currently have no database installed that works here. If you feel this is wrong, please contact the <a class="external" href="http://www.bitweaver.org/">Bitweaver team</a>.</p>
+				<p class="alert alert-block">You currently have no database installed that works here. If you feel this is wrong, please contact the <a class="external" href="https://www.bitweaver.org/">Bitweaver team</a>.</p>
 			{/if}
 			<p class="alert alert-block">If the database you wish to use is not listed above, the version of PHP on this server does not have support for that database installed or compiled in.</p>
 		{/forminput}
diff --git a/templates/install_final_done.tpl b/templates/install_final_done.tpl
index 6dad7c1..85d2f68 100755
--- a/templates/install_final_done.tpl
+++ b/templates/install_final_done.tpl
@@ -4,13 +4,13 @@
 	<p class="alert alert-success">
 		Your system is ready for use now.
 	</p>
-	<p>Bitweaver offers helpnotes throughout. Should you require more help, you can always contact Bitweaver's developers by any of the means mentioned below. To find out more about existing packages and how to install them, visit <a class="external" href="http://www.bitweaver.org/wiki/index.php?page=bitweaverFeatures">Bitweaver Features</a>.</p>
+	<p>Bitweaver offers helpnotes throughout. Should you require more help, you can always contact Bitweaver's developers by any of the means mentioned below. To find out more about existing packages and how to install them, visit <a class="external" href="https://www.bitweaver.org/wiki/index.php?page=bitweaverFeatures">Bitweaver Features</a>.</p>
 	<p>To get in contact with Bitweaver developers:</p>
 	<ul>
-		<li><a class="external" href="http://www.bitweaver.org/wiki/Live+Support">chat:</a> #bitweaver on freenode.net</li>
+		<li><a class="external" href="https://www.bitweaver.org/wiki/Live+Support">chat:</a> #bitweaver on freenode.net</li>
 		<li><a class="external" href="http://sourceforge.net/mail/?group_id=141358">mailing list at sourceforge.net</a></li>
-		<li><a class="external" href="http://www.bitweaver.org/forums/viewforum.php?f=5">bitweaver.org Forums</a></li>
-		<li><a class="external" href="http://www.bitweaver.org/">bitweaver.org</a> contains all available documentation</li>
+		<li><a class="external" href="https://www.bitweaver.org/forums/viewforum.php?f=5">bitweaver.org Forums</a></li>
+		<li><a class="external" href="https://www.bitweaver.org/">bitweaver.org</a> contains all available documentation</li>
 		<li>submit bugs to Bitweaver's <a class="external" href="http://sourceforge.net/tracker/?group_id=141358&atid=749176">bug tracker at sourceforge.net</a></li>
 	</ul>
 	<p>If you feel like contributing to Bitweaver, contact us! Bitweaver is free and Open Source to all. Translators, testers, admins, release managers, developers, programmers, designers, <em>we want you!</em> :)</p>
@@ -36,7 +36,7 @@
 	<div class="alert alert-info">
 		<strong>Performance</strong>
 		<ul>
-			<li>For production sites, we recommend you visit our <a class="external" href="http://www.bitweaver.org/wiki/Bitweaver+Performance">Bitweaver Performance</a> page on how to optimise your Bitweaver install.</li>
+			<li>For production sites, we recommend you visit our <a class="external" href="https://www.bitweaver.org/wiki/Bitweaver+Performance">Bitweaver Performance</a> page on how to optimise your Bitweaver install.</li>
 			<li>Please also have a look at your <kbd>config/kernel/config_inc.php</kbd> file. It contains various settings that cannot be set elsewhere and which might be of interest to you.</li>
 		</ul>
 	</div>
diff --git a/templates/install_login.tpl b/templates/install_login.tpl
index 64ec50c..fa29124 100755
--- a/templates/install_login.tpl
+++ b/templates/install_login.tpl
@@ -28,7 +28,7 @@
 
 
 <div class="center">
-	<a href="http://www.bitweaver.org/">
+	<a href="https://www.bitweaver.org/">
 		<img src="{$smarty.const.INSTALL_PKG_URL}css/images/bitweaver_logo-trans.png" width="121" height="121" alt="bitweaver logo" title="Click here to visit the upgrade instructions" />
 	</a>
 </div>
diff --git a/templates/install_packages.tpl b/templates/install_packages.tpl
index 5c52d1f..a1e61d9 100755
--- a/templates/install_packages.tpl
+++ b/templates/install_packages.tpl
@@ -11,7 +11,7 @@
 		</div>
 
 		<p>Please go back one step (using the link to your right, rather than the back button on your browser) and enter the administrator data again. If this is the second time you see this screen, please confirm that PHP can write sessions and that any firewall/anti-virus software is turned off during the installation process.</p>
-		<p>If you just can't figure out what the hell is going on, please contact the Bitweaver team via <a href="http://www.bitweaver.org/wiki/Live+Support">IRC</a> if possible or post to the forums on <a href="http://www.bitweaver.org">bitweaver.org</a>.</p>
+		<p>If you just can't figure out what the hell is going on, please contact the Bitweaver team via <a href="https://www.bitweaver.org/wiki/Live+Support">IRC</a> if possible or post to the forums on <a href="https://www.bitweaver.org">bitweaver.org</a>.</p>
 {else}
 	{formfeedback warning=$warning}
 	{form id="installpackagesform"}
diff --git a/templates/install_upgrade.tpl b/templates/install_upgrade.tpl
index 3dd0601..3a31f39 100755
--- a/templates/install_upgrade.tpl
+++ b/templates/install_upgrade.tpl
@@ -7,7 +7,7 @@
 
 			{if $packageUpgrades}
 				<h2>Packages and their upgrades</h2>
-				<div class="alert alert-danger"><div class="pull-left"><i class="icon-warning-sign" style="font-size:3em;padding-right:20px;"></i></div> You are about to run an upgrade which might make changes to your database. We <strong>strongly</strong> recommend that you back up your database (preferably carry out the entire <a class="external" href="http://www.bitweaver.org/wiki/bitweaverUpgrade#Generalproceduretoupgrade">backup procedure</a>).</div>
+				<div class="alert alert-danger"><div class="pull-left"><i class="icon-warning-sign" style="font-size:3em;padding-right:20px;"></i></div> You are about to run an upgrade which might make changes to your database. We <strong>strongly</strong> recommend that you back up your database (preferably carry out the entire <a class="external" href="https://www.bitweaver.org/wiki/bitweaverUpgrade#Generalproceduretoupgrade">backup procedure</a>).</div>
 				{foreach from=$packageUpgrades item=upgrade key=package}
 					{* users don't have the option to select what packages to upgrade since the code of the package is dependent on this upgrade
 					<h3>{forminput label="checkbox"}<input type="checkbox" name="packages[]" value="{$package}" checked="checked" /> {$package}{/forminput}</h3> *}
diff --git a/templates/install_welcome.tpl b/templates/install_welcome.tpl
index ad3d97a..02a3cd1 100755
--- a/templates/install_welcome.tpl
+++ b/templates/install_welcome.tpl
@@ -7,7 +7,7 @@
 			<p class="alert alert-block">Since this does not appear to be your first install, you can access various pages of the installer. To install new packages, please visit <strong><a href="install.php?step=3">Packages</a></strong>.</p>
 		{/if}
 
-		<p>Thank you for choosing Bitweaver. This web content management system offers an unparalleled consonance of simplicity, performance, and flexibility. For questions, comments, and support, please visit <a class="external" href="http://www.bitweaver.org">bitweaver.org</a>.  Help is available via <a class="external" href="http://www.bitweaver.org/">the forum</a> and via <a title="#bitweaver IRC Channel on freenode.net" class="external" href="http://www.bitweaver.org/wiki/Live+Support">#bitweaver chat</a>. Click to begin the install process:</p>
+		<p>Thank you for choosing Bitweaver. This web content management system offers an unparalleled consonance of simplicity, performance, and flexibility. For questions, comments, and support, please visit <a class="external" href="https://www.bitweaver.org">bitweaver.org</a>.  Help is available via <a class="external" href="https://www.bitweaver.org/">the forum</a> and via <a title="#bitweaver IRC Channel on freenode.net" class="external" href="https://www.bitweaver.org/wiki/Live+Support">#bitweaver chat</a>. Click to begin the install process:</p>
 
 		{form class="" id="install_welcome"}
 
diff --git a/templates/migrate_database.tpl b/templates/migrate_database.tpl
index c213205..46398d3 100755
--- a/templates/migrate_database.tpl
+++ b/templates/migrate_database.tpl
@@ -34,7 +34,7 @@
 						{if $dbservers}
 							{html_options name='db_src' options=$dbservers id=db_src selected=$db_src}
 						{else}
-							{formfeedback warning='You currently have no database installed that works here. If you feel this is wrong, please contact the <a class="external" href="http://www.bitweaver.org/">Bitweaver Team</a>.'}
+							{formfeedback warning='You currently have no database installed that works here. If you feel this is wrong, please contact the <a class="external" href="https://www.bitweaver.org/">Bitweaver Team</a>.'}
 						{/if}
 						{formhelp note="The type of database you intend to use."}
 						{formfeedback warning="If the database you wish to use is not listed above, the version of PHP on this server does not have support for that database installed or compiled in."}
@@ -145,7 +145,7 @@
 						{if $dbservers}
 							{html_options name='db_dst' options=$dbservers id=db_dst selected=$gBitDbType}
 						{else}
-							{formfeedback warning='You currently have no Database installed that works here. If you feel this is wrong, please contact the <a class="external" href="http://www.bitweaver.org/">Bitweaver Team</a>.'}
+							{formfeedback warning='You currently have no Database installed that works here. If you feel this is wrong, please contact the <a class="external" href="https://www.bitweaver.org/">Bitweaver Team</a>.'}
 						{/if}
 						{formhelp note="The type of database you intend to use."}
 						{formfeedback warning="If the database you wish to use is not listed above, the version of PHP on this server does not have support for that database installed or compiled in."}
diff --git a/templates/upgrade_welcome.tpl b/templates/upgrade_welcome.tpl
index 9c721d1..f201079 100644..100755
--- a/templates/upgrade_welcome.tpl
+++ b/templates/upgrade_welcome.tpl
@@ -47,7 +47,7 @@
 		<h2>Important</h2>
 		<p class="danger">
 			Since you are upgrading from Bitweaver version 1 to version 2, please visit the
-			<strong><a class="external" href="http://www.bitweaver.org/wiki/bitweaver+R1+to+R2+Upgrade">Upgrade documentation page</a></strong>.
+			<strong><a class="external" href="https://www.bitweaver.org/wiki/bitweaver+R1+to+R2+Upgrade">Upgrade documentation page</a></strong>.
 			It contains <strong>crucial information</strong> about the
 			changes that have occurred and how to fix certain upgrade issues
 			that can not be dealt with by the installer. We can not stress