Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2025-01-31 10:31:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2013-01-29 08:00:36 +00:00
parent 11240c5b0e
commit 312ebc3d9f
5 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sections/reports/reports.php
View File

@ -55,7 +55,8 @@
r.Reason, r.Reason,
r.Status, r.Status,
r.ClaimerID, r.ClaimerID,
r.Notes r.Notes,
r.ResolverID
FROM reports AS r FROM reports AS r
JOIN users_main AS um ON r.UserID=um.ID JOIN users_main AS um ON r.UserID=um.ID
WHERE " . $Where . " WHERE " . $Where . "
@ -89,7 +90,7 @@
?> ?>
</div> </div>
<? <?
while (list($ReportID, $SnitchID, $SnitchName, $ThingID, $Short, $ReportedTime, $Reason, $Status, $ClaimerID, $Notes) = $DB->next_record()) { while (list($ReportID, $SnitchID, $SnitchName, $ThingID, $Short, $ReportedTime, $Reason, $Status, $ClaimerID, $Notes, $ResolverID) = $DB->next_record()) {
$Type = $Types[$Short]; $Type = $Types[$Short];
$Reference = "reports.php?id=" . $ReportID . "#report" . $ReportID; $Reference = "reports.php?id=" . $ReportID . "#report" . $ReportID;
?> ?>
@ -237,7 +238,15 @@
</form> </form>
</td> </td>
</tr> </tr>
<? } ?> <? } else {
$ResolverInfo = Users::user_info($ResolverID);
?>
<tr>
<td colspan="2">
Resolved By <a href="users.php?id=<?=$ResolverID?>"><?=$ResolverInfo['Username']?></a>
</td>
</tr>
<? } ?>
</table> </table>
</div> </div>
<br /> <br />

22
static/functions/lastfm.js
View File

@ -117,8 +117,8 @@
} }
// Escape ampersands with html code to avoid breaking the search links // Escape ampersands with html code to avoid breaking the search links
function escapeAmpHtml(input){ function escapeHtml(input){
return input.replace(/&/g,"&#38;"); return input.replace(/&/g,"&#38;").replace(/</g,"&#60;");
} }
@ -171,11 +171,11 @@
var k = initialCount; var k = initialCount;
if (a.length < 3) k = a.length; if (a.length < 3) k = a.length;
for (var i = 0; i < k; i++) { for (var i = 0; i < k; i++) {
sharedArtistsHtml += '<li><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeAmpHtml(a[i]['name']) + '</a></li>' sharedArtistsHtml += '<li><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeHtml(a[i]['name']) + '</a></li>'
} }
if ( a.length > 3 ){ if ( a.length > 3 ){
for (i = 3; i < a.length; i++) { for (i = 3; i < a.length; i++) {
sharedArtistsHtml += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeAmpHtml(a[i]['name']) + '</a></li>' sharedArtistsHtml += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(a[i]['name']) + '">' + escapeHtml(a[i]['name']) + '</a></li>'
} }
sharedArtistsHtml += '<li>[<a href="#sharedartists" id="lastfm_expand" onclick="return false">Expand</a>]</li>' sharedArtistsHtml += '<li>[<a href="#sharedartists" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
} }
@ -215,7 +215,7 @@
// Fix Last.fm API returning more than one entry despite limit on certain conditions. // Fix Last.fm API returning more than one entry despite limit on certain conditions.
if ( typeof(json[0]) === "object" ) json = json[0]; if ( typeof(json[0]) === "object" ) json = json[0];
html += '<li class="lastfm_essential">Last played: '; html += '<li class="lastfm_essential">Last played: ';
html += '<a href="artist.php?artistname=' + escapeAmpUrl(json['artist']['#text']) + '">' + escapeAmpHtml(json['artist']['#text']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(json['name']) + '">' + escapeAmpHtml(json['name']) + '</a>'; html += '<a href="artist.php?artistname=' + escapeAmpUrl(json['artist']['#text']) + '">' + escapeHtml(json['artist']['#text']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(json['name']) + '">' + escapeHtml(json['name']) + '</a>';
html += "</li>"; html += "</li>";
lastPlayedTrack = html; lastPlayedTrack = html;
} }
@ -250,11 +250,11 @@
var k = initialCount; var k = initialCount;
if (j.length < 3) k = j.length; if (j.length < 3) k = j.length;
for (var i = 0; i < k; i++) { for (var i = 0; i < k; i++) {
html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>' html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
} }
if ( j.length>3 ){ if ( j.length>3 ){
for (i = 3; i < j.length; i++) { for (i = 3; i < j.length; i++) {
html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>' html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
} }
html+= '<li>[<a href="#topartists" id="lastfm_expand" onclick="return false">Expand</a>]</li>' html+= '<li>[<a href="#topartists" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
} }
@ -293,11 +293,11 @@
var k = initialCount; var k = initialCount;
if (j.length < 3) k = j.length; if (j.length < 3) k = j.length;
for (var i = 0; i < k; i++) { for (var i = 0; i < k; i++) {
html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>' html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
} }
if ( j.length>3 ){ if ( j.length>3 ){
for (i = 3; i < j.length; i++) { for (i = 3; i < j.length; i++) {
html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>' html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
} }
html+= '<li>[<a href="#topalbums" id="lastfm_expand" onclick="return false">Expand</a>]</li>' html+= '<li>[<a href="#topalbums" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
} }
@ -336,11 +336,11 @@
var k = initialCount; var k = initialCount;
if (j.length < 3) k = j.length; if (j.length < 3) k = j.length;
for (var i = 0; i < k; i++) { for (var i = 0; i < k; i++) {
html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>' html += '<li><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
} }
if ( j.length>3 ){ if ( j.length>3 ){
for (i = 3; i < j.length; i++) { for (i = 3; i < j.length; i++) {
html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeAmpHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeAmpHtml(j[i]['name']) + '</a></li>' html += '<li class="hidden"><a href="artist.php?artistname=' + escapeAmpUrl(j[i]['artist']['name']) + '">' + escapeHtml(j[i]['artist']['name']) + '</a> - <a href="torrents.php?searchstr=' + escapeAmpUrl(j[i]['name']) + '">' + escapeHtml(j[i]['name']) + '</a></li>'
} }
html+= '<li>[<a href="#toptracks" id="lastfm_expand" onclick="return false">Expand</a>]</li>' html+= '<li>[<a href="#toptracks" id="lastfm_expand" onclick="return false">Expand</a>]</li>'
} }

