Empty commit

This commit is contained in:
Git 2012-10-14 08:00:20 +00:00
parent d10c80a027
commit c960e42148
14 changed files with 69 additions and 49 deletions

View File

@ -164,7 +164,23 @@ function set_filter_range($Name, $Min, $Max, $Exclude) {
}
function escape_string($String) {
return strtr($String, array('('=>'\(', ')'=>'\)', '|'=>'\|', '-'=>'\-', '@'=>'\@', '~'=>'\~', '&'=>'\&', '/'=>'\/'));
return strtr($String, array(
'('=>'\(',
')'=>'\)',
'|'=>'\|',
'-'=>'\-',
'@'=>'\@',
'~'=>'\~',
'&'=>'\&',
'!'=>'\!',
'"'=>'\"',
'/'=>'\/',
'\\'=>'\\\\',
'*'=>'\*',
'?'=>'\?',
'^'=>'\^',
'$'=>'\$',
'='=>'\='));
}

View File

@ -55,7 +55,7 @@ function error_out($reason = "") {
}
if(check_perms('site_proxy_images') && !empty($Avatar)) {
$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar);
$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar);
}
if($LoggedUser['CustomForums']) {

View File

@ -99,12 +99,12 @@
<? } else { ?>
<a href="#" id="bookmarklink_request_<?=$RequestID?>" onclick="Bookmark('request', <?=$RequestID?>,'[Remove bookmark]');return false;">[Bookmark]</a>
<? } ?>
<a href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">[Report Request]</a>
<a href="reports.php?action=report&amp;type=request&amp;id=<?=$RequestID?>">[Report request]</a>
<? if(!$IsFilled) { ?>
<a href="upload.php?requestid=<?=$RequestID?><?=($GroupID?"&groupid=$GroupID":'')?>">[Upload Request]</a>
<a href="upload.php?requestid=<?=$RequestID?><?=($GroupID?"&amp;groupid=$GroupID":'')?>">[Upload request]</a>
<? }
if(!$IsFilled && (($CategoryID == 0) || ($CategoryName == "Music" && $Year == 0))) { ?>
<a href="reports.php?action=report&amp;type=request_update&amp;id=<?=$RequestID?>">[Request Update]</a>
<a href="reports.php?action=report&amp;type=request_update&amp;id=<?=$RequestID?>">[Requestsv2 update]</a>
<? } ?>
<?
@ -116,11 +116,11 @@
$encoded_artist = urlencode($encoded_artist);
$worldcat_url = "http://worldcat.org/search?q=" . $encoded_artist . " " . $encoded_title;
$google_url = "https://www.google.com/search?&tbm=shop&q=" . $encoded_artist . " " . $encoded_title;
$google_url = "https://www.google.com/search?&amp;tbm=shop&amp;q=" . $encoded_artist . " " . $encoded_title;
?>
<a href="<? echo $worldcat_url; ?>">[Find in Library]</a>
<a href="<? echo $google_url; ?>">[Find in Stores]</a>
<a href="<? echo $worldcat_url; ?>">[Find in library]</a>
<a href="<? echo $google_url; ?>">[Find in stores]</a>
</div>
</div>
<div class="sidebar">
@ -234,7 +234,7 @@
</ul>
</div>
<div class="box box_votes">
<div class="head"><strong>Top Contributors</strong></div>
<div class="head"><strong>Top contributors</strong></div>
<table class="layout">
<? $VoteMax = ($VoteCount < 5 ? $VoteCount : 5);
$ViewerVote = false;
@ -285,7 +285,7 @@
<? if($CategoryName == "Music") {
if(!empty($RecordLabel)) { ?>
<tr>
<td class="label">Record Label</td>
<td class="label">Record label</td>
<td>
<?=$RecordLabel?>
</td>
@ -293,39 +293,39 @@
<? }
if(!empty($CatalogueNumber)) { ?>
<tr>
<td class="label">Catalogue Number</td>
<td class="label">Catalogue number</td>
<td>
<?=$CatalogueNumber?>
</td>
</tr>
<? } ?>
<tr>
<td class="label">Release Type</td>
<td class="label">Release type</td>
<td>
<?=$ReleaseName?>
</td>
</tr>
<tr>
<td class="label">Acceptable Bitrates</td>
<td class="label">Acceptable bitrates</td>
<td>
<?=$BitrateString?>
</td>
</tr>
<tr>
<td class="label">Acceptable Formats</td>
<td class="label">Acceptable formats</td>
<td>
<?=$FormatString?>
</td>
</tr>
<tr>
<td class="label">Acceptable Media</td>
<td class="label">Acceptable media</td>
<td>
<?=$MediaString?>
</td>
</tr>
<? if(!empty($LogCue)) { ?>
<tr>
<td class="label">Required FLAC only extra(s)</td>
<td class="label">Required FLAC-only extras</td>
<td>
<?=$LogCue?>
</td>
@ -358,8 +358,8 @@
$GroupLink = Artists::display_artists($Group['ExtendedArtists']).'<a href="torrents.php?id='.$GroupID.'">'.$Group['Name'].'</a>';*/
?>
<tr>
<td class="label">Torrent Group</td>
<td><a href="torrents.php?id=<?=$GroupID?>">torrents.php?id=<?=$GroupID?></td>
<td class="label">Torrent group</td>
<td><a href="torrents.php?id=<?=$GroupID?>">torrents.php?id=<?=$GroupID?></a></td>
</tr>
<? } ?>
<tr>
@ -374,7 +374,7 @@
</tr>
<? if ($LastVote > $TimeAdded) { ?>
<tr>
<td class="label">Last Voted</td>
<td class="label">Last voted</td>
<td>
<?=time_diff($LastVote)?>
</td>
@ -382,7 +382,7 @@
<? } ?>
<? if($CanVote) { ?>
<tr id="voting">
<td class="label">Custom Vote (MB)</td>
<td class="label" title="These units are in base 2, not base 10. For example, there are 1,024 MB in 1 GB.">Custom vote (MB)</td>
<td>
<input type="text" id="amount_box" size="8" onchange="Calculate();" />
<select id="unit" name="unit" onchange="Calculate();">
@ -576,8 +576,8 @@
<tr class="colhead_dark">
<td colspan="2">
<span style="float:left;"><a href='#quickreplypreview'>#XXXXXX</a>
by <strong><?=Users::format_username($LoggedUser['ID'], true, true, true, true)?> Just now
<a href="#quickreplypreview">[Report Comment]</a>
by <strong><?=Users::format_username($LoggedUser['ID'], true, true, true, true)?></strong> Just now
<a href="#quickreplypreview">[Report comment]</a>
</span>
<span style="float:right;">
<a href="#">&uarr;</a>

View File

@ -120,7 +120,7 @@ function header_link($SortKey,$DefaultWay="desc") {
if(!empty($_GET['filelist'])) {
$SearchString = trim($_GET['filelist']);
if($SearchString != '') {
$Queries[] = '@filelist "'.$SS->EscapeString($_GET['filelist']).'"~20';
$Queries[] = '@filelist "'.$SS->escape_string($_GET['filelist']).'"~20';
$EnableNegation = true;
}
}
@ -194,11 +194,11 @@ function header_link($SortKey,$DefaultWay="desc") {
}
$QueryParts = array();
foreach($BasicSearch['include'] as $Word) {
$QueryParts[] = $SS->EscapeString($Word);
$QueryParts[] = $SS->escape_string($Word);
}
if(!empty($BasicSearch['exclude'])) {
foreach($BasicSearch['exclude'] as $Word) {
$QueryParts[] = '!'.$SS->EscapeString(substr($Word,1));
$QueryParts[] = '!'.$SS->escape_string(substr($Word,1));
}
}
if(!empty($FilterBitrates)) {
@ -221,11 +221,11 @@ function header_link($SortKey,$DefaultWay="desc") {
unset($Tags['exclude']);
}
foreach($Tags['include'] as &$Tag) {
$Tag = $SS->EscapeString($Tag);
$Tag = $SS->escape_string($Tag);
}
if(!empty($Tags['exclude'])) {
foreach($Tags['exclude'] as &$Tag) {
$Tag = '!'.$SS->EscapeString(substr($Tag,1));
$Tag = '!'.$SS->escape_string(substr($Tag,1));
}
}
@ -264,11 +264,11 @@ function header_link($SortKey,$DefaultWay="desc") {
unset($Words['exclude']);
}
foreach($Words['include'] as $Word) {
$QueryParts[] = $SS->EscapeString($Word);
$QueryParts[] = $SS->escape_string($Word);
}
if(!empty($Words['exclude'])) {
foreach($Words['exclude'] as $Word) {
$QueryParts[] = '!'.$SS->EscapeString(substr($Word,1));
$QueryParts[] = '!'.$SS->escape_string(substr($Word,1));
}
}
if(!empty($QueryParts)) {

View File

@ -568,18 +568,18 @@ function filelist($Str) {
</blockquote>
<? if(check_perms('site_moderate_requests')) { ?>
<div class="linkbox">
<a href="torrents.php?action=masspm&amp;id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>">[Mass PM Snatchers]</a>
<a href="torrents.php?action=masspm&amp;id=<?=$GroupID?>&amp;torrentid=<?=$TorrentID?>">[Mass PM snatchers]</a>
</div>
<? } ?>
<div class="linkbox">
<a href="#" onclick="show_peers('<?=$TorrentID?>', 0);return false;">(View Peerlist)</a>
<a href="#" onclick="show_peers('<?=$TorrentID?>', 0);return false;">(View peer list)</a>
<? if(check_perms('site_view_torrent_snatchlist')) { ?>
<a href="#" onclick="show_downloads('<?=$TorrentID?>', 0);return false;">(View Downloadlist)</a>
<a href="#" onclick="show_snatches('<?=$TorrentID?>', 0);return false;">(View Snatchlist)</a>
<a href="#" onclick="show_downloads('<?=$TorrentID?>', 0);return false;" title="View the list of users that have clicked the &quot;DL&quot; button">(View downloader list)</a>
<a href="#" onclick="show_snatches('<?=$TorrentID?>', 0);return false;" title="View the list of users that have reported a snatch to the tracker">(View snatcher list)</a>
<? } ?>
<a href="#" onclick="show_files('<?=$TorrentID?>');return false;">(View Filelist)</a>
<a href="#" onclick="show_files('<?=$TorrentID?>');return false;">(View file list)</a>
<? if($Reported) { ?>
<a href="#" onclick="show_reported('<?=$TorrentID?>');return false;">(View Report Information)</a>
<a href="#" onclick="show_reported('<?=$TorrentID?>');return false;">(View report information)</a>
<? } ?>
</div>
<div id="peers_<?=$TorrentID?>" class="hidden"></div>
@ -800,7 +800,7 @@ function filelist($Str) {
<table class="forum_post box vertical_margin<?=$HeavyInfo['DisableAvatars'] ? ' noavatar' : ''?>" id="post<?=$PostID?>">
<tr class="colhead_dark">
<td colspan="2">
<span style="float:left;"><a class="post_id" href='torrents.php?id=<?=$GroupID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>'>#<?=$PostID?></a>
<div style="float:left;"><a class="post_id" href="torrents.php?id=<?=$GroupID?>&amp;postid=<?=$PostID?>#post<?=$PostID?>">#<?=$PostID?></a>
<strong><?=Users::format_username($AuthorID, true, true, true, true)?></strong> <?=time_diff($AddedTime)?> <a href="reports.php?action=report&amp;type=torrents_comment&amp;id=<?=$PostID?>">[Report]</a>
<? if(check_perms('users_warn') && $AuthorID != $LoggedUser['ID']) {
$AuthorInfo = Users::user_info($AuthorID);
@ -819,7 +819,7 @@ function filelist($Str) {
- <a href="#quickpost" onclick="Quote('<?=$PostID?>','<?=$Username?>');">[Quote]</a>
<?if ($AuthorID == $LoggedUser['ID'] || check_perms('site_moderate_forums')){ ?> - <a href="#post<?=$PostID?>" onclick="Edit_Form('<?=$PostID?>','<?=$Key?>');">[Edit]</a><? }
if (check_perms('site_moderate_forums')){ ?> - <a href="#post<?=$PostID?>" onclick="Delete('<?=$PostID?>');">[Delete]</a> <? } ?>
</span>
</div>
<span id="bar<?=$PostID?>" style="float:right;">
<a href="#">&uarr;</a>
</span>

View File

@ -36,7 +36,7 @@
?>
<h4>Downloadlist</h4>
<h4 title="List of users that have clicked the &quot;DL&quot; button">List of Downloaders</h4>
<? if($NumResults>100) { ?>
<div class="linkbox"><?=js_pages('show_downloads', $_GET['torrentid'], $NumResults, $Page)?></div>
<? } ?>

View File

@ -30,7 +30,7 @@
$DB->set_query_id($Result);
?>
<h4>Peerlist</h4>
<h4>Peer List</h4>
<? if($NumResults>100) { ?>
<div class="linkbox"><?=js_pages('show_peers', $_GET['torrentid'], $NumResults, $Page)?></div>
<? } ?>

View File

@ -23,7 +23,7 @@
list($NumResults) = $DB->next_record();
?>
<h4>Snatches</h4>
<h4 title="List of users that have reported a snatch to the tracker">List of Snatchers</h4>
<? if($NumResults>100) { ?>
<div class="linkbox"><?=js_pages('show_snatches', $_GET['torrentid'], $NumResults, $Page)?></div>

View File

@ -89,7 +89,7 @@
if (($Override=check_paranoia_here('uploads+'))) { ?>
<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Uploaded: <?=number_format($Uploads)?>
<? if(($Override=check_paranoia_here('uploads'))) { ?>[<a <?= $Override===2 ? 'class="paranoia_override"' :'' ?> href="torrents.php?type=uploaded&amp;userid=<?=$UserID?>" title="View">View</a>]<? if(check_perms('zip_downloader')) { ?> [<a href="torrents.php?action=redownload&amp;type=uploads&amp;userid=<?=$UserID?>"
onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all albums before redownloading.');">Download</a>]<? } } ?>
onclick="return confirm('If you no longer have the content, your ratio WILL be affected; be sure to check the size of all torrents before redownloading.');">Download</a>]<? } } ?>
</li>
<? }
if (($Override=check_paranoia_here('uniquegroups+'))) { ?>

View File

@ -201,7 +201,7 @@ function check_paranoia_here($Setting) {
<div class="sidebar">
<? if ($Avatar && empty($HeavyInfo['DisableAvatars'])) {
if(check_perms('site_proxy_images') && !empty($Avatar)) {
$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&avatar='.$UserID.'&i='.urlencode($Avatar);
$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;avatar='.$UserID.'&amp;i='.urlencode($Avatar);
}
?>
<div class="box box_image box_image_avatar">
@ -214,7 +214,7 @@ function check_paranoia_here($Setting) {
<ul class="stats nobullet">
<li>Joined: <?=$JoinedDate?></li>
<? if (($Override = check_paranoia_here('lastseen'))) { ?>
<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Last Seen: <?=$LastAccess?></li>
<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Last seen: <?=$LastAccess?></li>
<? } ?>
<? if (($Override=check_paranoia_here('uploaded'))) { ?>
<li <?= $Override===2 ? 'class="paranoia_override"' : ''?> >Uploaded: <?=Format::get_size($Uploaded)?></li>
@ -411,7 +411,7 @@ function check_paranoia_here($Setting) {
if (check_perms('users_view_keys',$Class) || $OwnProfile) {
?>
<li>Passkey: <a href="#" onclick="this.innerHTML='<?=display_str($torrent_pass)?>'; return false;">[View]</a></li>
<li>Passkey: [<a href="#" onclick="this.innerHTML='<?=display_str($torrent_pass)?>'; return false;">View</a>]</li>
<? }
if (check_perms('users_view_invites')) {
if (!$InviterID) {
@ -421,7 +421,7 @@ function check_paranoia_here($Setting) {
}
?>
<li>Invited By: <?=$Invited?></li>
<li>Invited by: <?=$Invited?></li>
<li>Invites: <?
$DB->query("SELECT count(InviterID) FROM invites WHERE InviterID = '$UserID'");
list($Pending) = $DB->next_record();

View File

@ -47,7 +47,7 @@
}
if(check_perms('site_proxy_images') && !empty($Avatar)) {
$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&i='.urlencode($Avatar);
$Avatar = 'http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;i='.urlencode($Avatar);
}
View::show_header('Post history for '.$Username,'subscriptions,comments,bbcode');

View File

@ -162,7 +162,7 @@
<? if(empty($HeavyInfo['DisableAvatars'])) { ?>
<td class="avatar" valign="top">
<? if(check_perms('site_proxy_images') && preg_match('/^https?:\/\/(localhost(:[0-9]{2,5})?|[0-9]{1,3}(\.[0-9]{1,3}){3}|([a-zA-Z0-9\-\_]+\.)+([a-zA-Z]{1,5}[^\.]))(:[0-9]{2,5})?(\/[^<>]+)+\.(jpg|jpeg|gif|png|tif|tiff|bmp)$/is',$AuthorAvatar)) { ?>
<img src="<?='http://'.SITE_URL.'/image.php?c=1&i='.urlencode($AuthorAvatar)?>" width="150" style="max-height:400px;" alt="<?=$AuthorName?>'s avatar" />
<img src="<?='http'.($SSL?'s':'').'://'.SITE_URL.'/image.php?c=1&amp;i='.urlencode($AuthorAvatar)?>" width="150" style="max-height:400px;" alt="<?=$AuthorName?>'s avatar" />
<? } elseif(!$AuthorAvatar) { ?>
<img src="<?=STATIC_SERVER.'common/avatars/default.png'?>" width="150" style="max-height:400px;" alt="Default avatar" />
<? } else { ?>

View File

@ -146,7 +146,7 @@ ul.thin li { margin:0px 0px; padding:0px; }
height: 47px;
text-align: center;
font-size: 9pt;
margin: 0px 280px 0px 90px;
margin: 0 370px 0 180px;
padding-top: 28px;
}

View File

@ -1041,3 +1041,7 @@ select:hover, option:hover {
font-size: 1.25em;
font-weight: bold;
}
ul, ol{
list-style-position: inside;
}