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

Empty commit

Browse Source
This commit is contained in:
Git 2013-11-02 08:01:09 +00:00
parent d0edb680ad
commit 1b6721a84f
18 changed files with 76 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
classes/donations.class.php
View File

@ -336,7 +336,7 @@ public static function get_donor_info($UserID) {
SecondAvatar
FROM donor_rewards
WHERE UserID = '$UserID'");
$Rewards = G::$DB->next_record(MYSQLI_ASSOC, false);
$Rewards = G::$DB->next_record(MYSQLI_ASSOC);
G::$DB->set_query_id($QueryID);
$DonorInfo = array(

11
classes/regex.php
View File

@ -1,13 +1,14 @@
<?
//resource_type://username:password@domain:port/path?query_string#anchor
define('RESOURCE_REGEX','(https?|ftps?):\/\/');
define('IP_REGEX','(\d{1,3}\.){3}\d{1,3}');
define('DOMAIN_REGEX','([a-z0-9\-\_]+\.)+[a-z]{2,6}');
define('PORT_REGEX', '\d{1,5}');
define('URL_REGEX','('.RESOURCE_REGEX.')('.IP_REGEX.'|'.DOMAIN_REGEX.')(:'.PORT_REGEX.')?(\/\S*)*');
define('RESOURCE_REGEX', '(https?|ftps?):\/\/');
define('IP_REGEX', '(\d{1,3}\.){3}\d{1,3}');
define('DOMAIN_REGEX', '([a-z0-9\-\_]+\.)*[a-z0-9\-\_]+');
define('PORT_REGEX', ':\d{1,5}');
define('URL_REGEX', '('.RESOURCE_REGEX.')('.IP_REGEX.'|'.DOMAIN_REGEX.')('.PORT_REGEX.')?(\/\S*)*');
define('USERNAME_REGEX', '/^[a-z0-9_?]{1,20}$/iD');
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('CSS_REGEX', URL_REGEX.'\/\S+\.css(\?\S*)?');
define('SITELINK_REGEX', RESOURCE_REGEX.'(ssl.)?'.preg_quote(NONSSL_SITE_URL, '/'));
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

14
classes/text.class.php
View File

@ -489,8 +489,8 @@ private function parse ($Str) {
case '#':
case '*':
$Array[$ArrayPos] = array('Type'=>'list');
$Array[$ArrayPos]['Val'] = explode('['.$TagName.']', $Block);
$Array[$ArrayPos]['ListType'] = ($TagName === '*' ? 'ul' : 'ol');
$Array[$ArrayPos]['Val'] = explode("[$TagName]", $Block);
$Array[$ArrayPos]['ListType'] = $TagName === '*' ? 'ul' : 'ol';
$Array[$ArrayPos]['Tag'] = $TagName;
foreach ($Array[$ArrayPos]['Val'] as $Key=>$Val) {
$Array[$ArrayPos]['Val'][$Key] = $this->parse(trim($Val));
@ -574,11 +574,11 @@ private function headline_level (&$ItemLevel, &$Level, &$List, $i, &$Offset) {
if ($Offset > 0) $List .= str_repeat('<li><ol>', $Offset - 2);
if ($ItemLevel > 1) {
$List .= ($i === 0 ? '<li>' : '');
$List .= ("\n<ol>\n");
$List .= $i === 0 ? '<li>' : '';
$List .= "\n<ol>\n";
}
} else {
$List .= ($i > 0 ? '</li>' : '<li>');
$List .= $i > 0 ? '</li>' : '<li>';
}
}
@ -671,7 +671,7 @@ private function to_html ($Array) {
$Str .= '<code>'.$Block['Val'].'</code>';
break;
case 'list':
$Str .= '<'.$Block['ListType'].'>';
$Str .= "<$Block[ListType] class=\"postlist\">";
foreach ($Block['Val'] as $Line) {
$Str .= '<li>'.$this->to_html($Line).'</li>';
@ -712,7 +712,7 @@ private function to_html ($Array) {
break;
case 'inlinesize':
case 'size':
$ValidAttribs = array('1','2','3','4','5','6','7','8','9','10');
$ValidAttribs = array('1', '2', '3', '4', '5', '6', '7', '8', '9', '10');
if (!in_array($Block['Attr'], $ValidAttribs)) {
$Str .= '[size='.$Block['Attr'].']'.$this->to_html($Block['Val']).'[/size]';
} else {

7
classes/users.class.php
View File

@ -442,8 +442,6 @@ public static function gen_crypt_salt() {
return $Salt;
}
/**
* Returns a username string for display
*
@ -478,9 +476,7 @@ public static function format_username($UserID, $Badges = false, $IsWarned = tru
$Username = $UserInfo['Username'];
$Paranoia = $UserInfo['Paranoia'];
$MaxClassOverride = MOD;
if ($UserInfo['Class'] < $Classes[$MaxClassOverride]['Level']) {
if ($UserInfo['Class'] < $Classes[MOD]['Level']) {
$OverrideParanoia = check_perms('users_override_paranoia', $UserInfo['Class']);
} else {
// Don't override paranoia for mods who don't want to show their donor heart
@ -541,7 +537,6 @@ public static function format_username($UserID, $Badges = false, $IsWarned = tru
. '><img src="'.STATIC_SERVER.'common/symbols/warned.png" alt="Warned" title="Warned'
. (G::$LoggedUser['ID'] === $UserID ? ' - Expires ' . date('Y-m-d H:i', strtotime($UserInfo['Warned'])) : '')
. '" /></a>' : '';
$Str .= ($IsEnabled && $UserInfo['Enabled'] == 2) ? '<a href="rules.php"><img src="'.STATIC_SERVER.'common/symbols/disabled.png" alt="Banned" title="Be good, and you won\'t end up like this user" /></a>' : '';
if ($Badges) {

58
design/privateheader.php
View File

@ -1,6 +1,7 @@
<?
define('FOOTER_FILE', SERVER_ROOT.'/design/privatefooter.php');
$HTTPS = ($_SERVER['SERVER_PORT'] == 443) ? 'ssl_' : '';
$UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster'];
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
@ -83,9 +84,8 @@
<link rel="stylesheet" type="text/css"
href="<?=STATIC_SERVER?>styles/global.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/global.css')?>" />
<?
$UseTooltipster = !isset(G::$LoggedUser['Tooltipster']) || G::$LoggedUser['Tooltipster'];
if ($UseTooltipster) { ?>
<link rel="stylesheet" href="<?=STATIC_SERVER?>styles/tooltipster/style.css" type="text/css" media="screen" />
<link rel="stylesheet" href="<?=STATIC_SERVER?>styles/tooltipster/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/tooltipster/style.css')?>" type="text/css" media="screen" />
<?
}
if ($Mobile) { ?>
@ -106,51 +106,34 @@
?>
<link rel="stylesheet" type="text/css" charset="utf-8"
href="<?=STATIC_SERVER?>styles/opendyslexic/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/opendyslexic/style.css')?>" />
<!--
<link rel="stylesheet" type="text/css" media="screen" title="OpenDyslexic"
href="<?=STATIC_SERVER?>styles/opendyslexic/style.css?v=<?=filemtime(SERVER_ROOT.'/static/styles/opendyslexic/style.css')?>" />
-->
<?
}
}
$ExtraCSS = explode(',', $CSSIncludes);
foreach ($ExtraCSS as $CSS) {
if (empty($CSS)) {
if (trim($CSS) == '') {
continue;
} ?>
<link rel="stylesheet" type="text/css" media="screen" href="<?=STATIC_SERVER?>styles/<?=$CSS?>/style.css" />
}
?>
<link rel="stylesheet" type="text/css" media="screen" href="<?=STATIC_SERVER."styles/$CSS/style.css?v=".filemtime(SERVER_ROOT."/static/styles/$CSS/style.css")?>" />
<?
}
?>
<script src="<?=STATIC_SERVER?>functions/jquery.js" type="text/javascript"></script>
<script
src="<?=STATIC_SERVER?>functions/script_start.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/script_start.js')?>"
type="text/javascript"></script>
<script
src="<?=STATIC_SERVER?>functions/ajax.class.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/ajax.class.js')?>"
type="text/javascript"></script>
<script type="text/javascript">
//<![CDATA[
var authkey = "<?=G::$LoggedUser['AuthKey']?>";
var userid = <?=G::$LoggedUser['ID']?>;
//]]>
</script>
<script
src="<?=STATIC_SERVER?>functions/global.js?v=<?=filemtime(SERVER_ROOT.'/static/functions/global.js')?>"
type="text/javascript"></script>
<script src="<?=STATIC_SERVER?>functions/jquery.autocomplete.js" type="text/javascript"></script>
<script src="<?=STATIC_SERVER?>functions/autocomplete.js" type="text/javascript"></script>
<? if ($UseTooltipster) { ?>
<script src="<?=STATIC_SERVER?>functions/tooltipster.js" type="text/javascript"></script>
<? } ?>
<script src="<?=STATIC_SERVER?>functions/tooltipster_settings.js" type="text/javascript"></script>
<?
$Scripts = explode(',', $JSIncludes);
$Scripts = array_merge(array('jquery', 'script_start', 'ajax.class', 'global', 'jquery.autocomplete', 'autocomplete'), explode(',', $JSIncludes));
if ($UseTooltipster) {
$Scripts[] = 'tooltipster';
}
$Scripts[] = 'tooltipster_settings';
foreach ($Scripts as $Script) {
if (empty($Script)) {
if (trim($Script) == '') {
continue;
}
?>
@ -257,39 +240,38 @@
<ul id="userinfo_minor"<?=$NewSubscriptions ? ' class="highlite"' : ''?>>
<li id="nav_inbox"<?=
Format::add_class($PageID, array('inbox'), 'active', true)?>>
<a onmousedown="Stats('inbox');" href="<?=Inbox::get_inbox_link(); ?>">Inbox</a>
<a href="<?=Inbox::get_inbox_link(); ?>">Inbox</a>
</li>
<li id="nav_staffinbox"<?=
Format::add_class($PageID, array('staffpm'), 'active', true)?>>
<a onmousedown="Stats('staffpm');" href="staffpm.php">Staff Inbox</a>
<a href="staffpm.php">Staff Inbox</a>
</li>
<li id="nav_uploaded"<?=
Format::add_class($PageID, array('torrents', false, 'uploaded'), 'active', true, 'userid')?>>
<a onmousedown="Stats('uploads');"
href="torrents.php?type=uploaded&amp;userid=<?=G::$LoggedUser['ID']?>">Uploads</a>
<a href="torrents.php?type=uploaded&amp;userid=<?=G::$LoggedUser['ID']?>">Uploads</a>
</li>
<li id="nav_bookmarks"<?=
Format::add_class($PageID, array('bookmarks'), 'active', true)?>>
<a onmousedown="Stats('bookmarks');" href="bookmarks.php?type=torrents">Bookmarks</a>
<a href="bookmarks.php?type=torrents">Bookmarks</a>
</li>
<? if (check_perms('site_torrents_notify')) { ?>
<li id="nav_notifications"<?=
Format::add_class($PageID, array(array('torrents', 'notify'), array('user', 'notify')), 'active', true, 'userid')?>>
<a onmousedown="Stats('notifications');" href="user.php?action=notify">Notifications</a>
<a href="user.php?action=notify">Notifications</a>
</li>
<? }
$ClassNames = $NewSubscriptions ? 'new-subscriptions' : '';
$ClassNames = trim($ClassNames.Format::add_class($PageID, array('userhistory', 'subscriptions'), 'active', false));
?>
<li id="nav_subscriptions"<?=$ClassNames ? " class=\"$ClassNames\"" : ''?>>
<a onmousedown="Stats('subscriptions');" href="userhistory.php?action=subscriptions">Subscriptions</a>
<a href="userhistory.php?action=subscriptions">Subscriptions</a>
</li>
<li id="nav_comments"<?=
Format::add_class($PageID, array('comments'), 'active', true, 'userid')?>>
<a onmousedown="Stats('comments');" href="comments.php">Comments</a></li>
<a href="comments.php">Comments</a></li>
<li id="nav_friends"<?=
Format::add_class($PageID, array('friends'), 'active', true)?>>
<a onmousedown="Stats('friends');" href="friends.php">Friends</a></li>
<a href="friends.php">Friends</a></li>
</ul>
</div>
<div id="menu">

3
docs/CHANGES.txt
View File

@ -1,5 +1,8 @@
CHANGE LOG
2013-11-02 by alderaan
Highlight "Urgent" reports in the Reports v2 system
2013-10-31 by porkpie
Albums with the same vote score are tied on toplists

1
sections/forums/index.php
View File

@ -96,7 +96,6 @@
case 'warn':
require(SERVER_ROOT.'/sections/forums/warn.php');
break;
default:
error(404);
}

1
sections/forums/thread.php
View File

@ -493,7 +493,6 @@
- <a href="#" onclick="$('#warn<?=$PostID?>').raw().submit(); return false;" class="brackets">Warn</a>
<? }
}
?>
&nbsp;
<a href="#">&uarr;</a>

5
sections/reportsv2/ajax_update_resolve.php
View File

@ -40,4 +40,7 @@
die();
}
$DB->query("UPDATE reportsv2 SET Type = '".$NewType."' WHERE ID=".$ReportID);
$DB->query("
UPDATE reportsv2
SET Type = '$NewType'
WHERE ID = $ReportID");

2
sections/reportsv2/views.php
View File

@ -293,7 +293,7 @@
}
}
?>
<tr>
<tr<?=$Title === 'Urgent' ? ' class="rowa" style="font-weight: bold;"' : ''?>>
<td>
<a href="reportsv2.php?view=type&amp;id=<?=display_str($Array['Type'])?>"><?=display_str($Title)?></a>
</td>

8
sections/requests/request.php
View File

@ -120,13 +120,17 @@
<? if ($Request['CategoryID'] !== '0') { ?>
<div class="box box_image box_image_albumart box_albumart"><!-- .box_albumart deprecated -->
<div class="head"><strong>Cover</strong></div>
<div id="covers">
<div class="pad">
<?
if (!empty($Request['Image'])) {
?>
<p align="center"><img style="max-width: 220px;" src="<?=ImageTools::process($Request['Image'], true)?>" alt="<?=$FullName?>" onclick="lightbox.init('<?=ImageTools::process($Request['Image'])?>', 220);" /></p>
<p align="center"><img style="width: 100%;" src="<?=ImageTools::process($Request['Image'], true)?>" alt="<?=$FullName?>" onclick="lightbox.init('<?=ImageTools::process($Request['Image'])?>', 220);" /></p>
<? } else { ?>
<p align="center"><img src="<?=STATIC_SERVER?>common/noartwork/<?=$CategoryIcons[$Request['CategoryID'] - 1]?>" alt="<?=$CategoryName?>" title="<?=$CategoryName?>" width="220" height="220" border="0" /></p>
<p align="center"><img style="width: 100%;" src="<?=STATIC_SERVER?>common/noartwork/<?=$CategoryIcons[$Request['CategoryID'] - 1]?>" alt="<?=$CategoryName?>" title="<?=$CategoryName?>" height="220" border="0" /></p>
<? } ?>
</div>
</div>
</div>
<?
}

16
sections/tools/development/render_base.html
View File

@ -39,14 +39,14 @@ <h1 class="hidden">Gazelle</h1>
</ul>
<ul id="userinfo_minor">
<li id="nav_inbox"><a onmousedown="Stats('inbox');" href="#">Inbox</a></li>
<li id="nav_staffinbox"><a onmousedown="Stats('staffpm');" href="#">Staff Inbox</a></li>
<li id="nav_uploaded"><a onmousedown="Stats('uploads');" href="#">Uploads</a></li>
<li id="nav_bookmarks"><a onmousedown="Stats('bookmarks');" href="#">Bookmarks</a></li>
<li id="nav_notifications" ><a onmousedown="Stats('notifications');" href="#">Notifications</a></li>
<li id="nav_subscriptions"><a onmousedown="Stats('subscriptions');" href="#">Subscriptions</a></li>
<li id="nav_comments"><a onmousedown="Stats('comments');" href="#">Comments</a></li>
<li id="nav_friends"><a onmousedown="Stats('friends');" href="#">Friends</a></li>
<li id="nav_inbox"><a href="#">Inbox</a></li>
<li id="nav_staffinbox"><a href="#">Staff Inbox</a></li>
<li id="nav_uploaded"><a href="#">Uploads</a></li>
<li id="nav_bookmarks"><a href="#">Bookmarks</a></li>
<li id="nav_notifications" ><a href="#">Notifications</a></li>
<li id="nav_subscriptions"><a href="#">Subscriptions</a></li>
<li id="nav_comments"><a href="#">Comments</a></li>
<li id="nav_friends"><a href="#">Friends</a></li>
</ul>
</div>
<div id="menu">

12
sections/user/takeedit.php
View File

@ -20,7 +20,7 @@
}
$Val->SetFields('stylesheet', 1, "number", "You forgot to select a stylesheet.");
$Val->SetFields('styleurl', 0, "regex", "You did not enter a valid stylesheet URL.", array('regex' => '/^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})?(\/[^<>]+)+\.css$/i'));
$Val->SetFields('styleurl', 0, "regex", "You did not enter a valid stylesheet URL.", array('regex' => '/^'.CSS_REGEX.'$/i'));
// The next two are commented out because the drop-down menus were replaced with a check box and radio buttons
//$Val->SetFields('disablegrouping', 0, "number", "You forgot to select your torrent grouping option.");
//$Val->SetFields('torrentgrouping', 0, "number", "You forgot to select your torrent grouping option.");
@ -299,16 +299,16 @@
$Cache->begin_transaction("user_info_$UserID");
$Cache->update_row(false, array(
'Avatar'=>$_POST['avatar'],
'Paranoia'=>$Paranoia
'Avatar' => display_str($_POST['avatar']),
'Paranoia' => $Paranoia
));
$Cache->commit_transaction(0);
$Cache->begin_transaction("user_info_heavy_$UserID");
$Cache->update_row(false, array(
'StyleID'=>$_POST['stylesheet'],
'StyleURL'=>$_POST['styleurl'],
'DownloadAlt'=>$DownloadAlt
'StyleID' => $_POST['stylesheet'],
'StyleURL' => display_str($_POST['styleurl']),
'DownloadAlt' => $DownloadAlt
));
$Cache->update_row(false, $Options);
$Cache->commit_transaction(0);

4
static/functions/global.js
View File

@ -126,10 +126,6 @@ function remove_selection(index) {
$('#opt' + index).raw().disabled='';
}
function Stats(stat) {
ajax.get("ajax.php?action=stats&stat=" + stat);
}
// Thank you http://stackoverflow.com/questions/4578398/selecting-all-text-within-a-div-on-a-single-left-click-with-javascript
function select_all(el) {
if (typeof window.getSelection != "undefined" && typeof document.createRange != "undefined") {

2
static/functions/tooltipster_settings.js
View File

@ -3,7 +3,7 @@ $(document).ready(function() {
if (!$.fn.tooltipster) {
$('.tooltip_interactive, .tooltip_image, .tooltip, .tooltip_gold').each(function() {
if ($(this).data('title-plain')) {
$(this).attr('title', $(this).data('title-plain'));
$(this).attr('title', $(this).data('title-plain')).removeData('title-plain');
}
});
return;

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

@ -882,3 +882,7 @@ div[class~=tooltipster-content] > a {
div.sidebar #event_div {
margin-left: -232px;
}
ol {
margin-left: 1em;
}

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

@ -934,3 +934,7 @@ tr.torrent .bookmark > a:after { color:#999; }
div.sidebar #event_div {
margin-left: -232px;
}
ol {
margin-left: 1em;
}

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

@ -845,3 +845,7 @@ div[class~=tooltipster-content] > a {
div.sidebar #event_div {
margin-left: -232px;
}
ol {
margin-left: 1em;
}