3
static/functions/multiformat_uploader.js
View File

@ -32,6 +32,7 @@
addFormats(row); addFormats(row);
addBitrates(row); addBitrates(row);
addReleaseDescription(row); addReleaseDescription(row);
$("#post").val("Upload torrents");
count++; count++;
} }
@ -104,9 +105,11 @@
$("#add_format").show(); $("#add_format").show();
filenames.pop(); filenames.pop();
count--; count--;
$("#post").val("Upload torrents");
} }
if (count == 1) { if (count == 1) {
$("#remove_format").hide(); $("#remove_format").hide();
$("#post").val("Upload torrent");
} }
} }

4
static/styles/dark_ambient/style.css
View File

@ -194,7 +194,7 @@ input[type="submit"]:active, input[type="button"]:active {
color: #007dc7 !important; color: #007dc7 !important;
} }
input[value="Upload torrent"] { input[value="Upload torrent"], input[value="Upload torrents"] {
margin: 15px 0 0 0; margin: 15px 0 0 0;
background-color: #2e2e2e; background-color: #2e2e2e;
color: a5cce9; color: a5cce9;
@ -206,7 +206,7 @@ input[value="Upload torrent"] {
font-weight: bold; font-weight: bold;
} }
input[value="Upload torrent"]:active { input[value="Upload torrent"],input[value="Upload torrents"]:active {
color: #f4f4f4 !important; color: #f4f4f4 !important;
} }

4
static/styles/proton/style.css
View File

@ -196,7 +196,7 @@ input[type="submit"]:active, input[type="button"]:active {
color: #007dc7 !important; color: #007dc7 !important;
} }
input[value="Upload torrent"] { input[value="Upload torrent"], input[value="Upload torrents"] {
margin: 15px 0 0 0; margin: 15px 0 0 0;
background-color: #007dc7; background-color: #007dc7;
color: white; color: white;
@ -207,7 +207,7 @@ input[value="Upload torrent"] {
border-right: 1px solid #005488; border-right: 1px solid #005488;
} }
input[value="Upload torrent"]:active { input[value="Upload torrent"],input[value="Upload torrents"]:active {
color: #f4f4f4 !important; color: #f4f4f4 !important;
} }