Empty commit

This commit is contained in:
Git 2013-06-25 08:00:52 +00:00
parent 14e0880c47
commit 68d25e0fbe
12 changed files with 100 additions and 95 deletions

View File

@ -242,7 +242,7 @@ public function row ($Sort, $GroupID, $GroupYear, $DisplayName, $TorrentLink, $D
* @param string $VanityHouse
* @return string $DisplayName
*/
static public function display_name (array &$ExtendedArtists, array &$Artists, $VanityHouse) {
public static function display_name (array &$ExtendedArtists, array &$Artists, $VanityHouse) {
$DisplayName = '';
if (!empty($ExtendedArtists[1]) || !empty($ExtendedArtists[4])
|| !empty($ExtendedArtists[5]) || !empty($ExtendedArtists[6])) {

View File

@ -8,19 +8,19 @@ class TEXTAREA_PREVIEW_SUPER {
* @static
* @var int $Textareas Total number of textareas created
*/
static protected $Textareas = 0;
protected static $Textareas = 0;
/**
* @static
* @var array $_ID Array of textarea IDs
*/
static protected $_ID = array();
protected static $_ID = array();
/**
* @static
* @var bool For use in JavaScript method
*/
static private $Exectuted = false;
private static $Exectuted = false;
/**
* This method should only run once with $all as true and should be placed
@ -36,7 +36,7 @@ class TEXTAREA_PREVIEW_SUPER {
* @example <pre><?php TEXT_PREVIEW::JavaScript(); ?></pre>
* @return void
*/
static public function JavaScript ($all = true) {
public static function JavaScript ($all = true) {
if (self::$Textareas === 0) {
return;
}
@ -56,7 +56,7 @@ static public function JavaScript ($all = true) {
* @static
* @return void
*/
static private function iterator () {
private static function iterator () {
$script = array();
for ($i = 0; $i < self::$Textareas; $i++) {
if (isset(self::$_ID[$i]) && is_string(self::$_ID[$i])) {

View File

@ -398,7 +398,7 @@ function show() {
<td class="label">Scene:</td>
<td>
<input type="checkbox" id="scene" name="scene" <? if ($Torrent['Scene']) { echo 'checked="checked" ';} ?>/>
<label for="scene">Check this only if this is a "scene release".<br />If you ripped it yourself, it is <strong>not</strong> a scene release. If you are not sure, <strong class="important_text">do not</strong> check it; you will be penalized. For information on the scene, visit <a href="https://en.wikipedia.org/wiki/Warez_scene" target="_blank">Wikipedia</a>.</label>
<label for="scene">Select this only if this is a "scene release".<br />If you ripped it yourself, it is <strong>not</strong> a scene release. If you are not sure, <strong class="important_text">do not</strong> select it; you will be penalized. For information on the scene, visit <a href="https://en.wikipedia.org/wiki/Warez_scene" target="_blank">Wikipedia</a>.</label>
</td>
</tr>
<tr>

View File

@ -1,6 +1,6 @@
<?
class UserAgent {
static private $Browsers = array(
private static $Browsers = array(
//Less popular
'Shiira' => 'Shiira',
'Songbird' => 'Songbird',
@ -43,7 +43,7 @@ class UserAgent {
*/
);
static private $OperatingSystems = array(
private static $OperatingSystems = array(
//Mobile
'SymbianOS' => 'Symbian',
'blackberry' => 'BlackBerry',
@ -114,7 +114,7 @@ public static function operating_system(&$UserAgentString) {
if (empty($UserAgentString)) {
return 'Hidden';
}
foreach ($OperatingSystems as $String => $OperatingSystem) {
foreach (self::$OperatingSystems as $String => $OperatingSystem) {
if (stripos($UserAgentString, $String) !== false) {
return $OperatingSystem;
}
@ -139,7 +139,7 @@ public static function browser(&$UserAgentString) {
return 'Hidden';
}
$Return = 'Unknown';
foreach ($Browsers as $String => $Browser) {
foreach (self::$Browsers as $String => $Browser) {
if (strpos($UserAgentString, $String) !== false) {
$Return = $Browser;
break;

View File

@ -11,19 +11,19 @@
$Results = array();
if (check_paranoia_here('snatched')) {
$DB->query("
SELECT
g.ID,
g.Name,
g.WikiImage
FROM xbt_snatched AS s
SELECT
g.ID,
g.Name,
g.WikiImage
FROM xbt_snatched AS s
INNER JOIN torrents AS t ON t.ID = s.fid
INNER JOIN torrents_group AS g ON t.GroupID = g.ID
WHERE s.uid = '$UserID'
WHERE s.uid = '$UserID'
AND g.CategoryID = '1'
AND g.WikiImage != ''
GROUP BY g.ID
ORDER BY s.tstamp DESC
LIMIT $Limit");
GROUP BY g.ID
ORDER BY s.tstamp DESC
LIMIT $Limit");
$RecentSnatches = $DB->to_array(false, MYSQLI_ASSOC);
$Artists = Artists::get_artists($DB->collect('ID'));
foreach ($RecentSnatches as $Key => $SnatchInfo) {
@ -38,18 +38,18 @@
if (check_paranoia_here('uploads')) {
$DB->query("
SELECT
g.ID,
g.Name,
g.WikiImage
FROM torrents_group AS g
SELECT
g.ID,
g.Name,
g.WikiImage
FROM torrents_group AS g
INNER JOIN torrents AS t ON t.GroupID = g.ID
WHERE t.UserID = '$UserID'
WHERE t.UserID = '$UserID'
AND g.CategoryID = '1'
AND g.WikiImage != ''
GROUP BY g.ID
ORDER BY t.Time DESC
LIMIT $Limit");
GROUP BY g.ID
ORDER BY t.Time DESC
LIMIT $Limit");
$RecentUploads = $DB->to_array(false, MYSQLI_ASSOC);
$Artists = Artists::get_artists($DB->collect('ID'));
foreach ($RecentUploads as $Key => $UploadInfo) {
@ -71,4 +71,4 @@ function check_paranoia_here($Setting) {
} else {
return check_paranoia($Setting, $Paranoia, $Class, $UserID);
}
}
}

View File

@ -26,28 +26,29 @@
</form>
</div>
<? if ($TotalMatches > LOG_ENTRIES_PER_PAGE) { ?>
<? if ($TotalMatches > LOG_ENTRIES_PER_PAGE) { ?>
<div class="linkbox">
<?
$Pages = Format::get_pages($Page, $TotalMatches, LOG_ENTRIES_PER_PAGE, 9);
echo $Pages;?>
</div>
<? } ?>
<? } ?>
<table cellpadding="6" cellspacing="1" border="0" class="log_table border" id="log_table" width="100%">
<tr class="colhead">
<td style="width: 180px;"><strong>Time</strong></td>
<td><strong>Message</strong></td>
</tr>
<? if ($QueryStatus) { ?>
<? if ($QueryStatus) { ?>
<tr class="nobr"><td colspan="2">Search request failed (<?=$QueryError?>).</td></tr>
<? } elseif ($DB->record_count() == 0) { ?>
<? } elseif ($DB->record_count() == 0) { ?>
<tr class="nobr"><td colspan="2">Nothing found!</td></tr>
<? }
<?
}
$Row = 'a';
$Usernames = array();
while (list($ID, $Message, $LogTime) = $DB->next_record()) {
$MessageParts = explode(" ", $Message);
$Message = "";
$MessageParts = explode(' ', $Message);
$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.'/')) ||
@ -55,46 +56,46 @@
$MessageParts[$i] = '<a href="'.substr($MessageParts[$i], $Offset).'">'.substr($MessageParts[$i], $Offset).'</a>';
}
switch ($MessageParts[$i]) {
case "Torrent":
case "torrent":
case 'Torrent':
case 'torrent':
$TorrentID = $MessageParts[$i + 1];
if (is_numeric($TorrentID)) {
$Message = $Message.' '.$MessageParts[$i].' <a href="torrents.php?torrentid='.$TorrentID.'"> '.$TorrentID.'</a>';
$Message = $Message.' '.$MessageParts[$i]." <a href=\"torrents.php?torrentid=$TorrentID\">$TorrentID</a>";
$i++;
} else {
$Message = $Message.' '.$MessageParts[$i];
}
break;
case "Request":
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>';
$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":
case 'Artist':
case 'artist':
$ArtistID = $MessageParts[$i + 1];
if (is_numeric($ArtistID)) {
$Message = $Message.' '.$MessageParts[$i].' <a href="artist.php?id='.$ArtistID.'"> '.$ArtistID.'</a>';
$Message = $Message.' '.$MessageParts[$i]." <a href=\"artist.php?id=$ArtistID\">$ArtistID</a>";
$i++;
} else {
$Message = $Message.' '.$MessageParts[$i];
}
break;
case "group":
case "Group":
case 'group':
case 'Group':
$GroupID = $MessageParts[$i + 1];
if (is_numeric($GroupID)) {
$Message = $Message.' '.$MessageParts[$i].' <a href="torrents.php?id='.$GroupID.'"> '.$GroupID.'</a>';
$Message = $Message.' '.$MessageParts[$i]." <a href=\"torrents.php?id=$GroupID\">$GroupID</a>";
} else {
$Message = $Message.' '.$MessageParts[$i];
}
$i++;
break;
case "by":
case 'by':
$UserID = 0;
$User = '';
$URL = '';
@ -103,7 +104,7 @@
if (is_numeric($MessageParts[$i + 1])) {
$UserID = $MessageParts[++$i];
}
$URL = "user $UserID ".'(<a href="user.php?id='.$UserID.'">'.substr($MessageParts[++$i], 1, -1)."</a>)";
$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) == ':') {
@ -111,62 +112,70 @@
$Colon = true;
}
if (!isset($Usernames[$User])) {
$DB->query("SELECT ID FROM users_main WHERE Username = _utf8 '".$User."' COLLATE utf8_bin");
$DB->query("
SELECT ID
FROM users_main
WHERE Username = _utf8 '$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;
$URL = $Usernames[$User] ? "<a href=\"user.php?id=$UserID\">$User</a>".($Colon ? ':' : '') : $User;
}
$Message = "$Message by $URL";
break;
case "uploaded":
case 'uploaded':
if ($Color === false) {
$Color = 'green';
}
$Message = $Message.' '.$MessageParts[$i];
break;
case "deleted":
case 'deleted':
if ($Color === false || $Color === 'green') {
$Color = 'red';
}
$Message = $Message.' '.$MessageParts[$i];
break;
case "edited":
case 'edited':
if ($Color === false) {
$Color = 'blue';
}
$Message = $Message.' '.$MessageParts[$i];
break;
case "un-filled":
case 'un-filled':
if ($Color === false) {
$Color = '';
}
$Message = $Message.' '.$MessageParts[$i];
break;
case "marked":
case 'marked':
if ($i == 1) {
$User = $MessageParts[$i - 1];
if (!isset($Usernames[$User])) {
$DB->query("SELECT ID FROM users_main WHERE Username = _utf8 '$User' COLLATE utf8_bin");
$DB->query("
SELECT ID
FROM users_main
WHERE Username = _utf8 '$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;
$URL = $Usernames[$User] ? "<a href=\"user.php?id=$UserID\">$User</a>" : $User;
$Message = $URL." ".$MessageParts[$i];
} else {
$Message = $Message.' '.$MessageParts[$i];
}
break;
case "Collage":
case 'Collage':
$CollageID = $MessageParts[$i + 1];
if (is_numeric($CollageID)) {
$Message = $Message.' '.$MessageParts[$i].' <a href="collages.php?id='.$CollageID.'"> '.$CollageID.'</a>';
$Message = $Message.' '.$MessageParts[$i]." <a href=\"collages.php?id=$CollageID\">$CollageID</a>";
$i++;
} else {
$Message = $Message.' '.$MessageParts[$i];

View File

@ -115,12 +115,12 @@
// User created, delete invite. If things break after this point, then it's better to have a broken account to fix than a 'free' invite floating around that can be reused
$DB->query("
DELETE FROM invites
WHERE InviteKey='".db_string($_REQUEST['invite'])."'");
WHERE InviteKey = '".db_string($_REQUEST['invite'])."'");
$DB->query("
SELECT ID
FROM stylesheets
WHERE `Default`='1'");
WHERE `Default` = '1'");
list($StyleID) = $DB->next_record();
$AuthKey = Users::make_secret();
@ -128,7 +128,7 @@
INSERT INTO users_info
(UserID, StyleID, AuthKey, Inviter, JoinDate)
VALUES
('$UserID','$StyleID','".db_string($AuthKey)."', '$InviterID', '".sqltime()."')");
('$UserID', '$StyleID', '".db_string($AuthKey)."', '$InviterID', '".sqltime()."')");
$DB->query("
INSERT INTO users_history_ips
@ -137,8 +137,6 @@
('$UserID', '".db_string($_SERVER['REMOTE_ADDR'])."', '".sqltime()."')");
$DB->query("
INSERT INTO users_history_emails
(UserID, Email, Time, IP)
@ -161,7 +159,7 @@
$DB->query("
SELECT TreePosition, TreeID, TreeLevel
FROM invite_tree
WHERE UserID='$InviterID'");
WHERE UserID = '$InviterID'");
list($InviterTreePosition, $TreeID, $TreeLevel) = $DB->next_record();
// If the inviter doesn't have an invite tree
@ -213,7 +211,9 @@
('$UserID', '$InviterID', '$TreePosition', '$TreeID', '$TreeLevel')");
}
} else { // No inviter (open registration)
$DB->query("SELECT MAX(TreeID) FROM invite_tree");
$DB->query("
SELECT MAX(TreeID)
FROM invite_tree");
list($TreeID) = $DB->next_record();
$TreeID++;
$InviterID = 0;
@ -225,10 +225,10 @@
$TPL = NEW TEMPLATE;
$TPL->open(SERVER_ROOT.'/templates/new_registration.tpl');
$TPL->set('Username',$_REQUEST['username']);
$TPL->set('TorrentKey',$torrent_pass);
$TPL->set('SITE_NAME',SITE_NAME);
$TPL->set('SITE_URL',SITE_URL);
$TPL->set('Username', $_REQUEST['username']);
$TPL->set('TorrentKey', $torrent_pass);
$TPL->set('SITE_NAME', SITE_NAME);
$TPL->set('SITE_URL', SITE_URL);
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));
@ -241,7 +241,7 @@
$DB->query("
SELECT InviteKey
FROM invites
WHERE InviteKey='".db_string($_GET['invite'])."'");
WHERE InviteKey = '".db_string($_GET['invite'])."'");
if ($DB->record_count() == 0) {
error('Invite not found!');
}

View File

@ -296,7 +296,7 @@
'reason' => '10',
'title' => 'Low Bitrate',
'report_messages' => array(
"Please tell us the actual bitrate, and the software used to check."
"Please tell us the actual bitrate and the software used to check."
),
'report_fields' => array(
'track' => '0'
@ -444,9 +444,9 @@
'reason' => '9',
'title' => 'Inaccurate Bitrate',
'report_messages' => array(
"Please tell us the actual bitrate, and the software used to check.",
"If the correct bitrate would make this torrent a duplicate, please report it as a dupe, and include the mislabeling in 'Comments'.",
"If the correct bitrate would result in this torrent trumping another, please report it as a trump, and include the mislabeling in 'Comments'."
"Please tell us the actual bitrate and the software used to check.",
"If the correct bitrate would make this torrent a duplicate, please report it as a dupe, and describe the mislabeling in \"Comments\".",
"If the correct bitrate would result in this torrent trumping another, please report it as a trump, and describe the mislabeling in \"Comments\"."
),
'report_fields' => array(
'track' => '0'
@ -781,7 +781,7 @@
'reason' => '-1',
'title' => 'Contains Virus',
'report_messages' => array(
'Please include as much information as possible to verify the report. Please also double check that your virus scanner is not incorrectly identifying a keygen or crack as a virus.',
'Please include as much information as possible to verify the report. Please also double-check that your virus scanner is not incorrectly identifying a keygen or crack as a virus.',
),
'report_fields' => array(
'link' => '0'

View File

@ -922,8 +922,6 @@
$SQL .= "AND ((NewGroupsOnly = '0' ";
// Or this is the first torrent in the group to match the formatbitrate filter
$SQL .= ") OR ( NewGroupsOnly = '1' ";
// Investigate the following line...
$SQL .= ") OR ( NewGroupsOnly = '' ";
// Test the filter doesn't match any previous formatbitrate in the group
foreach ($UsedFormatBitrates as $UsedFormatBitrate) {
$FormatReq = "(Formats LIKE '%|".db_string($UsedFormatBitrate['format'])."|%' OR Formats = '') ";

View File

@ -256,7 +256,6 @@ function checked($Checked) {
</select>
</td>
</tr>
<tr>
<td class="label"><strong>Torrent search</strong></td>
<td>
@ -421,7 +420,7 @@ function checked($Checked) {
<td class="label">&nbsp;</td>
<td>
<p><span class="warning">Note: Paranoia has nothing to do with your security on this site; the only thing affected by this setting is other users' ability to see your site activity and taste in music.</span></p>
<p>Select the elements <strong>you want to show</strong> on your profile. For example, if you check "Show count" for "Snatched", users will be able to see how many torrents you have snatched. If you check "Show list", they will be able to see the full list of torrents you have snatched.</p>
<p>Select the elements <strong>you want to show</strong> on your profile. For example, if you select "Show count" for "Snatched", users will be able to see how many torrents you have snatched. If you select "Show list", they will be able to see the full list of torrents you have snatched.</p>
<p><span class="warning">Some information will still be available in the site log.</span></p>
</td>
</tr>

View File

@ -164,7 +164,7 @@
SET
Artists='$ArtistList',
ExcludeVA='$ExcludeVA',
NewGroupsOnly='$NewGrsoupsOnly',
NewGroupsOnly='$NewGroupsOnly',
Tags='$TagList',
NotTags='$NotTagList',
ReleaseTypes='$ReleaseTypeList',

View File

@ -37,7 +37,7 @@
}
$Delta['MaxCollages'] = $_POST['maxcollages'];
$Cache->begin_transaction('user_info_heavy_'.$UserID);
$Cache->begin_transaction("user_info_heavy_$UserID");
$Cache->update_row(false, array('CustomPermissions' => $Delta));
$Cache->commit_transaction(0);
$DB->query("
@ -51,27 +51,27 @@
$Permissions = array_merge($Defaults,$Delta);
$MaxCollages = $Customs['MaxCollages'] + $Delta['MaxCollages'];
function display_perm($Key,$Title) {
function display_perm($Key, $Title) {
global $Defaults, $Permissions;
$Perm = '<input id="default_'.$Key.'" type="checkbox" disabled="disabled"';
$Perm = "<input id=\"default_$Key\" type=\"checkbox\" disabled=\"disabled\"";
if (isset($Defaults[$Key]) && $Defaults[$Key]) {
$Perm.= ' checked="checked"';
$Perm .= ' checked="checked"';
}
$Perm.= ' /><input type="checkbox" name="perm_'.$Key.'" id="'.$Key.'" value="1"';
$Perm .= " /><input type=\"checkbox\" name=\"perm_$Key\" id=\"$Key\" value=\"1\"";
if (isset($Permissions[$Key]) && $Permissions[$Key]) {
$Perm.= ' checked="checked"';
$Perm .= ' checked="checked"';
}
$Perm.= ' /> <label for="'.$Key.'">'.$Title.'</label><br />';
$Perm .= " /> <label for=\"$Key\">$Title</label><br />";
echo $Perm;
}
View::show_header($Username.' &gt; Permissions');
View::show_header("$Username &gt; Permissions");
?>
<script type="text/javascript">//<![CDATA[
function reset() {
for (i = 0; i < $('#permissionsform').raw().elements.length; i++) {
element = $('#permissionsform').raw().elements[i];
if (element.id.substr(0,8) == 'default_') {
if (element.id.substr(0, 8) == 'default_') {
$('#' + element.id.substr(8)).raw().checked = element.checked;
}
}
@ -81,14 +81,13 @@ function reset() {
<div class="header">
<h2><?=Users::format_username($UserID, false, false, false)?> &gt; Permissions</h2>
<div class="linkbox">
<a href="#" onclick="reset();return false;" class="brackets">Defaults</a>
<a href="#" onclick="reset(); return false;" class="brackets">Defaults</a>
</div>
</div>
<div class="box pad">
Before using permissions, please understand that it allows you to both add and remove access to specific features. If you think that to add access to a feature, you need to uncheck everything else, <strong>YOU ARE WRONG</strong>. The checkmarks on the left, which are grayed out, are the standard permissions granted by their class (and donor/artist status). Any changes you make to the right side will overwrite this. It's not complicated, and if you screw up, click the defaults link at the top. It will reset the user to their respective features granted by class, then you can check or uncheck the one or two things you want to change. <strong>DO NOT UNCHECK EVERYTHING.</strong> If you need further clarification, ask a developer before using this tool.
<p>Before using permissions, please understand that it allows you to both add and remove access to specific features. If you think that to add access to a feature, you need to uncheck everything else, <strong>YOU ARE WRONG</strong>. The check boxes on the left, which are grayed out, are the standard permissions granted by their class (and donor/artist status). Any changes you make to the right side will overwrite this. It's not complicated, and if you screw up, click the "Defaults" link at the top. It will reset the user to their respective features granted by class, then you can select or deselect the one or two things you want to change. <strong>DO NOT DESELECT EVERYTHING.</strong> If you need further clarification, ask a developer before using this tool.</p>
</div>
<br />
<form class="manage_form" name="permissions" id="permissionsform" method="post" action="">
<table class="layout permission_head">
<tr>