code cleanup

README.md

@@ -1,6 +1,6 @@
 This is Oppaitime's version of Gazelle
 
-Below is a list of differences between this version of Gazelle and What.cd's. Please note that these lists are far from complete.
+Below are some lists of differences between this version of Gazelle and What.cd's. Please note that these lists are far from complete.
 
 ## Major Changes
 
@@ -36,8 +36,4 @@ 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.
 * Sends headers to tell cloudflare to use HTTP/2 Server Push for most resources.
 * An attempt has been made to support magnet links. This has shown partial success.
-* This codebase is expected to run over https only.
-
-## Bug Fixes
-
-* Count of torrent results is accurate from first page for much larger databases, but could still be improved to scale automatically.
+* This codebase expects to run over https only.

captcha.php

@@ -1 +0,0 @@
-<? require("classes/script_start.php");

classes/config.template

@@ -1,20 +1,21 @@
 <?php
-if (PHP_VERSION_ID < 70000) {
-	die("Gazelle requires PHP 7.0 or later to function properly");
+if (version_compare(PHP_VERSION, '7.0.0', '<')) {
+  die("Gazelle requires PHP 7.0 or later to function properly");
 }
 //date_default_timezone_set('EST');
 
 // Main settings
-define('SITE_NAME', 'Oppaitime'); //The name of your site
+define('SITE_NAME',   'Oppaitime'); //The name of your site
 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
 
 // Tracker urls to be added to torrent files ala bittorrent.org/beps/bep_0012.html
-define('ANNOUNCE_URLS', [['https://tracker.'.SSL_SITE_URL.':34001',
-                   'https://tracker2.'.SSL_SITE_URL.':34001',
-                   'https://tracker3.'.SSL_SITE_URL.':34001',
-                   'https://tracker4.'.SSL_SITE_URL.':34001']] );
+define('ANNOUNCE_URLS', [[
+  'https://tracker.'.SITE_DOMAIN.':34001',
+  'https://tracker2.'.SITE_DOMAIN.':34001',
+  'https://tracker3.'.SITE_DOMAIN.':34001',
+  'https://tracker4.'.SITE_DOMAIN.':34001'
+]]);
 
 // Don't hard code API keys for services
 define('API_KEYS', ['ANIDB' => 'AAAAAAAAAAAAAAAA']);
@@ -23,123 +24,123 @@ define('API_KEYS', ['ANIDB' => 'AAAAAAAAAAAAAAAA']);
 define('STATIC_SERVER', 'static/');
 
 // Keys
-define('ENCKEY', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); //Random key. The key for encryption
+define('ENCKEY',       'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); //Random key. The key for encryption
 define('SCHEDULE_KEY', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); // Random key. This key must be the argument to schedule.php for the schedule to work.
-define('RSS_HASH', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); //Random key. Used for generating unique RSS auth key.
+define('RSS_HASH',     'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); //Random key. Used for generating unique RSS auth key.
 
 // MySQL details
-define('SQLHOST', 'localhost'); //The MySQL host ip/fqdn
+define('SQLHOST',  'localhost'); //The MySQL host ip/fqdn
 define('SQLLOGIN', 'root');//The MySQL login
-define('SQLPASS', 'toor'); //The MySQL password
-define('SQLDB', 'gazelle'); //The MySQL database to use
-define('SQLPORT', 3306); //The MySQL port to connect on
-define('SQLSOCK', '/var/run/mysqld/mysqld.sock');
+define('SQLPASS',  'toor'); //The MySQL password
+define('SQLDB',    'gazelle'); //The MySQL database to use
+define('SQLPORT',  3306); //The MySQL port to connect on
+define('SQLSOCK',  '/var/run/mysqld/mysqld.sock');
 
 // Memcached details
 define('MEMCACHED_SERVERS',
-	[['host' => 'unix:///var/run/memcached.sock', 'port' => 0, 'buckets' => 1]]
+  [['host' => 'unix:///var/run/memcached.sock', 'port' => 0, 'buckets' => 1]]
 );
 
 // Sphinx details
-define('SPHINX_HOST', 'localhost');
-define('SPHINX_PORT', 9312);
-define('SPHINXQL_HOST', '127.0.0.1');
-define('SPHINXQL_PORT', 9306);
-define('SPHINXQL_SOCK', false);
+define('SPHINX_HOST',        'localhost');
+define('SPHINX_PORT',        9312);
+define('SPHINXQL_HOST',      '127.0.0.1');
+define('SPHINXQL_PORT',      9306);
+define('SPHINXQL_SOCK',      false);
 define('SPHINX_MAX_MATCHES', 1000); // Must be <= the server's max_matches variable (default 1000)
-define('SPHINX_INDEX', 'torrents');
+define('SPHINX_INDEX',       'torrents');
 
 // Ocelot details
-define('TRACKER_HOST', '8.8.8.8');
-define('TRACKER_PORT', 34000);
-define('TRACKER_SECRET', 'AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'); // Must be 32 characters and match site_password in Ocelot's config.cpp
+define('TRACKER_HOST',      '8.8.8.8');
+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
 
 // 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
+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
 define('OPEN_REGISTRATION', false); //Set to false to disable open regirstration, true to allow anyone to register
-define('USER_LIMIT', 0); //The maximum number of users the site can have, 0 for no limit
-define('STARTING_INVITES', 0); //# of invites to give to newly registered users
-define('BLOCK_TOR', false); //Set to true to block Tor users
-define('BLOCK_OPERA_MINI', false); //Set to true to block Opera Mini proxy
-define('DONOR_INVITES', 2);
-if (!defined('FEATURE_EMAIL_REENABLE')) {
-  define('FEATURE_EMAIL_REENABLE', true);
-}
+define('USER_LIMIT',        0); //The maximum number of users the site can have, 0 for no limit
+define('STARTING_INVITES',  0); //# of invites to give to newly registered users
+define('BLOCK_TOR',         false); //Set to true to block Tor users
+define('BLOCK_OPERA_MINI',  false); //Set to true to block Opera Mini proxy
+define('DONOR_INVITES',     2);
+
+// Features
+define('FEATURE_EMAIL_REENABLE', true);
 
 // User class IDs needed for automatic promotions. Found in the 'permissions' table
-// Name of class	Class ID (NOT level)
-define('ADMIN',		'1');
-define('USER',		'2');
-define('MEMBER',	'3');
-define('POWER',		'4');
-define('ELITE',		'5');
-define('VIP',		'21');
-define('TORRENT_MASTER','23');
-define('LEGEND',	'8');
-define('MOD',		'11');
-define('SYSOP',		'15');
-define('ARTIST',	'19');
-define('DONOR',		'20');
-define('POWER_TM',	'24');
-define('FLS_TEAM', '9000');
-define('FORUM_MOD', '9001');
+// Name of class  Class ID (NOT level)
+define('ADMIN',          '1');
+define('USER',           '2');
+define('MEMBER',         '3');
+define('POWER',          '4');
+define('ELITE',          '5');
+define('LEGEND',         '8');
+define('MOD',            '11');
+define('SYSOP',          '15');
+define('ARTIST',         '19');
+define('DONOR',          '20');
+define('VIP',            '21');
+define('TORRENT_MASTER', '23');
+define('POWER_TM',       '24');
+define('FLS_TEAM',       '9000');
+define('FORUM_MOD',      '9001');
 
 // Forums
-define('STAFF_FORUM', 7);
-define('DONOR_FORUM', 9);
-define('TRASH_FORUM_ID', 4);
+define('STAFF_FORUM',           7);
+define('DONOR_FORUM',           9);
+define('TRASH_FORUM_ID',        4);
 define('ANNOUNCEMENT_FORUM_ID', 10);
 
 // Pagination
 define('TORRENT_COMMENTS_PER_PAGE', 10);
-define('POSTS_PER_PAGE', 25);
-define('TOPICS_PER_PAGE', 50);
-define('TORRENTS_PER_PAGE', 50);
-define('REQUESTS_PER_PAGE', 25);
-define('MESSAGES_PER_PAGE', 25);
-define('LOG_ENTRIES_PER_PAGE', 50);
+define('POSTS_PER_PAGE',            25);
+define('TOPICS_PER_PAGE',           50);
+define('TORRENTS_PER_PAGE',         50);
+define('REQUESTS_PER_PAGE',         25);
+define('MESSAGES_PER_PAGE',         25);
+define('LOG_ENTRIES_PER_PAGE',      50);
 
 // Cache catalogues
 define('THREAD_CATALOGUE', 500); // Limit to THREAD_CATALOGUE posts per cache key.
 
 // IRC settings
-define('BOT_NICK', 'bot');
-define('BOT_SERVER', 'irc.'.SSL_SITE_URL); // IRC server address. Used for onsite chat tool.
-define('BOT_PORT', 6667);
-define('BOT_CHAN', '#bot');
-define('BOT_ANNOUNCE_CHAN', '#announce');
-define('BOT_REQUEST_CHAN', '#requests');
-define('BOT_STAFF_CHAN', '#staff');
-define('BOT_DISABLED_CHAN', '#disabled'); // Channel to refer disabled users to.
-define('BOT_HELP_CHAN', '#help');
-define('BOT_DEBUG_CHAN', '#debup');
-define('BOT_REPORT_CHAN', '#report');
-define('BOT_NICKSERV_PASS', '');
-define('BOT_INVITE_CHAN', '#invites'); // Channel for non-members seeking an interview
-define('BOT_INTERVIEW_CHAN', '#interview'); // Channel for the interviews
-define('BOT_INTERVIEW_NUM', 5);
-define('BOT_INTERVIEW_STAFF', '#interview-staff'); // Channel for the interviewers
-define('SOCKET_LISTEN_PORT', 51010);
+define('BOT_NICK',              'bot');
+define('BOT_SERVER',            'irc.'.SITE_DOMAIN); // IRC server address. Used for onsite chat tool.
+define('BOT_PORT',              6667);
+define('BOT_CHAN',              '#bot');
+define('BOT_ANNOUNCE_CHAN',     '#announce');
+define('BOT_REQUEST_CHAN',      '#requests');
+define('BOT_STAFF_CHAN',        '#staff');
+define('BOT_DISABLED_CHAN',     '#disabled'); // Channel to refer disabled users to.
+define('BOT_HELP_CHAN',         '#help');
+define('BOT_DEBUG_CHAN',        '#debug');
+define('BOT_REPORT_CHAN',       '#report');
+define('BOT_NICKSERV_PASS',     '');
+define('BOT_INVITE_CHAN',       '#invites'); // Channel for non-members seeking an interview
+define('BOT_INTERVIEW_CHAN',    '#interview'); // Channel for the interviews
+define('BOT_INTERVIEW_NUM',     5);
+define('BOT_INTERVIEW_STAFF',   '#interview-staff'); // Channel for the interviewers
+define('SOCKET_LISTEN_PORT',    51010);
 define('SOCKET_LISTEN_ADDRESS', '8.8.8.8');
-define('ADMIN_CHAN', '#admin');
-define('LAB_CHAN', '#lab');
-define('STATUS_CHAN', '#status');
+define('ADMIN_CHAN',            '#admin');
+define('LAB_CHAN',              '#lab');
+define('STATUS_CHAN',           '#status');
 
 // Miscellaneous values
-define('RANK_ONE_COST', 5);
-define('RANK_TWO_COST', 10);
-define('RANK_THREE_COST', 15);
-define('RANK_FOUR_COST', 20);
-define('RANK_FIVE_COST', 30);
-define('MAX_RANK', 6);
-define('MAX_EXTRA_RANK', 8);
+define('RANK_ONE_COST',    5);
+define('RANK_TWO_COST',    10);
+define('RANK_THREE_COST',  15);
+define('RANK_FOUR_COST',   20);
+define('RANK_FIVE_COST',   30);
+define('MAX_RANK',         6);
+define('MAX_EXTRA_RANK',   8);
 define('DONOR_FORUM_RANK', 6);
 define('MAX_SPECIAL_RANK', 3);
 
-$ForumsRevealVoters = array();
-$ForumsDoublePost = array();
+define('FORUMS_TO_REVEAL_VOTERS,      []);
+define('FORUMS_TO_ALLOW_DOUBLE_POST', []);
 
 $Categories = array('Movies', 'Anime', 'Manga', 'Games', 'Other');
 $GroupedCategories = $Categories;
@@ -164,103 +165,33 @@ $Bitrates = array('192', 'APS (VBR)', 'V2 (VBR)', 'V1 (VBR)', '256', 'APX (VBR)'
 $CollageCats = array(0=>'Personal', 1=>'Theme', 2=>'Staff picks', 3=>'Artists');
 
 $ReleaseTypes = array(1=>'Album', 3=>'Soundtrack', 5=>'EP', 6=>'Anthology', 7=>'Compilation', 9=>'Single', 11=>'Live album', 13=>'Remix', 14=>'Bootleg', 15=>'Interview', 16=>'Mixtape', 21=>'Unknown');
-//$ForumCats = array(1=>'Site', 5=>'Community', 10=>'Help', 8=>'Music', 20=>'Trash'); //No longer needed
-
-$ZIPGroups = array(
-	0 => 'MP3 (VBR) - High Quality',
-	1 => 'MP3 (VBR) - Low Quality',
-	2 => 'MP3 (CBR)',
-	3 => 'FLAC - Lossless',
-	4 => 'Others'
-);
-
-//3D array of attributes, OptionGroup, OptionNumber, Name
-$ZIPOptions = array(
-	'00' => array(0, 0, 'V0'),
-	'01' => array(0, 1, 'APX'),
-	'02' => array(0, 2, '256'),
-	'03' => array(0, 3, 'V1'),
-	'10' => array(1, 0, '224'),
-	'11' => array(1, 1, 'V2'),
-	'12' => array(1, 2, 'APS'),
-	'13' => array(1, 3, '192'),
-	'20' => array(2, 0, '320'),
-	'21' => array(2, 1, '256'),
-	'22' => array(2, 2, '224'),
-	'23' => array(2, 3, '192'),
-	'30' => array(3, 0, 'FLAC / 24bit / Vinyl'),
-	'31' => array(3, 1, 'FLAC / 24bit / DVD'),
-	'32' => array(3, 2, 'FLAC / 24bit / SACD'),
-	'33' => array(3, 3, 'FLAC / Log (100) / Cue'),
-	'34' => array(3, 4, 'FLAC / Log (100)'),
-	'35' => array(3, 5, 'FLAC / Log'),
-	'36' => array(3, 6, 'FLAC'),
-	'40' => array(4, 0, 'DTS'),
-	'41' => array(4, 1, 'Ogg Vorbis'),
-	'42' => array(4, 2, 'AAC - 320'),
-	'43' => array(4, 3, 'AAC - 256'),
-	'44' => array(4, 4, 'AAC - q5.5'),
-	'45' => array(4, 5, 'AAC - q5'),
-	'46' => array(4, 6, 'AAC - 192')
-);
 
 // Ratio requirements, in descending order
-// Columns: Download amount, required ratio, grace period
-$RatioRequirements = array(
-	//array(0, 0, date('Y-m-d H:i:s'))
-	array(200 * 1024 * 1024 * 1024, 0.60, date('Y-m-d H:i:s')),
-	array(160 * 1024 * 1024 * 1024, 0.60, date('Y-m-d H:i:s')),
-	array(120 * 1024 * 1024 * 1024, 0.50, date('Y-m-d H:i:s')),
-	array(100 * 1024 * 1024 * 1024, 0.40, date('Y-m-d H:i:s')),
-	array(80  * 1024 * 1024 * 1024, 0.30, date('Y-m-d H:i:s')),
-	array(60  * 1024 * 1024 * 1024, 0.20, date('Y-m-d H:i:s')),
-	array(40  * 1024 * 1024 * 1024, 0.15, date('Y-m-d H:i:s')),
-	array(20  * 1024 * 1024 * 1024, 0.10, date('Y-m-d H:i:s')),
-	array(10  * 1024 * 1024 * 1024, 0.05, date('Y-m-d H:i:s', time() - (60 * 60 * 24 * 14)))
-);
-
-//Captcha fonts should be located in /classes/fonts
-$CaptchaFonts = array(
-		'ARIBLK.TTF',
-		'IMPACT.TTF',
-		'TREBUC.TTF',
-		'TREBUCBD.TTF',
-		'TREBUCBI.TTF',
-		'TREBUCIT.TTF',
-		'VERDANA.TTF',
-		'VERDANAB.TTF',
-		'VERDANAI.TTF',
-		'VERDANAZ.TTF');
-//Captcha images should be located in /captcha
-$CaptchaBGs = array(
-		'captcha1.png',
-		'captcha2.png',
-		'captcha3.png',
-		'captcha4.png',
-		'captcha5.png',
-		'captcha6.png',
-		'captcha7.png',
-		'captcha8.png',
-		'captcha9.png');
-
-// Special characters, and what they should be converted to
-// Used for torrent searching
-$SpecialChars = array(
-		'&' => 'and'
-);
+// Columns: Download amount, Req Ratio (0% seeded), Req Ratio (100% seeded)
+define('RATIO_REQUIREMENTS', [
+  [200 * 1024**3, 0.60, 0.60],
+  [160 * 1024**3, 0.60, 0.50],
+  [120 * 1024**3, 0.50, 0.40],
+  [100 * 1024**3, 0.40, 0.30],
+  [80  * 1024**3, 0.30, 0.20],
+  [60  * 1024**3, 0.20, 0.10],
+  [40  * 1024**3, 0.15, 0.00],
+  [20  * 1024**3, 0.10, 0.00],
+  [10  * 1024**3, 0.05, 0.00],
+]);
 
 // God I wish I didn't have to do this but I just don't care anymore.
-$AutomatedBadgeIDs = array(
-	'DL' => array(
-		'8' => 10,
-		'16' => 11,
-		'32' => 12,
-		'64' => 13,
-		'128' => 14,
-		'256' => 15,
-		'512' => 16,
-		'1024' => 17,
-		'2048' => 18
-	)
-);
+define('AUTOMATED_BADGE_IDS', [
+  'DL' => [
+    '8' => 10,
+    '16' => 11,
+    '32' => 12,
+    '64' => 13,
+    '128' => 14,
+    '256' => 15,
+    '512' => 16,
+    '1024' => 17,
+    '2048' => 18
+  ]
+]);
 ?>

classes/fonts/README.TXT

@@ -1,107 +0,0 @@
-This document contains the End User Licensing Agreement, and instructions concerning font installation on the various Windows platforms.
-
-
-Microsoft TrueType Fonts
-END-USER LICENSE AGREEMENT FOR MICROSOFT SOFTWARE
----------------------------------------------------
-
-IMPORTANT - READ CAREFULLY: This Microsoft End-User License Agreement ("EULA") is a legal agreement between you (either an individual or a single entity) and Microsoft Corporation for the Microsoft software accompanying this EULA, which includes computer software and may include associated media, printed materials, and "on-line" or electronic documentation ("SOFTWARE PRODUCT" or "SOFTWARE"). By exercising your rights to make and use copies of the SOFTWARE PRODUCT, you agree to be bound by the terms of this EULA. If you do not agree to the terms of this EULA, you may not use the SOFTWARE PRODUCT.
-SOFTWARE PRODUCT LICENSE
-The SOFTWARE PRODUCT is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold.
-1. GRANT OF LICENSE. This EULA grants you the following rights:
-·	Installation and Use. You may install and use an unlimited number of copies of the SOFTWARE PRODUCT.
-·	Reproduction and Distribution. You may reproduce and distribute an unlimited number of copies of the SOFTWARE PRODUCT;  provided that each copy shall be a true and complete copy, including all copyright and trademark notices, and shall be accompanied by a copy of this EULA.  Copies of the SOFTWARE PRODUCT may not be distributed for profit either on a standalone basis or included as part of your own product.
-2.	DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS.
-·	Limitations on Reverse Engineering, Decompilation, and Disassembly. You may not reverse engineer, decompile, or disassemble the SOFTWARE PRODUCT, except and only to the extent that such activity is expressly permitted by applicable law notwithstanding this limitation.
-· Restrictions on Alteration.  You may not rename, edit or create any derivative works from the SOFTWARE PRODUCT, other than subsetting when embedding them in documents.
-·	Software Transfer. You may permanently transfer all of your rights under this EULA, provided the recipient agrees to the terms of this EULA.
-·	Termination. Without prejudice to any other rights, Microsoft may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the SOFTWARE PRODUCT and all of its component parts.
-3. COPYRIGHT. All title and copyrights in and to the SOFTWARE PRODUCT (including but not limited to any images, text, and "applets" incorporated into the SOFTWARE PRODUCT), the accompanying printed materials, and any copies of the SOFTWARE PRODUCT are owned by Microsoft or its suppliers. The SOFTWARE PRODUCT is protected by copyright laws and international treaty provisions. Therefore, you must treat the SOFTWARE PRODUCT like any other copyrighted material.
-4.	U.S. GOVERNMENT RESTRICTED RIGHTS. The SOFTWARE PRODUCT and documentation are provided with RESTRICTED RIGHTS. Use, duplication, or disclosure by the Government is subject to restrictions as set forth in subparagraph (c)(1)(ii) of the Rights in Technical Data and Computer Software clause at DFARS 252.227-7013 or subparagraphs (c)(1) and (2) of the Commercial Computer Software-Restricted Rights at 48 CFR 52.227-19, as applicable. Manufacturer is Microsoft Corporation/One Microsoft Way/Redmond, WA 98052-6399.
-LIMITED WARRANTY
-NO WARRANTIES. Microsoft expressly disclaims any warranty for the SOFTWARE PRODUCT. The SOFTWARE PRODUCT and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or noninfringement. The entire risk arising out of use or performance of the SOFTWARE PRODUCT remains with you.
-NO LIABILITY FOR CONSEQUENTIAL DAMAGES. In no event shall Microsoft or its suppliers be liable for any damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this Microsoft product, even if Microsoft has been advised of the possibility of such damages. Because some states/jurisdictions do not allow the exclusion or limitation of liability for consequential or incidental damages, the above limitation may not apply to you.
-MISCELLANEOUS
-If you acquired this product in the United States, this EULA is governed by the laws of the State of Washington.
-If this product was acquired outside the United States, then local laws may apply.
-Should you have any questions concerning this EULA, or if you desire to contact Microsoft for any reason, please contact the Microsoft subsidiary serving your country, or write: Microsoft Sales Information Center/One Microsoft Way/Redmond, WA  98052-6399.
-
-
-
-
-
-
-INSTALLING FONTS
-________________
-----------------
-
-
-Windows95
----------
-
-To add a new font to your computer:
-
-1) Open the font folder from the Control Panel.
-
-2) On the File menu, click Install New Font.
-
-3) Click the drive and folder that contain the fonts you want to add.
-
-4) Double-click the icon for the font you want to add.
-
-
-Tips
-
-To select more than one font to add, press and hold down the CTRL key, and then click the fonts you want.
-
-To select a range of fonts in the list, press and hold down the SHIFT key while dragging the cursor over the fonts.
-
-To add fonts from a network drive without using disk space on your computer, make sure Copy Fonts To Windows Folder is not checked.
-
-
-
-
-
-Windows 3.1x
-------------
-
-To add fonts to your computer:
-
-1) In the Control Panel window, choose the Fonts icon. The fonts already installed are listed in the Installed Fonts box.
-
-2) Choose the Add button.
-
-3) In the Add Fonts dialog box, select the font you want to add. You can add more than one font at a time. You can also select all the fonts listed by choosing the Select All button. If the font is not located in the current drive or directory, select the drive and directory where it is located. If the font you want to add is on someone else's computer, you can use the Network button to browse through and connect to shared directories on other computers.
-
-4) If you are low on disk space and want to use the fonts directly from the directory (network or local) where they are located, without copying the font files to the Windows directory, clear the Copy Fonts To Windows Directory check box.
-
-5) Choose the OK button.
-
-6) In the Fonts dialog box, choose the Close button.
-
-For help with the Fonts and Add Fonts dialog boxes, choose the Help button or press F1 while using the dialog boxes.
-
-
-
-
-Windows NT
-----------
-
-To add fonts to your computer:
-
-1) In the Control Panel window, choose the Fonts icon. The fonts already installed are listed in the Installed Fonts box.
-
-2) Choose the Add button.
-
-3)In the Add Fonts dialog box, select the font you want to add. If the font is not located in the current drive or directory, select the drive and directory where it is located. You can add more than one font at a time. You can also select all the fonts listed by choosing the Select All button.
-
-4) If you are low on disk space and want to use the fonts directly from the directory (network or local) where they are located, without copying the font files to the \systemroot\SYSTEM directory, clear the Copy Fonts To Windows Directory check box.
-
-5) Choose the OK button.
-
-6) Choose the Close button.
-
-For help with the Fonts and Add Fonts dialog boxes, choose the Help button or press F1 while using the dialog boxes.
-
-
-

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.'(www)?'.preg_quote(SITE_DOMAIN, '/'));
+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/users.class.php

