Migrate to SITE_DOMAIN constant from (NON)SSL_SITE_URL

README.md

@@ -35,7 +35,7 @@ We use new PHP password hashing features that automatically rehash your password
 
 * When a torrent is trumped, the new torrent is made freeleech to users who snatched the old torrent for a few days
 * An attempt has been made to support magnet links. This has shown partial success.
-* This codebase is expected to run over https only. No effort has been made to explicitely break non-ssl functionality, but no effort has been made to continue supporting it either.
+* This codebase is expected to run over https only.
 
 ## Bug Fixes
 

classes/autoenable.class.php

@@ -122,7 +122,7 @@ class AutoEnable {
             $TPL = NEW TEMPLATE;
             if ($Status == self::APPROVED) {
                 $TPL->open(SERVER_ROOT . '/templates/enable_request_accepted.tpl');
-                $TPL->set('SITE_URL', NONSSL_SITE_URL);
+                $TPL->set('SITE_DOMAIN', SITE_DOMAIN);
             } else {
                 $TPL->open(SERVER_ROOT . '/templates/enable_request_denied.tpl');
             }

classes/config.template

@@ -6,8 +6,7 @@ if (PHP_VERSION_ID < 70000) {
 
 // Main settings
 define('SITE_NAME', 'Oppaitime'); //The name of your site
-define('NONSSL_SITE_URL', 'oppaiti.me'); //The FQDN of your site
-define('SSL_SITE_URL', 'oppaiti.me'); //The FQDN of your site, make this different if you are using a subdomain for ssl
+define('SITE_DOMAIN', 'oppaiti.me'); //The FQDN of your site
 define('SITE_IP', '8.8.8.8'); //The IP address by which your site can be publicly accessed
 define('SERVER_ROOT', '/var/www'); //The root of the server, used for includes, purpose is to shorten the path string
 
@@ -21,8 +20,7 @@ define('ANNOUNCE_URLS', [['https://tracker.'.SSL_SITE_URL.':34001',
 define('API_KEYS', ['ANIDB' => 'AAAAAAAAAAAAAAAA']);
 
 // Allows you to run static content off another server. Default is usually what you want.
-define('NONSSL_STATIC_SERVER', 'static/');
-define('SSL_STATIC_SERVER', 'static/');
+define('STATIC_SERVER', 'static/');
 
 // Keys
 define('ENCKEY', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); //Random key. The key for encryption
@@ -57,14 +55,6 @@ define('TRACKER_PORT', 34000);
 define('TRACKER_SECRET', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); // Must be 32 characters and match site_password in Ocelot's config.cpp
 define('TRACKER_REPORTKEY', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); // Must be 32 characters and match report_password in Ocelot's config.cpp
 
-if (!empty($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 80) {
-	define('SITE_URL', NONSSL_SITE_URL);
-	define('STATIC_SERVER', NONSSL_STATIC_SERVER);
-} else {
-	define('SITE_URL', SSL_SITE_URL);
-	define('STATIC_SERVER', SSL_STATIC_SERVER);
-}
-
 // Site settings
 define('DEBUG_MODE', false); //Set to false if you dont want everyone to see debug information, can be overriden with 'site_debug'
 define('DEBUG_WARNINGS', true); //Set to true if you want to see PHP warnings in the footer

classes/cookie.class.php

@@ -32,7 +32,7 @@ class COOKIE /*implements COOKIE_INTERFACE*/ {
 
 	//Pass the 4th optional param as false to allow JS access to the cookie
 	public function set($Key, $Value, $Seconds = 86400, $LimitAccess = SELF::LIMIT_ACCESS) {
-		setcookie(SELF::PREFIX.$Key, $Value, time() + $Seconds, '/', SITE_URL, $_SERVER['SERVER_PORT'] === '443', $LimitAccess, false);
+		setcookie(SELF::PREFIX.$Key, $Value, time() + $Seconds, '/', SITE_DOMAIN, $_SERVER['SERVER_PORT'] === '443', $LimitAccess, false);
 	}
 
 	public function del($Key) {

classes/feed.class.php

@@ -1,7 +1,5 @@
 <?
 class FEED {
-	var $UseSSL = true; // If we're using SSL for blog and news links
-
 	function open_feed() {
 		header("Content-type: application/xml; charset=UTF-8");
 		echo "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n","<rss xmlns:dc=\"http://purl.org/dc/elements/1.1/\" version=\"2.0\">\n\t<channel>\n";
@@ -12,7 +10,7 @@ class FEED {
 	}
 
 	function channel($Title, $Description, $Section = '') {
-		$Site = $this->UseSSL ? site_url() : site_url(false);
+		$Site = site_url();
 		echo "\t\t<title>$Title :: ". SITE_NAME. "</title>\n";
 		echo "\t\t<link>$Site$Section</link>\n";
 		echo "\t\t<description>$Description</description>\n";
@@ -28,7 +26,7 @@ class FEED {
 		} else {
 			$Date = date('r', strtotime($Date));
 		}
-		$Site = $this->UseSSL ? site_url() : site_url(false);
+		$Site = site_url();
 		$Item = "\t\t<item>\n";
 		$Item .= "\t\t\t<title><![CDATA[$Title]]></title>\n";
 		$Item .= "\t\t\t<description><![CDATA[$Description]]></description>\n";

classes/imagetools.class.php

@@ -169,8 +169,6 @@ class ImageTools {
 	 * @return image proxy URL
 	 */
 	public static function proxy_url($Url, $CheckSize, $UserID, &$ExtraInfo) {
-		global $SSL;
-
 		if ($UserID) {
 			$ExtraInfo = "&userid=$UserID";
 			if ($CheckSize === 'avatar' && !isset(self::$CheckedAvatars[$UserID])) {
@@ -185,10 +183,10 @@ class ImageTools {
 			}
 		}
 
-    if (preg_match('/^https:\/\/'.SITE_URL.'\//', $Url)) {
+    if (preg_match('/^https:\/\/'.SITE_DOMAIN.'\//', $Url)) {
       return $Url;
     } else {
-      return ($SSL ? 'https' : 'http') . '://' . SITE_URL . "/image.php?c=1&i=" . urlencode($Url);
+      return 'https://' . SITE_DOMAIN . "/image.php?c=1&i=" . urlencode($Url);
     }
 	}
 

classes/misc.class.php

@@ -6,18 +6,18 @@ class Misc {
 	 * @param string $To the email address to send it to.
 	 * @param string $Subject
 	 * @param string $Body
-	 * @param string $From The user part of the user@NONSSL_SITE_URL email address.
+	 * @param string $From The user part of the user@SITE_DOMAIN email address.
 	 * @param string $ContentType text/plain or text/html
 	 */
 	public static function send_email($To, $Subject, $Body, $From = 'noreply', $ContentType = 'text/plain') {
 		$Headers = 'MIME-Version: 1.0'."\r\n";
 		$Headers .= 'Content-type: '.$ContentType.'; charset=iso-8859-1'."\r\n";
-		$Headers .= 'From: '.SITE_NAME.' <'.$From.'@'.NONSSL_SITE_URL.'>'."\r\n";
-		$Headers .= 'Reply-To: '.$From.'@'.NONSSL_SITE_URL."\r\n";
+		$Headers .= 'From: '.SITE_NAME.' <'.$From.'@'.SITE_DOMAIN.'>'."\r\n";
+		$Headers .= 'Reply-To: '.$From.'@'.SITE_DOMAIN."\r\n";
 		$Headers .= 'X-Mailer: Project Gazelle'."\r\n";
-		$Headers .= 'Message-Id: <'.Users::make_secret().'@'.NONSSL_SITE_URL.">\r\n";
+		$Headers .= 'Message-Id: <'.Users::make_secret().'@'.SITE_DOMAIN.">\r\n";
 		$Headers .= 'X-Priority: 3'."\r\n";
-		mail($To, $Subject, $Body, $Headers, "-f $From@".NONSSL_SITE_URL);
+		mail($To, $Subject, $Body, $Headers, "-f $From@".SITE_DOMAIN);
 	}
 
 

classes/regex.php

@@ -10,7 +10,7 @@ define('EMAIL_REGEX','[_a-z0-9-]+([.+][_a-z0-9-]+)*@'.DOMAIN_REGEX);
 define('IMAGE_REGEX', URL_REGEX.'\/\S+\.(jpg|jpeg|tif|tiff|png|gif|bmp)(\?\S*)?');
 define('VIDEO_REGEX', URL_REGEX.'\/\S+\.(webm)(\?\S*)?');
 define('CSS_REGEX', URL_REGEX.'\/\S+\.css(\?\S*)?');
-define('SITELINK_REGEX', RESOURCE_REGEX.'(ssl.)?'.preg_quote(NONSSL_SITE_URL, '/'));
+define('SITELINK_REGEX', RESOURCE_REGEX.'(www)?'.preg_quote(SITE_DOMAIN, '/'));
 define('TORRENT_REGEX', SITELINK_REGEX.'\/torrents\.php\?(.*&)?torrentid=(\d+)'); // torrentid = group 4
 define('TORRENT_GROUP_REGEX', SITELINK_REGEX.'\/torrents\.php\?(.*&)?id=(\d+)'); // id = group 4
 define('ARTIST_REGEX', SITELINK_REGEX.'\/artist\.php\?(.*&)?id=(\d+)'); // id = group 4

classes/script_start.php

@@ -30,25 +30,11 @@ if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])
 	$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
 }
 
-$SSL = true; #(isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443);
 if (!isset($argv) && !empty($_SERVER['HTTP_HOST'])) {
-//Skip this block if running from cli or if the browser is old and shitty
-	if (!$SSL && $_SERVER['HTTP_HOST'] == 'www.'.NONSSL_SITE_URL) {
-		header('Location: http://'.NONSSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
-	}
-	if ($SSL && $_SERVER['HTTP_HOST'] == 'www.'.NONSSL_SITE_URL) {
-		header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
-	}
-	if (SSL_SITE_URL != NONSSL_SITE_URL) {
-		if (!$SSL && $_SERVER['HTTP_HOST'] == SSL_SITE_URL) {
-			header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
-		}
-		if ($SSL && $_SERVER['HTTP_HOST'] == NONSSL_SITE_URL) {
-			header('Location: https://'.SSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
-		}
-	}
-	if ($_SERVER['HTTP_HOST'] == 'www.m.'.NONSSL_SITE_URL) {
-		header('Location: http://m.'.NONSSL_SITE_URL.$_SERVER['REQUEST_URI']); die();
+  // Skip this block if running from cli or if the browser is old and shitty
+  // This should really be done in nginx config TODO: Remove
+	if ($_SERVER['HTTP_HOST'] == 'www.'.SITE_DOMAIN) {
+		header('Location: https://'.SITE_DOMAIN.$_SERVER['REQUEST_URI']); die();
 	}
 }
 

classes/text.class.php

@@ -281,9 +281,9 @@ class Text {
 			return false;
 		}
 		$Host = $URLInfo['host'];
-		// If for some reason your site does not require subdomains or contains a directory in the SITE_URL, revert to the line below.
-		//if ($Host == NONSSL_SITE_URL || $Host == SSL_SITE_URL || $Host == 'www.'.NONSSL_SITE_URL) {
-		if (empty($URLInfo['port']) && preg_match('/(\S+\.)*'.NONSSL_SITE_URL.'/', $Host)) {
+		// If for some reason your site does not require subdomains or contains a directory in the SITE_DOMAIN, revert to the line below.
+		//if ($Host == SITE_DOMAIN || $Host == 'www.'.SITE_DOMAIN) {
+		if (empty($URLInfo['port']) && preg_match('/(\S+\.)*'.SITE_DOMAIN.'/', $Host)) {
 			$URL = '';
 			if (!empty($URLInfo['path'])) {
 				$URL .= ltrim($URLInfo['path'], '/'); // Things break if the path starts with '//'
@@ -665,7 +665,6 @@ class Text {
 	}
 
 	private static function to_html ($Array) {
-		global $SSL;
 		self::$Levels++;
 		/*
 		 * Hax prevention
@@ -720,7 +719,7 @@ class Text {
 					$Str .= '<a href="rules.php?p=upload#'.urlencode(Format::undisplay_str($Rule)).'">'.preg_replace('/[aA-zZ]/', '', $Block['Val']).'</a>';
 					break;
 				case 'torrent':
-					$Pattern = '/('.NONSSL_SITE_URL.'\/torrents\.php.*[\?&]id=)?(\d+)($|&|\#).*/i';
+					$Pattern = '/('.SITE_DOMAIN.'\/torrents\.php.*[\?&]id=)?(\d+)($|&|\#).*/i';
 					$Matches = array();
 					if (preg_match($Pattern, $Block['Val'], $Matches)) {
 						if (isset($Matches[2])) {

classes/users.class.php

@@ -47,7 +47,7 @@ class Users {
 	 *	int EffectiveClass - the highest level of their main and secondary classes
 	 */
 	public static function user_info($UserID) {
-		global $Classes, $SSL;
+		global $Classes;
 		$UserInfo = G::$Cache->get_value("user_info_$UserID");
 		// the !isset($UserInfo['Paranoia']) can be removed after a transition period
 		if (empty($UserInfo) || empty($UserInfo['ID']) || !isset($UserInfo['Paranoia']) || empty($UserInfo['Class'])) {
@@ -728,7 +728,7 @@ class Users {
     $TPL->set('ResetKey', $ResetKey);
     $TPL->set('IP', $_SERVER['REMOTE_ADDR']);
     $TPL->set('SITE_NAME', SITE_NAME);
-    $TPL->set('SITE_URL', NONSSL_SITE_URL);
+    $TPL->set('SITE_DOMAIN', SITE_DOMAIN); // TODO: Remove
 
     Misc::send_email($Email, 'Password reset information for ' . SITE_NAME, $TPL->get(), 'noreply');
   }

classes/util.php

@@ -192,10 +192,8 @@ function json_print($Status, $Message) {
 
 /**
  * Print the site's URL including the appropriate URI scheme, including the trailing slash
- *
- * @param bool $SSL - whether the URL should be crafted for HTTPS or regular HTTP
  */
-function site_url($SSL = true) {
-	return $SSL ? 'https://' . SSL_SITE_URL . '/' : 'http://' . NONSSL_SITE_URL . '/';
+function site_url() {
+	return 'https://' . SITE_DOMAIN . '/';
 }
 ?>

design/privateheader.php

@@ -1,7 +1,7 @@
 <?
 
 define('FOOTER_FILE', SERVER_ROOT.'/design/privatefooter.php');
-$HTTPS = ($_SERVER['SERVER_PORT'] == 443) ? 'ssl_' : '';
+$HTTPS = true;
 $UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster'];
 
 ?>
@@ -75,7 +75,7 @@ if ($Mobile) { ?>
 		$StyleURLInfo = parse_url(G::$LoggedUser['StyleURL']);
 		if (substr(G::$LoggedUser['StyleURL'], -4) == '.css'
 				&& empty($StyleURLInfo['query']) && empty($StyleURLInfo['fragment'])
-				&& in_array($StyleURLInfo['host'], array(NONSSL_SITE_URL, SSL_SITE_URL))
+				&& ($StyleURLInfo['host'] == SITE_DOMAIN)
 				&& file_exists(SERVER_ROOT.$StyleURLInfo['path'])) {
 			$StyleURL = G::$LoggedUser['StyleURL'].'?v='.filemtime(SERVER_ROOT.$StyleURLInfo['path']);
 		} else {

design/publicheader.php

@@ -1,5 +1,5 @@
 <?
-global $LoggedUser, $SSL;
+global $LoggedUser;
 define('FOOTER_FILE',SERVER_ROOT.'/design/publicfooter.php');
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

feeds.php

@@ -102,11 +102,9 @@ function display_array($Array, $Escape = array()) {
 
 /**
  * Print the site's URL including the appropriate URI scheme, including the trailing slash
- *
- * @param bool $SSL - whether the URL should be crafted for HTTPS or regular HTTP
  */
-function site_url($SSL = true) {
-	return $SSL ? 'https://' . SSL_SITE_URL . '/' : 'http://' . NONSSL_SITE_URL . '/';
+function site_url() {
+	return 'https://' . SITE_DOMAIN . '/';
 }
 
 header('Cache-Control: no-cache, must-revalidate, post-check=0, pre-check=0');
@@ -114,5 +112,4 @@ header('Pragma:');
 header('Expires: '.date('D, d M Y H:i:s', time() + (2 * 60 * 60)).' GMT');
 header('Last-Modified: '.date('D, d M Y H:i:s').' GMT');
 
-$Feed->UseSSL = (isset($_SERVER['SERVER_PORT']) && $_SERVER['SERVER_PORT'] == 443);
 require(SERVER_ROOT.'/sections/feeds/index.php');

sections/artist/artist.php

@@ -273,7 +273,7 @@ foreach ($TorrentList as $Group) {
 
 			$SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
 			$TorrentDL = "torrents.php?action=download&id=".$TorrentID."&authkey=".$LoggedUser['AuthKey']."&torrent_pass=".$LoggedUser['torrent_pass'];
-			$TorrentMG = "magnet:?xt=urn:btih:".$Torrent['info_hash']."&as=https://".SSL_SITE_URL."/".str_replace('&','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Torrent['Size'];
+			$TorrentMG = "magnet:?xt=urn:btih:".$Torrent['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Torrent['Size'];
 ?>
 		<tr class="torrent_row groupid_<?=$GroupID?> group_torrent discog<?=$SnatchedTorrentClass . $SnatchedGroupClass . $HideTorrents?>">
 			<td colspan="2">
@@ -340,7 +340,7 @@ foreach ($TorrentList as $Group) {
 		$SnatchedTorrentClass = $Torrent['IsSnatched'] ? ' snatched_torrent' : '';
 
     $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];
-    $TorrentMG = "magnet:?xt=urn:btih:".$Torrent['info_hash']."&as=https://".SSL_SITE_URL."/".str_replace('&amp;','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Torrent['Size'];
+    $TorrentMG = "magnet:?xt=urn:btih:".$Torrent['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&amp;','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Torrent['Size'];
 
 ?>
 		<tr class="torrent<?=$SnatchedTorrentClass . $SnatchedGroupClass?>">

sections/chat/index.php

@@ -56,7 +56,7 @@ if (false && empty($IRCKey)) {
 		<div style="padding: 0px 10px 10px 20px;">
 			<p>If you have an IRC client, refer to <a href="wiki.php?action=article&amp;name=IRC">this wiki article</a> for information on how to connect.</p>
 		</div>
-    <iframe src="<?echo 'https://chat.'.SSL_SITE_URL?>" width="100%" height="600" style="border:0;">
+    <iframe src="<?echo 'https://chat.'.SITE_DOMAIN?>" width="100%" height="600" style="border:0;">
 		</iframe>
 	</div>
 </div>

sections/donate/donate_gpal.php

@@ -38,7 +38,7 @@ View::show_header('Donate');
 			<input type="hidden" name="business" value="<?=PAYPAL_ADDRESS?>" />
 			<input type="hidden" name="txn_id" value="0" />
 			<input type="hidden" name="payment_type" value="instant" />
-			<input type="text" name="payer_email" value="<?=$LoggedUser['Username']?>@<?=NONSSL_SITE_URL?>" />
+			<input type="text" name="payer_email" value="<?=$LoggedUser['Username']?>@<?=SITE_DOMAIN?>" />
 			<input type="hidden" name="mc_currency" value="<?=PAYPAL_CURRENCY?>" />
 			<input name="test" type="submit" value="Donate" />
 		</form>

sections/error/index.php

@@ -2,7 +2,7 @@
 
 function notify ($Channel, $Message) {
 	global $LoggedUser;
-	send_irc("PRIVMSG ".$Channel." :".$Message." error by ".(!empty($LoggedUser['ID']) ? site_url()."user.php?id=".$LoggedUser['ID'] ." (".$LoggedUser['Username'].")" : $_SERVER['REMOTE_ADDR']." (".Tools::geoip($_SERVER['REMOTE_ADDR']).")")." accessing https://".SSL_SITE_URL."".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER'])? " from ".$_SERVER['HTTP_REFERER'] : ''));
+	send_irc("PRIVMSG ".$Channel." :".$Message." error by ".(!empty($LoggedUser['ID']) ? site_url()."user.php?id=".$LoggedUser['ID'] ." (".$LoggedUser['Username'].")" : $_SERVER['REMOTE_ADDR']." (".Tools::geoip($_SERVER['REMOTE_ADDR']).")")." accessing https://".SITE_DOMAIN."".$_SERVER['REQUEST_URI'].(!empty($_SERVER['HTTP_REFERER'])? " from ".$_SERVER['HTTP_REFERER'] : ''));
 }
 
 $Errors = array('403','404','413','504');

sections/log/index.php

@@ -51,10 +51,10 @@ while (list($ID, $Message, $LogTime) = $DB->next_record()) {
 	$Message = '';
 	$Color = $Colon = false;
 	for ($i = 0, $PartCount = sizeof($MessageParts); $i < $PartCount; $i++) {
-		if ((strpos($MessageParts[$i], 'https://'.SSL_SITE_URL) === 0
-				&& $Offset = strlen('https://'.SSL_SITE_URL.'/'))
-			|| (strpos($MessageParts[$i], 'http://'.NONSSL_SITE_URL) === 0
-				&& $Offset = strlen('http://'.NONSSL_SITE_URL.'/'))
+		if ((strpos($MessageParts[$i], 'https://'.SITE_DOMAIN) === 0
+				&& $Offset = strlen('https://'.SITE_DOMAIN.'/'))
+			|| (strpos($MessageParts[$i], 'http://'.SITE_DOMAIN) === 0
+				&& $Offset = strlen('http://'.SITE_DOMAIN.'/'))
 			) {
 				$MessageParts[$i] = '<a href="'.substr($MessageParts[$i], $Offset).'">'.substr($MessageParts[$i], $Offset).'</a>';
 		}

sections/login/disabled.php

@@ -54,7 +54,7 @@ If you do not have access to an IRC client, you can use the WebIRC interface pro
 Please use your <?=SITE_NAME?> username.
 </p>
 <br />
-<form class="confirm_form" name="chat" action="<?echo 'https://chat.'.SSL_SITE_URL.BOT_DISABLED_CHAN?>" target="_blank" method="pre">
+<form class="confirm_form" name="chat" action="<?echo 'https://chat.'.SITE_DOMAIN.BOT_DISABLED_CHAN?>" target="_blank" method="pre">
 	<input type="text" name="nick" width="20" />
 	<input type="submit" value="Join WebIRC" />
 </form>

sections/login/index.php

@@ -297,10 +297,10 @@ else {
 
 						if (isset($_POST['keeplogged']) && $_POST['keeplogged']) {
 							$KeepLogged = 1;
-							setcookie('session', $Cookie, time() + 60 * 60 * 24 * 365, '/', '', $SSL, true);
+							setcookie('session', $Cookie, time() + 60 * 60 * 24 * 365, '/', '', true, true);
 						} else {
 							$KeepLogged = 0;
-							setcookie('session', $Cookie, 0, '/', '', $SSL, true);
+							setcookie('session', $Cookie, 0, '/', '', true, true);
 						}
 
 						//TODO: another tracker might enable this for donors, I think it's too stupid to bother adding that

sections/register/index.php

@@ -251,7 +251,7 @@ if (!empty($_REQUEST['confirm'])) {
 			$TPL->set('Username', $_REQUEST['username']);
 			$TPL->set('TorrentKey', $torrent_pass);
 			$TPL->set('SITE_NAME', SITE_NAME);
-			$TPL->set('SITE_URL', SITE_URL);
+			$TPL->set('SITE_DOMAIN', SITE_DOMAIN);
 
 			Misc::send_email($_REQUEST['email'], 'New account confirmation at '.SITE_NAME, $TPL->get(), 'noreply');
 			Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $torrent_pass));

sections/staffblog/index.php

@@ -73,7 +73,7 @@ if (check_perms('admin_manage_blog')) {
 				$Cache->delete_value('staff_blog');
 				$Cache->delete_value('staff_blog_latest_time');
 
-        send_irc("PRIVMSG ".ADMIN_CHAN." :!mod New staff blog: " . $_POST['title'] . " - https://".SSL_SITE_URL."/staffblog.php#blog" . $DB->inserted_id());
+        send_irc("PRIVMSG ".ADMIN_CHAN." :!mod New staff blog: " . $_POST['title'] . " - https://".SITE_DOMAIN."/staffblog.php#blog" . $DB->inserted_id());
 
 				header('Location: staffblog.php');
 				break;

sections/torrents/browse.php

@@ -581,7 +581,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
 
 			$SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
       $TorrentDL = "torrents.php?action=download&id=".$TorrentID."&authkey=".$LoggedUser['AuthKey']."&torrent_pass=".$LoggedUser['torrent_pass'];
-      $TorrentMG = "magnet:?xt=urn:btih:".$Data['info_hash']."&as=https://".SSL_SITE_URL."/".str_replace('&','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
+      $TorrentMG = "magnet:?xt=urn:btih:".$Data['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
 
 ?>
 	<tr class="group_torrent groupid_<?=$GroupID?> <?=$SnatchedTorrentClass . $SnatchedGroupClass . (!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGrouping'] == 1 ? ' hidden' : '')?>">
@@ -647,7 +647,7 @@ $ShowGroups = !(!empty($LoggedUser['TorrentGrouping']) && $LoggedUser['TorrentGr
 		}
 		$SnatchedTorrentClass = $Data['IsSnatched'] ? ' snatched_torrent' : '';
     $TorrentDL = "torrents.php?action=download&amp;id=".$TorrentID."&amp;authkey=".$LoggedUser['AuthKey']."&amp;torrent_pass=".$LoggedUser['torrent_pass'];
-    $TorrentMG = "magnet:?xt=urn:btih:".$Data['info_hash']."&as=https://".SSL_SITE_URL."/".str_replace('&amp;','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
+    $TorrentMG = "magnet:?xt=urn:btih:".$Data['info_hash']."&as=https://".SITE_DOMAIN."/".str_replace('&amp;','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Data['Size'];
 ?>
 	<tr class="torrent<?=$SnatchedTorrentClass . $SnatchedGroupClass?>">
 <?		if ($GroupResults) { ?>

sections/torrents/details.php

@@ -517,7 +517,7 @@ foreach ($TorrentList as $Torrent) {
 	if (!empty($BadFiles)) { $ExtraInfo.=$AddExtra. Format::torrent_label('Bad File Names'); $AddExtra=' / '; }
 
   $TorrentDL = "torrents.php?action=download&id=".$TorrentID."&authkey=".$LoggedUser['AuthKey']."&torrent_pass=".$LoggedUser['torrent_pass'];
-  $TorrentMG = "magnet:?xt=urn:btih:".$InfoHash."&as=https://".SSL_SITE_URL."/".str_replace('&','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Size;
+  $TorrentMG = "magnet:?xt=urn:btih:".$InfoHash."&as=https://".SITE_DOMAIN."/".str_replace('&','%26',$TorrentDL)."&tr=".implode("/".$LoggedUser['torrent_pass']."/announce&tr=",ANNOUNCE_URLS[0])."/".$LoggedUser['torrent_pass']."/announce&xl=".$Size;
 ?>
 
 			<tr class="torrent_row groupid_<?=$GroupID?> group_torrent<?=($IsSnatched ? ' snatched_torrent' : '')?>" style="font-weight: normal;" id="torrent<?=$TorrentID?>">

sections/upload/insert_extra_torrents.php

@@ -53,15 +53,12 @@ foreach ($ExtraTorrentsInsert as $ExtraTorrent) {
 		$Announce .= ' / Freeleech!';
 	}
 
-	$AnnounceSSL = $Announce . ' - ' . site_url() . "torrents.php?id=$GroupID / " . site_url() . "torrents.php?action=download&id=$ExtraTorrentID";
-	$Announce .= ' - ' . site_url() . "torrents.php?id=$GroupID / " . site_url() . "torrents.php?action=download&id=$ExtraTorrentID";
+	$Announce .= ' - https://' . SITE_DOMAIN . "/torrents.php?id=$GroupID / https://" . SITE_DOMAIN . "/torrents.php?action=download&id=$ExtraTorrentID";
 
-	$AnnounceSSL .= ' - ' . trim($Properties['TagList']);
 	$Announce .= ' - ' . trim($Properties['TagList']);
 
 	// ENT_QUOTES is needed to decode single quotes/apostrophes
-	send_irc('PRIVMSG #' . NONSSL_SITE_URL . '-announce :' . html_entity_decode($Announce, ENT_QUOTES));
-	send_irc('PRIVMSG #' . SSL_SITE_URL . '-announce-ssl :' . html_entity_decode($AnnounceSSL, ENT_QUOTES));
+	send_irc('PRIVMSG ' . BOT_ANNOUNCE_CHAN . ' :' . html_entity_decode($Announce, ENT_QUOTES));
 
 }
 ?>

sections/user/takemoderate.php

@@ -266,17 +266,17 @@ if ($_POST['ResetEmailHistory'] && check_perms('users_edit_reset_keys')) {
 			INSERT INTO users_history_emails
 				(UserID, Email, Time, IP)
 			VALUES
-				('$UserID', '".DBCrypt::encrypt($Username.'@'.SITE_URL)."', '0000-00-00 00:00:00', '".DBCrypt::encrypt('127.0.0.1')."')");
+				('$UserID', '".DBCrypt::encrypt($Username.'@'.SITE_DOMAIN)."', '0000-00-00 00:00:00', '".DBCrypt::encrypt('127.0.0.1')."')");
 	} else {
 		$DB->query("
 			INSERT INTO users_history_emails
 				(UserID, Email, Time, IP)
 			VALUES
-				('$UserID', '".DBCrypt::encrypt($Username.'@'.SITE_URL)."', '0000-00-00 00:00:00', '".$Cur['IP']."')");
+				('$UserID', '".DBCrypt::encrypt($Username.'@'.SITE_DOMAIN)."', '0000-00-00 00:00:00', '".$Cur['IP']."')");
 	}
 	$DB->query("
 		UPDATE users_main
-		SET Email = '".DBCrypt::encrypt($Username.'@'.SITE_URL)."'
+		SET Email = '".DBCrypt::encrypt($Username.'@'.SITE_DOMAIN)."'
 		WHERE ID = '$UserID'");
 	$EditSummary[] = 'Email history cleared';
 }

templates/enable_request_accepted.tpl

@@ -1,6 +1,6 @@
 Your request to re-enable your account has been accepted. Please use the following link to activate your account. This link is valid for 48 hours, and can be clicked only once.
 
-https://{{SITE_URL}}/enable.php?token={{TOKEN}}
+https://{{SITE_DOMAIN}}/enable.php?token={{TOKEN}}
 
 Thank you,
 {{SITE_NAME}} Staff

templates/invite.tpl

@@ -6,7 +6,7 @@ If you had previously had an account at {{SITE_NAME}}, do not use this invite. I
 
 To confirm your invite, click on the following link:
 
-https://{{SITE_URL}}/register.php?invite={{InviteKey}}
+https://{{SITE_DOMAIN}}/register.php?invite={{InviteKey}}
 
 After you register, you will be able to use your account. Please take note that if you do not use this invite in the next 3 days, it will expire. We urge you to read the RULES and the wiki immediately after you join.
 

templates/new_registration.tpl

@@ -2,7 +2,7 @@ This email is to confirm the account you just created at {{SITE_NAME}}
 
 You have 24 hours to click the link below and finish the registration process for the account created with the username: {{Username}}
 
-https://{{SITE_URL}}/register.php?confirm={{TorrentKey}}
+https://{{SITE_DOMAIN}}/register.php?confirm={{TorrentKey}}
 
 Thank you,
 {{SITE_NAME}} Staff

templates/password_reset.tpl

@@ -2,7 +2,7 @@ A password reset process has been started for the username: {{Username}}
 
 To finish this process please click the link below (you have 1 hour)
 
-https://{{SITE_URL}}/login.php?act=recover&key={{ResetKey}}
+https://{{SITE_DOMAIN}}/login.php?act=recover&key={{ResetKey}}
 
 If you did not initiate this password reset then please disregard this email.
 The user who requested the password reset had the IP address {{IP}}.