Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2024-12-13 19:06:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2012-12-05 08:00:19 +00:00
parent f3aa53fe9f
commit f389c97a45
6 changed files with 48 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sections/collages/manage.php
View File

@ -10,7 +10,8 @@
$DB->query("SELECT ct.GroupID,
um.ID,
um.Username,
ct.Sort
ct.Sort,
tg.CatalogueNumber
FROM collages_torrents AS ct
JOIN torrents_group AS tg ON tg.ID=ct.GroupID
LEFT JOIN users_main AS um ON um.ID=ct.UserID
@ -64,6 +65,7 @@
<tr class="colhead">
<th style="width:7%">Order</th>
<th style="width:1%"><span><abbr title="Current Rank">#</abbr></span></th>
<th style="width:7%"><span>Cat #</span></th>
<th style="width:1%"><span>Year</span></th>
<th style="width:15%"><span>Artist</span></th>
<th><span>Torrent</span></th>
@ -77,7 +79,7 @@
$Number = 0;
foreach ($TorrentList as $GroupID=>$Group) {
list($GroupID, $GroupName, $GroupYear, $GroupRecordLabel, $GroupCatalogueNumber, $TagList, $ReleaseType, $GroupVanityHouse, $Torrents, $GroupArtists, $ExtendedArtists) = array_values($Group);
list($GroupID2, $UserID, $Username, $Sort) = array_values($CollageDataList[$GroupID]);
list($GroupID2, $UserID, $Username, $Sort, $CatNum) = array_values($CollageDataList[$GroupID]);
$Number++;
@ -101,6 +103,7 @@
<input class="sort_numbers" type="text" name="sort" value="<?=$Sort?>" id="sort_<?=$GroupID?>" size="4" />
</td>
<td><?=$Number?></td>
<td><?=trim($CatNum)?></td>
<td><?=trim($GroupYear)?></td>
<td><?=trim($DisplayName)?></td>
<td><?=trim($TorrentLink)?></td>

18
sections/forums/quote_notify.php
View File

@ -19,11 +19,14 @@
//remove any dupes in the array
$Usernames = array_unique($Usernames);
$DB->query("SELECT m.ID FROM users_main AS m
JOIN users_info AS i ON i.UserID = m.ID WHERE m.Username IN " . "('" . implode("', '", $Usernames)
. "')
$DB->query("SELECT m.ID, p.PushService
FROM users_main AS m
LEFT JOIN users_info AS i ON i.UserID = m.ID
LEFT JOIN users_push_notifications AS p ON p.UserID = m.ID
WHERE m.Username IN " . "('" . implode("', '", $Usernames)
. "')
AND i.NotifyOnQuote = '1' AND i.UserID != $LoggedUser[ID]");
while (list($UserID) = $DB->next_record()) {
while (list($UserID, $PushService) = $DB->next_record()) {
$QuoterID = db_string($LoggedUser['ID']);
$UserID = db_string($UserID);
$ForumID = db_string($ForumID);
@ -32,12 +35,16 @@
$DB->query("INSERT IGNORE INTO users_notify_quoted (UserID, QuoterID, ForumID, TopicID, PostID, Date)
VALUES ('$UserID', '$QuoterID', '$ForumID', '$TopicID', '$PostID', '" . sqltime() . "')");
$Cache->delete_value('forums_quotes_' . $UserID);
}
/*
* Validate the username and add it into the $Usernames array
*/
function add_username($Str) {
function add_username($Str)
{
global $Usernames;
$Matches = array();
if (preg_match('/\[quote=(.*)]/', $Str, $Matches)) {
@ -51,4 +58,5 @@ function add_username($Str) {
}
}
}
?>

2
sections/index/private.php
View File

@ -359,7 +359,7 @@
<div class="box" id="recommended">
<div class="head colhead_dark">
<strong>Latest vanity house additions</strong>
<a href="#" onclick="$('#vanityhouse').toggle();return false;">(View)</a>
<a href="#" onclick="$('#vanityhouse').toggle(); this.innerHTML=(this.innerHTML=='(Hide)'?'(Show)':'(Hide)'); return false;">(Show)</a>
</div>
<table class="torrent_table hidden" id="vanityhouse">

10
sections/rules/chat.php
View File

@ -68,11 +68,17 @@
<li>
No requesting invites to any sites anywhere on the site or IRC. Invites may be <strong>offered</strong> in the invite forum, and nowhere else.
</li>
<li>
No language other than English is permitted in the forums. If we can't understand it, we can't moderate it.
</li>
<li>
Do not include pornographic or semi-pornographic material in your posts.
Be cautious when posting mature content on the forums. All mature imagery must abide by <a href="wiki.php?action=article&id=1063">the rules found here</a>. Gratuitously sexual or violent content which falls outside of the allowable categories will result in a warning or worse.
</li>
<li>
No language other than English is permitted in the forums. If we can't understand it, we can't moderate it.
Mature content in posts must be properly tagged. The correct format is as follows: <strong>[mature=description] ...content... [/mature]</strong>, where “description” is a mandatory description of the post contents. Misleading or inadequate descriptions will be penalized.
</li>
<li>
Threads created for the exclusive purpose of posting mature imagery will be trashed. Mature content (including graphic album art) should be contextually relevant to the thread and/or forum you’re posting in. Mature content is only allowed in: The Lounge, The Lounge +1, Music, Power Users, Elite, Torrent Masters, VIPs, Comics, Contests & Designs, The Laboratory. If you are in doubt about a post’s appropriateness, send a <a href="staff.php">Staff PM to the Forum Moderators</a> and wait for a reply before proceeding.
</li>
</ul>
</div>

25
sections/user/edit.php
View File

@ -220,15 +220,13 @@ function checked($Checked) {
<label for="disablesmileys">Disable smileys</label>
</td>
</tr>
<? if(check_perms('users_warn')) { ?>
<tr>
<td class="label"><strong>Mature Content</strong></td>
<td>
<input type="checkbox" name="enablematurecontent" id="enablematurecontent" <? if (!empty($SiteOptions['EnableMatureContent'])) { ?>checked="checked"<? } ?> />
<label for="enablematurecontent">Show mature content</label>
</td>
</tr>
<? } ?>
<tr>
<td class="label"><strong>Mature Content</strong></td>
<td>
<input type="checkbox" name="enablematurecontent" id="enablematurecontent" <? if (!empty($SiteOptions['EnableMatureContent'])) { ?>checked="checked"<? } ?> />
<label for="enablematurecontent">Show mature content</label>
</td>
</tr>
<tr>
<td class="label"><strong>Avatars</strong></td>
<td>
@ -257,10 +255,11 @@ function checked($Checked) {
<option value="1" <? if($PushService == 1) { ?> selected="selected" <? } ?>/>Notify My Android</option>
<option value="2" <? if($PushService == 2) { ?> selected="selected" <? } ?>/>Prowl</option>
<option value="3" <? if($PushService == 3) { ?> selected="selected" <? } ?>/>Notifo</option>
</select>
<option value="4" <? if($PushService == 4) { ?> selected="selected" <? } ?>/>Super Toasty</option>
</select>
<div id="pushsettings" style="display: none">
<br />
<label for="pushkey">API Key</label>
<label id="pushservice_title" for="pushkey">API Key</label>
<input type="text" size="50" name="pushkey" id="pushkey" value="<?=display_str($PushOptions['PushKey'])?>" />
<div id="pushsettings_username" style="display: none">
<label for="pushusername">Username</label> <input type="text"
@ -272,7 +271,9 @@ function checked($Checked) {
<br />
<input type="checkbox" name="pushfilters[]" value="News" <? if(isset($PushOptions['PushFilters']['News'])) { ?> checked="checked" <? } ?>/>Announcements<br />
<input type="checkbox" name="pushfilters[]" value="PM" <? if(isset($PushOptions['PushFilters']['PM'])) { ?> checked="checked" <? } ?>/>Private Messages<br />
<!--
<input type="checkbox" name="pushfilters[]" value="Quote" <? if(isset($PushOptions['PushFilters']['Quote'])) { ?> checked="checked" <? } ?>/>Quote Notifications<br />
<!--
?>
<tr class="colhead_dark">
<td colspan="2">

7
static/functions/push_settings.js
View File

@ -15,6 +15,13 @@
else {
$('#pushsettings_username').hide();
}
if($(this).val() == 4) {
$('#pushservice_title').text("Device ID");
}
else {
$('#pushservice_title').text("API Key");
}
}
else {
$('#pushsettings').hide(500);