@@ -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_DOMAIN', SITE_DOMAIN); // TODO: Remove
+    $TPL->set('SITE_DOMAIN', SITE_DOMAIN);
 
     Misc::send_email($Email, 'Password reset information for ' . SITE_NAME, $TPL->get(), 'noreply');
   }

design/views/generic/reply/quickreply.php

@@ -35,7 +35,7 @@
 			'SubscribeBox' => true
 		));
  */
-	global $HeavyInfo, $UserSubscriptions, $ThreadInfo, $ForumsDoublePost, $Document;
+	global $HeavyInfo, $UserSubscriptions, $ThreadInfo, $Document;
 
 	if (G::$LoggedUser['DisablePosting']) {
 		return;
@@ -135,7 +135,7 @@
 		}
 		if ($ThreadInfo['LastPostAuthorID'] == G::$LoggedUser['ID']
 			&& (check_perms('site_forums_double_post')
-				|| in_array($ForumID, $ForumsDoublePost))
+				|| in_array($ForumID, FORUMS_TO_ALLOW_DOUBLE_POST))
 		) {
 ?>
 							<input id="mergebox" type="checkbox" name="merge" tabindex="2" />

sections/ajax/forum/thread.php

@@ -182,7 +182,7 @@ if ($ThreadInfo['NoPoll'] == 0) {
 		$MaxVotes = 0;
 	}
 
-	$RevealVoters = in_array($ForumID, $ForumsRevealVoters);
+	$RevealVoters = in_array($ForumID, FORUMS_TO_REVEAL_VOTERS);
 	//Polls lose the you voted arrow thingy
 	$DB->query("
 		SELECT Vote

sections/captcha/index.php

@@ -1,54 +0,0 @@
-<?
-if (!function_exists('imagettftext')) {
-	die('Captcha requires both the GD library and the FreeType library.');
-}
-
-function get_font() {
-	global $CaptchaFonts;
-	return SERVER_ROOT.'/classes/fonts/'.$CaptchaFonts[mt_rand(0, count($CaptchaFonts) - 1)];
-}
-
-function make_captcha_img() {
-	global $CaptchaBGs;
-
-	$Length = 6;
-	$ImageHeight = 75;
-	$ImageWidth = 300;
-
-	$Chars = 'abcdefghjkmprstuvwxyzABCDEFGHJKLMPQRSTUVWXY23456789';
-	$CaptchaString = '';
-
-	for ($i = 0; $i < $Length; $i++) {
-		$CaptchaString .= $Chars[mt_rand(0,strlen($Chars) - 1)];
-	}
-
-	for ($x = 0; $x < $Length; $x++) {
-		$FontDisplay[$x]['size'] = mt_rand(24, 32);
-		$FontDisplay[$x]['top'] = mt_rand($FontDisplay[$x]['size'] + 5, $ImageHeight - ($FontDisplay[$x]['size'] / 2));
-		$FontDisplay[$x]['angle'] = mt_rand(-30, 30);
-		$FontDisplay[$x]['font'] = get_font();
-	}
-
-	$Img = imagecreatetruecolor($ImageWidth, $ImageHeight);
-	$BGImg = imagecreatefrompng(SERVER_ROOT.'/captcha/'.$CaptchaBGs[mt_rand(0, count($CaptchaBGs) - 1)]);
-	imagecopymerge($Img, $BGImg, 0, 0, 0, 0, 300, 75, 50);
-
-	$ForeColor = imagecolorallocatealpha($Img, 255, 255, 255, 65);
-
-	for ($i = 0; $i < strlen($CaptchaString); $i++) {
-		$CharX = (($ImageWidth / $Length) * ($i + 1)) - (($ImageWidth / $Length) * 0.75);
-		imagettftext($Img,$FontDisplay[$i]['size'], $FontDisplay[$i]['angle'], $CharX,
-						$FontDisplay[$i]['top'], $ForeColor,
-						$FontDisplay[$i]['font'], $CaptchaString[$i]
-					);
-	}
-
-	header('Content-type: image/png');
-	imagepng($Img);
-	imagedestroy($Img);
-
-	return $CaptchaString;
-}
-
-$_SESSION['captcha'] = make_captcha_img();
-?>

sections/collages/torrent_collage.php

@@ -334,7 +334,8 @@ View::show_header($Name, 'browse,collage,bbcode,voting,recommend,wall');
 			<div class="pad"><?=Text::full_format($Description)?></div>
 		</div>
 <?
-if (false) { // I'm effectively commenting this out until we maybe fix the collector at some point in the future - Azathoth
+// I'm actually commenting this out
+/*
 if (check_perms('zip_downloader')) {
 	if (isset($LoggedUser['Collector'])) {
 		list($ZIPList, $ZIPPrefs) = $LoggedUser['Collector'];
@@ -396,8 +397,9 @@ foreach ($ZIPOptions as $Option) {
 				</form>
 			</div>
 		</div>
-<? } 
-	}?>
+<? }
+*/
+?>
 		<div class="box box_info box_statistics_collage_torrents">
 			<div class="head"><strong>Statistics</strong></div>
 			<ul class="stats nobullet">

sections/forums/add_poll_option.php

@@ -13,7 +13,7 @@ if (!check_perms('site_moderate_forums')) {
 		FROM forums_topics
 		WHERE ID = $ThreadID");
 	list($ForumID) = $DB->next_record();
-	if (!in_array($ForumID, $ForumsRevealVoters)) {
+	if (!in_array($ForumID, FORUMS_TO_REVEAL_VOTERS)) {
 		error(403);
 	}
 }

sections/forums/change_vote.php

@@ -10,7 +10,7 @@ if (is_number($ThreadID) && is_number($NewVote)) {
 			FROM forums_topics
 			WHERE ID = $ThreadID");
 		list($ForumID) = $DB->next_record();
-		if (!in_array($ForumID, $ForumsRevealVoters)) {
+		if (!in_array($ForumID, FORUMS_TO_REVEAL_VOTERS)) {
 			error(403);
 		}
 	}

sections/forums/delete_poll_option.php

@@ -13,7 +13,7 @@ if (is_number($ThreadID) && is_number($PollOption)) {
 		FROM forums_topics
 		WHERE ID = $ThreadID");
 	list($ForumID) = $DB->next_record();
-	if (!in_array($ForumID, $ForumsRevealVoters)) {
+	if (!in_array($ForumID, FORUMS_TO_REVEAL_VOTERS)) {
 		error(403);
 	}
 

sections/forums/take_reply.php

@@ -66,7 +66,7 @@ if (isset($_POST['subscribe']) && Subscriptions::has_subscribed($TopicID) === fa
 }
 
 //Now lets handle the special case of merging posts, we can skip bumping the thread and all that fun
-if ($ThreadInfo['LastPostAuthorID'] == $LoggedUser['ID'] && ((!check_perms('site_forums_double_post') && !in_array($ForumID, $ForumsDoublePost)) || isset($_POST['merge']))) {
+if ($ThreadInfo['LastPostAuthorID'] == $LoggedUser['ID'] && ((!check_perms('site_forums_double_post') && !in_array($ForumID, FORUMS_TO_ALLOW_DOUBLE_POST)) || isset($_POST['merge']))) {
 	//Get the id for this post in the database to append
 	$DB->query("
 		SELECT ID, Body

sections/forums/thread.php

@@ -249,7 +249,7 @@ if ($ThreadInfo['NoPoll'] == 0) {
 		$MaxVotes = 0;
 	}
 
-	$RevealVoters = in_array($ForumID, $ForumsRevealVoters);
+	$RevealVoters = in_array($ForumID, FORUMS_TO_REVEAL_VOTERS);
 	//Polls lose the you voted arrow thingy
 	$DB->query("
 		SELECT Vote

sections/log/index.php

@@ -1,211 +1,208 @@
 <?
 enforce_login();
 if (!defined('LOG_ENTRIES_PER_PAGE')) {
-	define('LOG_ENTRIES_PER_PAGE', 100);
+  define('LOG_ENTRIES_PER_PAGE', 100);
 }
 View::show_header("Site log");
 
 include(SERVER_ROOT.'/sections/log/sphinx.php');
 ?>
 <div class="thin">
-	<div class="header">
-		<h2>Site log</h2>
-	</div>
-	<div class="box pad">
-		<form class="search_form" name="log" action="" method="get">
-			<table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
-				<tr>
-					<td class="label"><strong>Search for:</strong></td>
-					<td>
-						<input type="search" name="search" size="60"<?=(!empty($_GET['search']) ? ' value="'.display_str($_GET['search']).'"' : '')?> />
-						&nbsp;
-						<input type="submit" value="Search log" />
-					</td>
-				</tr>
-			</table>
-		</form>
-	</div>
+  <div class="header">
+    <h2>Site log</h2>
+  </div>
+  <div class="box pad">
+    <form class="search_form" name="log" action="" method="get">
+      <table cellpadding="6" cellspacing="1" border="0" class="layout" width="100%">
+        <tr>
+          <td class="label"><strong>Search for:</strong></td>
+          <td>
+            <input type="search" name="search" size="60"<?=(!empty($_GET['search']) ? ' value="'.display_str($_GET['search']).'"' : '')?> />
+            &nbsp;
+            <input type="submit" value="Search log" />
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
 
-<?	if ($TotalMatches > LOG_ENTRIES_PER_PAGE) { ?>
-	<div class="linkbox">
+<?  if ($TotalMatches > LOG_ENTRIES_PER_PAGE) { ?>
+  <div class="linkbox">
 <?
-	$Pages = Format::get_pages($Page, $TotalMatches, LOG_ENTRIES_PER_PAGE, 9);
-	echo $Pages;?>
-	</div>
-<?	} ?>
-	<div class="box">
-	<table cellpadding="6" cellspacing="1" border="0" class="log_table" id="log_table" width="100%">
-		<tr class="colhead">
-			<td style="width: 180px;"><strong>Time</strong></td>
-			<td><strong>Message</strong></td>
-		</tr>
-<?	if ($QueryStatus) { ?>
-	<tr class="nobr"><td colspan="2">Search request failed (<?=$QueryError?>).</td></tr>
-<?	} elseif (!$DB->has_results()) { ?>
-	<tr class="nobr"><td colspan="2">Nothing found!</td></tr>
+  $Pages = Format::get_pages($Page, $TotalMatches, LOG_ENTRIES_PER_PAGE, 9);
+  echo $Pages;?>
+  </div>
+<?  } ?>
+  <div class="box">
+  <table cellpadding="6" cellspacing="1" border="0" class="log_table" id="log_table" width="100%">
+    <tr class="colhead">
+      <td style="width: 180px;"><strong>Time</strong></td>
+      <td><strong>Message</strong></td>
+    </tr>
+<?  if ($QueryStatus) { ?>
+  <tr class="nobr"><td colspan="2">Search request failed (<?=$QueryError?>).</td></tr>
+<?  } elseif (!$DB->has_results()) { ?>
+  <tr class="nobr"><td colspan="2">Nothing found!</td></tr>
 <?
-	}
+  }
 $Usernames = array();
 while (list($ID, $Message, $LogTime) = $DB->next_record()) {
-	$MessageParts = explode(' ', $Message);
-	$Message = '';
-	$Color = $Colon = false;
-	for ($i = 0, $PartCount = sizeof($MessageParts); $i < $PartCount; $i++) {
-		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>';
-		}
-		switch ($MessageParts[$i]) {
-			case 'Torrent':
-			case 'torrent':
-				$TorrentID = $MessageParts[$i + 1];
-				if (is_numeric($TorrentID)) {
-					$Message = $Message.' '.$MessageParts[$i]." <a href=\"torrents.php?torrentid=$TorrentID\">$TorrentID</a>";
-					$i++;
-				} else {
-					$Message = $Message.' '.$MessageParts[$i];
-				}
-				break;
-			case 'Request':
-				$RequestID = $MessageParts[$i + 1];
-				if (is_numeric($RequestID)) {
-					$Message = $Message.' '.$MessageParts[$i]." <a href=\"requests.php?action=view&amp;id=$RequestID\">$RequestID</a>";
-					$i++;
-				} else {
-					$Message = $Message.' '.$MessageParts[$i];
-				}
-				break;
-			case 'Artist':
-			case 'artist':
-				$ArtistID = $MessageParts[$i + 1];
-				if (is_numeric($ArtistID)) {
-					$Message = $Message.' '.$MessageParts[$i]." <a href=\"artist.php?id=$ArtistID\">$ArtistID</a>";
-					$i++;
-				} else {
-					$Message = $Message.' '.$MessageParts[$i];
-				}
-				break;
-			case 'group':
-			case 'Group':
-				$GroupID = $MessageParts[$i + 1];
-				if (is_numeric($GroupID)) {
-					$Message = $Message.' '.$MessageParts[$i]." <a href=\"torrents.php?id=$GroupID\">$GroupID</a>";
-				} else {
-					$Message = $Message.' '.$MessageParts[$i];
-				}
-				$i++;
-				break;
-			case 'by':
-				$UserID = 0;
-				$User = '';
-				$URL = '';
-				if ($MessageParts[$i + 1] == 'user') {
-					$i++;
-					if (is_numeric($MessageParts[$i + 1])) {
-						$UserID = $MessageParts[++$i];
-					}
-					$URL = "user $UserID (<a href=\"user.php?id=$UserID\">".substr($MessageParts[++$i], 1, -1).'</a>)';
-				} elseif (in_array($MessageParts[$i - 1], array('deleted', 'uploaded', 'edited', 'created', 'recovered'))) {
-					$User = $MessageParts[++$i];
-					if (substr($User, -1) == ':') {
-						$User = substr($User, 0, -1);
-						$Colon = true;
-					}
-					if (!isset($Usernames[$User])) {
-						$DB->query("
-							SELECT ID
-							FROM users_main
-							WHERE Username = _utf8 '" . db_string($User) . "'
-							COLLATE utf8_bin");
-						list($UserID) = $DB->next_record();
-						$Usernames[$User] = $UserID ? $UserID : '';
-					} else {
-						$UserID = $Usernames[$User];
-					}
-					$DB->set_query_id($Log);
-					$URL = $Usernames[$User] ? "<a href=\"user.php?id=$UserID\">$User</a>".($Colon ? ':' : '') : $User;
-				}
-				$Message = "$Message by $URL";
-				break;
-			case 'uploaded':
-				if ($Color === false) {
-					$Color = 'green';
-				}
-				$Message = $Message.' '.$MessageParts[$i];
-				break;
-			case 'deleted':
-				if ($Color === false || $Color === 'green') {
-					$Color = 'red';
-				}
-				$Message = $Message.' '.$MessageParts[$i];
-				break;
-			case 'edited':
-				if ($Color === false) {
-					$Color = 'blue';
-				}
-				$Message = $Message.' '.$MessageParts[$i];
-				break;
-			case 'un-filled':
-				if ($Color === false) {
-					$Color = '';
-				}
-				$Message = $Message.' '.$MessageParts[$i];
-				break;
-			case 'marked':
-				if ($i == 1) {
-					$User = $MessageParts[$i - 1];
-					if (!isset($Usernames[$User])) {
-						$DB->query("
-							SELECT ID
-							FROM users_main
-							WHERE Username = _utf8 '" . db_string($User) . "'
-							COLLATE utf8_bin");
-						list($UserID) = $DB->next_record();
-						$Usernames[$User] = $UserID ? $UserID : '';
-						$DB->set_query_id($Log);
-					} else {
-						$UserID = $Usernames[$User];
-					}
-					$URL = $Usernames[$User] ? "<a href=\"user.php?id=$UserID\">$User</a>" : $User;
-					$Message = $URL." ".$MessageParts[$i];
-				} else {
-					$Message = $Message.' '.$MessageParts[$i];
-				}
-				break;
-			case 'Collage':
-				$CollageID = $MessageParts[$i + 1];
-				if (is_numeric($CollageID)) {
-					$Message = $Message.' '.$MessageParts[$i]." <a href=\"collages.php?id=$CollageID\">$CollageID</a>";
-					$i++;
-				} else {
-					$Message = $Message.' '.$MessageParts[$i];
-				}
-				break;
-			default:
-				$Message = $Message.' '.$MessageParts[$i];
-		}
-	}
+  $MessageParts = explode(' ', $Message);
+  $Message = '';
+  $Color = $Colon = false;
+  for ($i = 0, $PartCount = sizeof($MessageParts); $i < $PartCount; $i++) {
+    if (strpos($MessageParts[$i], 'https://'.SITE_DOMAIN) === 0) {
+      $Offset = strlen('https://'.SITE_DOMAIN.'/');
+      $MessageParts[$i] = '<a href="'.substr($MessageParts[$i], $Offset).'">'.substr($MessageParts[$i], $Offset).'</a>';
+    }
+    switch ($MessageParts[$i]) {
+      case 'Torrent':
+      case 'torrent':
+        $TorrentID = $MessageParts[$i + 1];
+        if (is_numeric($TorrentID)) {
+          $Message = $Message.' '.$MessageParts[$i]." <a href=\"torrents.php?torrentid=$TorrentID\">$TorrentID</a>";
+          $i++;
+        } else {
+          $Message = $Message.' '.$MessageParts[$i];
+        }
+        break;
+      case 'Request':
+        $RequestID = $MessageParts[$i + 1];
+        if (is_numeric($RequestID)) {
+          $Message = $Message.' '.$MessageParts[$i]." <a href=\"requests.php?action=view&amp;id=$RequestID\">$RequestID</a>";
+          $i++;
+        } else {
+          $Message = $Message.' '.$MessageParts[$i];
+        }
+        break;
+      case 'Artist':
+      case 'artist':
+        $ArtistID = $MessageParts[$i + 1];
+        if (is_numeric($ArtistID)) {
+          $Message = $Message.' '.$MessageParts[$i]." <a href=\"artist.php?id=$ArtistID\">$ArtistID</a>";
+          $i++;
+        } else {
+          $Message = $Message.' '.$MessageParts[$i];
+        }
+        break;
+      case 'group':
+      case 'Group':
+        $GroupID = $MessageParts[$i + 1];
+        if (is_numeric($GroupID)) {
+          $Message = $Message.' '.$MessageParts[$i]." <a href=\"torrents.php?id=$GroupID\">$GroupID</a>";
+        } else {
+          $Message = $Message.' '.$MessageParts[$i];
+        }
+        $i++;
+        break;
+      case 'by':
+        $UserID = 0;
+        $User = '';
+        $URL = '';
+        if ($MessageParts[$i + 1] == 'user') {
+          $i++;
+          if (is_numeric($MessageParts[$i + 1])) {
+            $UserID = $MessageParts[++$i];
+          }
+          $URL = "user $UserID (<a href=\"user.php?id=$UserID\">".substr($MessageParts[++$i], 1, -1).'</a>)';
+        } elseif (in_array($MessageParts[$i - 1], array('deleted', 'uploaded', 'edited', 'created', 'recovered'))) {
+          $User = $MessageParts[++$i];
+          if (substr($User, -1) == ':') {
+            $User = substr($User, 0, -1);
+            $Colon = true;
+          }
+          if (!isset($Usernames[$User])) {
+            $DB->query("
+              SELECT ID
+              FROM users_main
+              WHERE Username = _utf8 '" . db_string($User) . "'
+              COLLATE utf8_bin");
+            list($UserID) = $DB->next_record();
+            $Usernames[$User] = $UserID ? $UserID : '';
+          } else {
+            $UserID = $Usernames[$User];
+          }
+          $DB->set_query_id($Log);
+          $URL = $Usernames[$User] ? "<a href=\"user.php?id=$UserID\">$User</a>".($Colon ? ':' : '') : $User;
+        }
+        $Message = "$Message by $URL";
+        break;
+      case 'uploaded':
+        if ($Color === false) {
+          $Color = 'green';
+        }
+        $Message = $Message.' '.$MessageParts[$i];
+        break;
+      case 'deleted':
+        if ($Color === false || $Color === 'green') {
+          $Color = 'red';
+        }
+        $Message = $Message.' '.$MessageParts[$i];
+        break;
+      case 'edited':
+        if ($Color === false) {
+          $Color = 'blue';
+        }
+        $Message = $Message.' '.$MessageParts[$i];
+        break;
+      case 'un-filled':
+        if ($Color === false) {
+          $Color = '';
+        }
+        $Message = $Message.' '.$MessageParts[$i];
+        break;
+      case 'marked':
+        if ($i == 1) {
+          $User = $MessageParts[$i - 1];
+          if (!isset($Usernames[$User])) {
+            $DB->query("
+              SELECT ID
+              FROM users_main
+              WHERE Username = _utf8 '" . db_string($User) . "'
+              COLLATE utf8_bin");
+            list($UserID) = $DB->next_record();
+            $Usernames[$User] = $UserID ? $UserID : '';
+            $DB->set_query_id($Log);
+          } else {
+            $UserID = $Usernames[$User];
+          }
+          $URL = $Usernames[$User] ? "<a href=\"user.php?id=$UserID\">$User</a>" : $User;
+          $Message = $URL." ".$MessageParts[$i];
+        } else {
+          $Message = $Message.' '.$MessageParts[$i];
+        }
+        break;
+      case 'Collage':
+        $CollageID = $MessageParts[$i + 1];
+        if (is_numeric($CollageID)) {
+          $Message = $Message.' '.$MessageParts[$i]." <a href=\"collages.php?id=$CollageID\">$CollageID</a>";
+          $i++;
+        } else {
+          $Message = $Message.' '.$MessageParts[$i];
+        }
+        break;
+      default:
+        $Message = $Message.' '.$MessageParts[$i];
+    }
+  }
 ?>
-		<tr class="row" id="log_<?=$ID?>">
-			<td class="nobr">
-				<?=time_diff($LogTime)?>
-			</td>
-			<td>
-				<span<? if ($Color) { ?> style="color: <?=$Color?>;"<? } ?>><?=$Message?></span>
-			</td>
-		</tr>
+    <tr class="row" id="log_<?=$ID?>">
+      <td class="nobr">
+        <?=time_diff($LogTime)?>
+      </td>
+      <td>
+        <span<? if ($Color) { ?> style="color: <?=$Color?>;"<? } ?>><?=$Message?></span>
+      </td>
+    </tr>
 <?
 }
 ?>
-	</table>
-	</div>
+  </table>
+  </div>
 <? if (isset($Pages)) { ?>
-	<div class="linkbox">
-		<?=$Pages?>
-	</div>
+  <div class="linkbox">
+    <?=$Pages?>
+  </div>
 <? } ?>
 </div>
 <?

sections/schedule/daily/ratio_reqs.php

@@ -62,54 +62,27 @@ $DB->query("
   SET um.RequiredRatioWork = (1 - (t.SeedingAvg / s.NumSnatches))
   WHERE s.NumSnatches > 0");
 
-// Lower Limit, Req Ratio (0% seeded), Req Ratio (100% seeded)
-$RatioRequirements = array(
-  array(160 * 1024 * 1024 * 1024, 0.60, 0.50),
-  array(120 * 1024 * 1024 * 1024, 0.60, 0.40),
-  array(100 * 1024 * 1024 * 1024, 0.60, 0.30),
-  array(80  * 1024 * 1024 * 1024, 0.50, 0.20),
-  array(60  * 1024 * 1024 * 1024, 0.40, 0.10),
-  array(40  * 1024 * 1024 * 1024, 0.30, 0.00),
-  array(20  * 1024 * 1024 * 1024, 0.20, 0.00),
-  array(10  * 1024 * 1024 * 1024, 0.15, 0.00)
-);
-
-$DownloadBarrier = 200 * 1024 * 1024 * 1024;
-$DB->query("
-  UPDATE users_main
-  SET RequiredRatio = 0.60
-  WHERE Downloaded > $DownloadBarrier");
 
+// TODO: change from PHP_INT_MAX to INF when we get prepared statements working (because apparently that works)
+$DownloadBarrier = PHP_INT_MAX;
 
-foreach ($RatioRequirements as $Requirement) {
+foreach (RATIO_REQUIREMENTS as $Requirement) {
   list($Download, $Ratio, $MinRatio) = $Requirement;
 
   $DB->query("
     UPDATE users_main
     SET RequiredRatio = RequiredRatioWork * $Ratio
-    WHERE Downloaded >= '$Download'
-      AND Downloaded < '$DownloadBarrier'");
+    WHERE Downloaded >= $Download
+      AND Downloaded < $DownloadBarrier");
 
   $DB->query("
     UPDATE users_main
     SET RequiredRatio = $MinRatio
-    WHERE Downloaded >= '$Download'
-      AND Downloaded < '$DownloadBarrier'
+    WHERE Downloaded >= $Download
+      AND Downloaded < $DownloadBarrier
       AND RequiredRatio < $MinRatio");
 
-  /*$DB->query("
-    UPDATE users_main
-    SET RequiredRatio = $Ratio
-    WHERE Downloaded >= '$Download'
-      AND Downloaded < '$DownloadBarrier'
-      AND can_leech = '0'
-      AND Enabled = '1'");
-  */
   $DownloadBarrier = $Download;
 }
 
-$DB->query("
-  UPDATE users_main
-  SET RequiredRatio = 0.00
-  WHERE Downloaded < 5 * 1024 * 1024 * 1024");
 ?>

sections/schedule/hourly/badges.php

@@ -1,7 +1,6 @@
 <?
 //----------- Award Automated Badges -----------------------//
 
-global $AutomatedBadgeIDs;
 $GiB = 1024*1024*1024;
 $ModifiedIDs = array();
 // Download Badges
@@ -10,14 +9,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(8*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['8'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['8'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['8'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['8'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 8GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -28,14 +27,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(16*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['16'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['16'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['16'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['16'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 16GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -46,14 +45,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(32*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['32'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['32'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['32'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['32'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 32GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -64,14 +63,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(64*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['64'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['64'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['64'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['64'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 64GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -82,14 +81,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(128*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['128'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['128'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['128'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['128'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 128GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -100,14 +99,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(256*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['256'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['256'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['256'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['256'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 256GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -118,14 +117,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(512*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['512'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['512'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['512'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['512'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 512GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -136,14 +135,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(1024*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['1024'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['1024'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['1024'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['1024'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 1024GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);
@@ -154,14 +153,14 @@ $DB->query("
   SELECT ID
   FROM users_main
   WHERE Downloaded >= ".(2048*$GiB)."
-    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".$AutomatedBadgeIDs['DL']['2048'].")");
+    AND ID NOT IN (SELECT UserID FROM users_badges WHERE BadgeID = ".AUTOMATED_BADGE_IDS['DL']['2048'].")");
 
 if ($DB->has_results()) {
   $IDs = $DB->collect('ID');
   foreach ($IDs as $ID) {
     $DB->query("
       INSERT INTO users_badges
-      VALUES (".$ID.", ".$AutomatedBadgeIDs['DL']['2048'].", 0)");
+      VALUES (".$ID.", ".AUTOMATED_BADGE_IDS['DL']['2048'].", 0)");
     Misc::send_pm($ID, 0, 'You have received a badge!', "You have received a badge for downloading 2048GiB of data.\n\nIt can be enabled from your user settings.");
   }
   $ModifiedIDs = array_merge($ModifiedIDs, $IDs);

sections/tools/development/update_geoip.php

@@ -50,62 +50,3 @@ if (count($Values) > 0) {
 }
 
 View::show_footer();
-
-/*
-	The following way works perfectly fine, we just foung the APNIC data to be to outdated for us.
-*/
-
-/*
-if (!check_perms('admin_update_geoip')) {
-	die();
-}
-enforce_login();
-
-ini_set('memory_limit', 1024 * 1024 * 1024);
-ini_set('max_execution_time', 3600);
-
-header('Content-type: text/plain');
-ob_end_clean();
-restore_error_handler();
-
-$Registries[] = 'http://ftp.apnic.net/stats/afrinic/delegated-afrinic-latest'; //Africa
-$Registries[] = 'http://ftp.apnic.net/stats/apnic/delegated-apnic-latest'; //Asia & Pacific
-$Registries[] = 'http://ftp.apnic.net/stats/arin/delegated-arin-latest'; //North America
-$Registries[] = 'http://ftp.apnic.net/stats/lacnic/delegated-lacnic-latest'; //South America
-$Registries[] = 'http://ftp.apnic.net/stats/ripe-ncc/delegated-ripencc-latest'; //Europe
-
-$Registries[] = 'ftp://ftp.afrinic.net/pub/stats/afrinic/delegated-afrinic-latest'; //Africa
-$Registries[] = 'ftp://ftp.apnic.net/pub/stats/apnic/delegated-apnic-latest'; //Asia & Pacific
-$Registries[] = 'ftp://ftp.arin.net/pub/stats/arin/delegated-arin-latest'; //North America
-$Registries[] = 'ftp://ftp.lacnic.net/pub/stats/lacnic/delegated-lacnic-latest'; //South America
-$Registries[] = 'ftp://ftp.ripe.net/ripe/stats/delegated-ripencc-latest'; //Europe
-
-
-
-$Query = array();
-
-foreach ($Registries as $Registry) {
-	$CountryData = explode("\n",file_get_contents($Registry));
-	foreach ($CountryData as $Country) {
-		if (preg_match('/\|([A-Z]{2})\|ipv4\|(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\|(\d+)\|/', $Country, $Matches)) {
-
-			$Start = Tools::ip_to_unsigned($Matches[2]);
-			if ($Start == 2147483647) { continue; }
-
-			if (!isset($Current)) {
-				$Current = array('StartIP' => $Start, 'EndIP' => $Start + $Matches[3],'Code' => $Matches[1]);
-			} elseif ($Current['Code'] == $Matches[1] && $Current['EndIP'] == $Start) {
-				$Current['EndIP'] = $Current['EndIP'] + $Matches[3];
-			} else {
-				$Query[] = "('".$Current['StartIP']."','".$Current['EndIP']."','".$Current['Code']."')";
-				$Current = array('StartIP' => $Start, 'EndIP' => $Start + $Matches[3],'Code' => $Matches[1]);
-			}
-		}
-	}
-}
-$Query[] = "('".$Current['StartIP']."','".$Current['EndIP']."','".$Current['Code']."')";
-
-$DB->query("TRUNCATE TABLE geoip_country");
-$DB->query("INSERT INTO geoip_country (StartIP, EndIP, Code) VALUES ".implode(',', $Query));
-echo $DB->affected_rows();
-*/