@@ -51,8 +51,8 @@ public static function render_events($Events) {
private static function render_tags($Tags) {
$Tags = explode(',', $Tags);
natcasesort($Tags);
- $FormattedTags = "";
- foreach($Tags as $Tag) {
+ $FormattedTags = '';
+ foreach ($Tags as $Tag) {
$FormattedTags .= "
" . $Tag . ", ";
}
echo rtrim($FormattedTags, ', ');
@@ -87,7 +87,7 @@ public static function render_search() { ?>
@@ -95,7 +95,7 @@ public static function render_search() { ?>
@@ -143,7 +143,7 @@ public static function render_edit_form($Event) { ?>
@@ -155,7 +155,7 @@ public static function render_edit_form($Event) { ?>
@@ -168,7 +168,7 @@ public static function render_edit_form($Event) { ?>
@@ -207,4 +207,4 @@ public static function render_recent_sidebar($Events) { ?>
get_query_id();
+ /*
+ * Explanation of the parameters PageID and Page: Page contains where
+ * this quote comes from and can be forums, artist, collages, requests
+ * or torrents. The PageID contains the additional value that is
+ * necessary for the users_notify_quoted table. The PageIDs for the
+ * different Page are: forums: TopicID artist: ArtistID collages:
+ * CollageID requests: RequestID torrents: GroupID
+ */
+ $Matches = array();
+ preg_match_all('/\[quote(?:=(.*)(?:\|.*)?)?]|\[\/quote]/iU', $Body, $Matches, PREG_SET_ORDER);
+
+ if (count($Matches)) {
+ $Usernames = array();
+ $Level = 0;
+ foreach ($Matches as $M) {
+ if ($M[0] != '[/quote]') {
+ if ($Level == 0 && isset($M[1]) && strlen($M[1]) > 0 && preg_match(USERNAME_REGEX, $M[1])) {
+ $Usernames[] = preg_replace('/(^[.,]*)|([.,]*$)/', '', $M[1]); // wut?
+ }
+ ++$Level;
+ } else {
+ --$Level;
+ }
+ }
+ }
+ // remove any dupes in the array (the fast way)
+ $Usernames = array_flip(array_flip($Usernames));
+
+
+ G::$DB->query("
+ SELECT m.ID
+ FROM users_main AS m
+ LEFT JOIN users_info AS i ON i.UserID = m.ID
+ WHERE m.Username IN ('" . implode("', '", $Usernames) . "')
+ AND i.NotifyOnQuote = '1'
+ AND i.UserID != " . G::$LoggedUser['ID']);
+
+
+ $Results = G::$DB->to_array();
+ foreach ($Results as $Result) {
+ $UserID = db_string($Result['ID']);
+ $QuoterID = db_string(G::$LoggedUser['ID']);
+ $Page = db_string($Page);
+ $PageID = db_string($PageID);
+ $PostID = db_string($PostID);
+
+ G::$DB->query("
+ INSERT IGNORE INTO users_notify_quoted
+ (UserID, QuoterID, Page, PageID, PostID, Date)
+ VALUES
+ ('$UserID', '$QuoterID', '$Page', '$PageID', '$PostID', '" . sqltime() . "')");
+ G::$Cache->delete_value('notify_quoted_' . $UserID);
+
+ }
+ G::$DB->set_query_id($QueryID);
+ }
+
+ /**
+ * (Un)subscribe from a forum thread.
+ * If UserID == 0, G::$LoggedUser[ID] is used
+ * @param int $TopicID
+ * @param int $UserID
+ */
+ public static function subscribe($TopicID, $UserID = 0) {
+ if ($UserID == 0) {
+ $UserID = G::$LoggedUser['ID'];
+ }
+ $QueryID = G::$DB->get_query_id();
+ $UserSubscriptions = self::get_subscriptions();
+ $Key = self::has_subscribed($TopicID);
+ if ($Key !== false) {
+ G::$DB->query('DELETE FROM users_subscriptions WHERE UserID = ' . db_string($UserID) . ' AND TopicID = ' . db_string($TopicID));
+ unset($UserSubscriptions[$Key]);
+ } else {
+ G::$DB->query("INSERT IGNORE INTO users_subscriptions (UserID, TopicID) VALUES ($UserID, " . db_string($TopicID) . ")");
+ array_push($UserSubscriptions, $TopicID);
+ }
+ G::$Cache->replace_value('subscriptions_user_' . $UserID, $UserSubscriptions, 0);
+ G::$Cache->delete_value('subscriptions_user_new_' . $UserID);
+ G::$DB->set_query_id($QueryID);
+ }
+
+ /**
+ * (Un)subscribe from comments.
+ * If UserID == 0, G::$LoggedUser[ID] is used
+ * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
+ * @param int $PageID ArtistID, CollageID, RequestID or GroupID
+ * @param int $UserID
+ */
+ public static function subscribe_comments($Page, $PageID, $UserID = 0) {
+ if ($UserID == 0) {
+ $UserID = G::$LoggedUser['ID'];
+ }
+ $QueryID = G::$DB->get_query_id();
+ $UserCommentSubscriptions = self::get_comment_subscriptions();
+ $Key = self::has_subscribed_comments($Page, $PageID);
+ if ($Key !== false) {
+ G::$DB->query("DELETE FROM users_subscriptions_comments WHERE UserID = " . db_string($UserID) . " AND Page = '" . db_string($Page) . "' AND PageID = " . db_string($PageID));
+ unset($UserCommentSubscriptions[$Key]);
+ } else {
+ G::$DB->query("INSERT IGNORE INTO users_subscriptions_comments (UserID, Page, PageID) VALUES ($UserID, '" . db_string($Page) . "', " . db_string($PageID) . ")");
+ array_push($UserCommentSubscriptions, array($Page, $PageID));
+ }
+ G::$Cache->replace_value('subscriptions_comments_user_' . $UserID, $UserCommentSubscriptions, 0);
+ G::$Cache->delete_value('subscriptions_comments_user_new_' . $UserID);
+ G::$DB->set_query_id($QueryID);
+ }
+
+ /**
+ * Read $UserID's subscriptions. If the cache key isn't set, it gets filled.
+ * If UserID == 0, G::$LoggedUser[ID] is used
+ * @param int $UserID
+ * @return array Array of TopicIDs
+ */
+ public static function get_subscriptions($UserID = 0) {
+ if ($UserID == 0) {
+ $UserID = G::$LoggedUser['ID'];
+ }
+ $QueryID = G::$DB->get_query_id();
+ $UserSubscriptions = G::$Cache->get_value('subscriptions_user_' . $UserID);
+ if ($UserSubscriptions === false) {
+ G::$DB->query('SELECT TopicID FROM users_subscriptions WHERE UserID = ' . db_string($UserID));
+ $UserSubscriptions = G::$DB->collect(0);
+ G::$Cache->cache_value('subscriptions_user_' . $UserID, $UserSubscriptions, 0);
+ }
+ G::$DB->set_query_id($QueryID);
+ return $UserSubscriptions;
+ }
+
+ /**
+ * Same as self::get_subscriptions, but for comment subscriptions
+ * @param int $UserID
+ * @return array Array of ($Page, $PageID)
+ */
+ public static function get_comment_subscriptions($UserID = 0) {
+ if ($UserID == 0) {
+ $UserID = G::$LoggedUser['ID'];
+ }
+ $QueryID = G::$DB->get_query_id();
+ $UserCommentSubscriptions = G::$Cache->get_value('subscriptions_comments_user_' . $UserID);
+ if ($UserCommentSubscriptions === false) {
+ G::$DB->query('SELECT Page, PageID FROM users_subscriptions_comments WHERE UserID = ' . db_string($UserID));
+ $UserCommentSubscriptions = G::$DB->to_array(false, MYSQLI_NUM);
+ G::$Cache->cache_value('subscriptions_comments_user_' . $UserID, $UserCommentSubscriptions, 0);
+ }
+ G::$DB->set_query_id($QueryID);
+ return $UserCommentSubscriptions;
+ }
+
+ /**
+ * Returns whether or not the current user has new subscriptions. This handles both forum and comment subscriptions.
+ * @return int Number of unread subscribed threads/comments
+ */
+ public static function has_new_subscriptions() {
+ $QueryID = G::$DB->get_query_id();
+
+ $NewSubscriptions = G::$Cache->get_value('subscriptions_user_new_' . G::$LoggedUser['ID']);
+ if ($NewSubscriptions === false) {
+ // forum subscriptions
+ G::$DB->query("SELECT COUNT(1)
+ FROM users_subscriptions AS s
+ LEFT JOIN forums_last_read_topics AS l ON l.UserID = s.UserID AND l.TopicID = s.TopicID
+ JOIN forums_topics AS t ON t.ID = s.TopicID
+ JOIN forums AS f ON f.ID = t.ForumID
+ WHERE " . Forums::user_forums_sql() . "
+ AND IF(t.IsLocked = '1' AND t.IsSticky = '0'" . ", t.LastPostID, IF(l.PostID IS NULL, 0, l.PostID)) < t.LastPostID
+ AND s.UserID = " . G::$LoggedUser['ID']);
+ list($NewForumSubscriptions) = G::$DB->next_record();
+
+ // comment subscriptions
+ G::$DB->query("SELECT COUNT(1)
+ FROM users_subscriptions_comments AS s
+ LEFT JOIN users_comments_last_read AS lr ON lr.UserID = s.UserID AND lr.Page = s.Page AND lr.PageID = s.PageID
+ LEFT JOIN comments AS c ON c.ID = (SELECT MAX(ID) FROM comments WHERE Page = s.Page AND PageID = s.PageID)
+ LEFT JOIN collages AS co ON s.Page = 'collages' AND co.ID = s.PageID
+ WHERE s.UserID = " . G::$LoggedUser['ID'] . "
+ AND (s.Page != 'collages' OR co.Deleted = '0')
+ AND IF(lr.PostID IS NULL, 0, lr.PostID) < c.ID");
+ list($NewCommentSubscriptions) = G::$DB->next_record();
+
+ $NewSubscriptions = $NewForumSubscriptions + $NewCommentSubscriptions;
+ G::$Cache->cache_value('subscriptions_user_new_' . G::$LoggedUser['ID'], $NewSubscriptions, 0);
+ }
+ G::$DB->set_query_id($QueryID);
+ return (int)$NewSubscriptions;
+ }
+
+ /**
+ * Returns whether or not the current user has new quote notifications.
+ * @return int Number of unread quote notifications
+ */
+ public static function has_new_quote_notifications() {
+ $QuoteNotificationsCount = G::$Cache->get_value('notify_quoted_' . G::$LoggedUser['ID']);
+ if ($QuoteNotificationsCount === false) {
+ $sql = "
+ SELECT COUNT(1)
+ FROM users_notify_quoted AS q
+ LEFT JOIN forums_topics AS t ON t.ID = q.PageID
+ LEFT JOIN forums AS f ON f.ID = t.ForumID
+ LEFT JOIN collages AS c ON q.Page = 'collages' AND c.ID = q.PageID
+ WHERE q.UserID = " . G::$LoggedUser['ID'] . "
+ AND q.UnRead
+ AND (q.Page != 'forums' OR " . Forums::user_forums_sql() . ")
+ AND (q.Page != 'collages' OR c.Deleted = '0')";
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query($sql);
+ list($QuoteNotificationsCount) = G::$DB->next_record();
+ G::$DB->set_query_id($QueryID);
+ G::$Cache->cache_value('notify_quoted_' . G::$LoggedUser['ID'], $QuoteNotificationsCount, 0);
+ }
+ return (int)$QuoteNotificationsCount;
+ }
+
+ /**
+ * Returns the key which holds this $TopicID in the subscription array.
+ * Use type-aware comparison operators with this! (ie. if (self::has_subscribed($TopicID) !== false) { ... })
+ * @param int $TopicID
+ * @return bool|int
+ */
+ public static function has_subscribed($TopicID) {
+ $UserSubscriptions = self::get_subscriptions();
+ return array_search($TopicID, $UserSubscriptions);
+ }
+
+ /**
+ * Same as has_subscribed, but for comment subscriptions.
+ * @param string $Page 'artist', 'collages', 'requests' or 'torrents'
+ * @param int $PageID
+ * @return bool|int
+ */
+ public static function has_subscribed_comments($Page, $PageID) {
+ $UserCommentSubscriptions = self::get_comment_subscriptions();
+ return array_search(array($Page, $PageID), $UserCommentSubscriptions);
+ }
+
+ /**
+ * Clear the subscription cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
+ * @param type $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+ * @param type $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+ */
+ public static function flush_subscriptions($Page, $PageID) {
+ $QueryID = G::$DB->get_query_id();
+ if ($Page == 'forums') {
+ G::$DB->query("SELECT UserID FROM users_subscriptions WHERE TopicID = '$PageID'");
+ } else {
+ G::$DB->query("SELECT UserID FROM users_subscriptions_comments WHERE Page = '$Page' AND PageID = '$PageID'");
+ }
+ $Subscribers = G::$DB->collect('UserID');
+ foreach($Subscribers as $Subscriber) {
+ G::$Cache->delete_value('subscriptions_user_new_'.$Subscriber);
+ }
+ G::$DB->set_query_id($QueryID);
+ }
+
+ /**
+ * Move all $Page subscriptions from $OldPageID to $NewPageID (for example when merging torrent groups).
+ * Passing $NewPageID = null will delete the subscriptions.
+ * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+ * @param int $OldPageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+ * @param int|null $NewPageID As $OldPageID, or null to delete the subscriptions
+ */
+ public static function move_subscriptions($Page, $OldPageID, $NewPageID) {
+ self::flush_subscriptions($Page, $OldPageID);
+ $QueryID = G::$DB->get_query_id();
+ if ($Page == 'forums') {
+ if ($NewPageID !== null) {
+ G::$DB->query("UPDATE IGNORE users_subscriptions SET TopicID = '$NewPageID' WHERE TopicID = '$OldPageID'");
+ // explanation see below
+ G::$DB->query("UPDATE IGNORE forums_last_read_topics SET TopicID = $NewPageID WHERE TopicID = $OldPageID");
+ G::$DB->query("
+ SELECT UserID, MIN(PostID)
+ FROM forums_last_read_topics
+ WHERE TopicID IN ($OldPageID, $NewPageID)
+ GROUP BY UserID
+ HAVING COUNT(1) = 2");
+ $Results = G::$DB->to_array(false, MYSQLI_NUM);
+ foreach ($Results as $Result) {
+ G::$DB->query("UPDATE forums_last_read_topics SET PostID = $Result[1] WHERE TopicID = $NewPageID AND UserID = $Result[0]");
+ }
+ }
+ G::$DB->query("DELETE FROM users_subscriptions WHERE TopicID = '$OldPageID'");
+ G::$DB->query("DELETE FROM forums_last_read_topics WHERE TopicID = $OldPageID");
+ } else {
+ if($NewPageID !== null) {
+ G::$DB->query("UPDATE IGNORE users_subscriptions_comments SET PageID = '$NewPageID' WHERE Page = '$Page' AND PageID = '$OldPageID'");
+ // last read handling
+ // 1) update all rows that have no key collisions (i.e. users that haven't previously read both pages or if there are only comments on one page)
+ G::$DB->query("UPDATE IGNORE users_comments_last_read SET PageID = '$NewPageID' WHERE Page = '$Page' AND PageID = $OldPageID");
+ // 2) get all last read records with key collisions (i.e. there are records for one user for both PageIDs)
+ G::$DB->query("
+ SELECT UserID, MIN(PostID)
+ FROM users_comments_last_read
+ WHERE Page = '$Page'
+ AND PageID IN ($OldPageID, $NewPageID)
+ GROUP BY UserID
+ HAVING COUNT(1) = 2");
+ $Results = G::$DB->to_array(false, MYSQLI_NUM);
+ // 3) update rows for those people found in 2) to the earlier post
+ foreach ($Results as $Result) {
+ G::$DB->query("UPDATE users_comments_last_read SET PostID = $Result[1] WHERE Page = '$Page' AND PageID = $NewPageID AND UserID = $Result[0]");
+ }
+ }
+ G::$DB->query("DELETE FROM users_subscriptions_comments WHERE Page = '$Page' AND PageID = '$OldPageID'");
+ G::$DB->query("DELETE FROM users_comments_last_read WHERE Page = '$Page' AND PageID = '$OldPageID'");
+ }
+ G::$DB->set_query_id($QueryID);
+ }
+
+ /**
+ * Clear the quote notification cache for all subscribers of a forum thread or artist/collage/request/torrent comments.
+ * @param string $Page 'forums', 'artist', 'collages', 'requests' or 'torrents'
+ * @param int $PageID TopicID, ArtistID, CollageID, RequestID or GroupID, respectively
+ */
+ public static function flush_quote_notifications($Page, $PageID) {
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("SELECT UserID FROM users_notify_quoted WHERE Page = '$Page' AND PageID = $PageID");
+ $Subscribers = G::$DB->collect('UserID');
+ foreach($Subscribers as $Subscriber) {
+ G::$Cache->delete_value('notify_quoted_'.$Subscriber);
+ }
+ G::$DB->set_query_id($QueryID);
+ }
+}
diff --git a/classes/text.class.php b/classes/text.class.php
index 1b3550b7..316d0e2d 100644
--- a/classes/text.class.php
+++ b/classes/text.class.php
@@ -727,9 +727,10 @@ private function to_html ($Array) {
}
if (!empty($Block['Attr'])) {
$Exploded = explode('|', $this->to_html($Block['Attr']));
- if (isset($Exploded[1]) && is_numeric($Exploded[1])) {
+ if (isset($Exploded[1]) && (is_numeric($Exploded[1]) || (in_array($Exploded[1][0], array('a', 't', 'c', 'r')) && is_numeric(substr($Exploded[1], 1))))) {
+ // the part after | is either a number or starts with a, t, c or r, followed by a number (forum post, artist comment, torrent comment, collage comment or request comment, respectively)
$PostID = trim($Exploded[1]);
- $Str .= '
wrote: ';
+ $Str .= '
wrote: ';
}
else {
$Str .= ' wrote: ';
@@ -747,8 +748,7 @@ private function to_html ($Array) {
$Str .= '
'.$this->to_html($Block['Val']).'
';
break;
case 'mature':
- global $LoggedUser;
- if ($LoggedUser['EnableMatureContent']) {
+ if (G::$LoggedUser['EnableMatureContent']) {
if (!empty($Block['Attr'])) {
$Str .= '
Mature content: ' . $Block['Attr'] . ' Show';
$Str .= '
'.$this->to_html($Block['Val']).'
';
@@ -758,7 +758,7 @@ private function to_html ($Array) {
}
}
else {
- $Str .= '
Mature content has been blocked. You can choose to view mature content by editing your settings.';
+ $Str .= '
Mature content has been blocked. You can choose to view mature content by editing your settings.';
}
break;
case 'img':
@@ -905,8 +905,7 @@ private function raw_text ($Array) {
}
private function smileys ($Str) {
- global $LoggedUser;
- if (!empty($LoggedUser['DisableSmileys'])) {
+ if (!empty(G::$LoggedUser['DisableSmileys'])) {
return $Str;
}
$Str = strtr($Str, $this->Smileys);
diff --git a/classes/time.class.php b/classes/time.class.php
index bd12bd0b..3139bb54 100644
--- a/classes/time.class.php
+++ b/classes/time.class.php
@@ -62,69 +62,69 @@ function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false) {
if ($Years > 0 && $Levels > 0) {
if ($Years > 1) {
- $Return .= $Years.' years';
+ $Return .= "$Years years";
} else {
- $Return .= $Years.' year';
+ $Return .= "$Years year";
}
$Levels--;
}
if ($Months > 0 && $Levels > 0) {
if ($Return != '') {
- $Return.=', ';
+ $Return .= ', ';
}
if ($Months > 1) {
- $Return.=$Months.' months';
+ $Return .= "$Months months";
} else {
- $Return.=$Months.' month';
+ $Return .= "$Months month";
}
$Levels--;
}
if ($Weeks > 0 && $Levels > 0) {
if ($Return != '') {
- $Return.=', ';
+ $Return .= ', ';
}
- if ($Weeks>1) {
- $Return.=$Weeks.' weeks';
+ if ($Weeks > 1) {
+ $Return .= "$Weeks weeks";
} else {
- $Return.=$Weeks.' week';
+ $Return .= "$Weeks week";
}
$Levels--;
}
if ($Days > 0 && $Levels > 0) {
if ($Return != '') {
- $Return.=', ';
+ $Return .= ', ';
}
if ($Days > 1) {
- $Return.=$Days.' days';
+ $Return .= "$Days days";
} else {
- $Return.=$Days.' day';
+ $Return .= "$Days day";
}
$Levels--;
}
if ($Hours > 0 && $Levels > 0) {
if ($Return != '') {
- $Return.=', ';
+ $Return .= ', ';
}
if ($Hours > 1) {
- $Return.=$Hours.' hours';
+ $Return .= "$Hours hours";
} else {
- $Return.=$Hours.' hour';
+ $Return .= "$Hours hour";
}
$Levels--;
}
if ($Minutes > 0 && $Levels > 0) {
if ($Return != '') {
- $Return.=' and ';
+ $Return .= ' and ';
}
if ($Minutes > 1) {
- $Return.=$Minutes.' mins';
+ $Return .= "$Minutes mins";
} else {
- $Return.=$Minutes.' min';
+ $Return .= "$Minutes min";
}
$Levels--;
}
@@ -140,7 +140,7 @@ function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false) {
}
if ($Span) {
- return '
'.$Return.'';
+ return '
'.$Return.'';
} else {
return $Return;
}
diff --git a/classes/tools.class.php b/classes/tools.class.php
index 99f53271..648b2a79 100644
--- a/classes/tools.class.php
+++ b/classes/tools.class.php
@@ -6,18 +6,20 @@ class Tools {
* @param string $IP
*/
public static function site_ban_ip($IP) {
- global $DB, $Cache, $Debug;
+ global $Debug;
$A = substr($IP, 0, strcspn($IP, '.'));
$IPNum = Tools::ip_to_unsigned($IP);
- $IPBans = $Cache->get_value('ip_bans_'.$A);
+ $IPBans = G::$Cache->get_value('ip_bans_'.$A);
if (!is_array($IPBans)) {
$SQL = sprintf("
SELECT ID, FromIP, ToIP
FROM ip_bans
WHERE FromIP BETWEEN %d << 24 AND (%d << 24) - 1", $A, $A + 1);
- $DB->query($SQL);
- $IPBans = $DB->to_array(0, MYSQLI_NUM);
- $Cache->cache_value('ip_bans_'.$A, $IPBans, 0);
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query($SQL);
+ $IPBans = G::$DB->to_array(0, MYSQLI_NUM);
+ G::$DB->set_query_id($QueryID);
+ G::$Cache->cache_value('ip_bans_'.$A, $IPBans, 0);
}
$Debug->log_var($IPBans, 'IP bans for class '.$A);
foreach ($IPBans as $Index => $IPBan) {
@@ -59,16 +61,17 @@ public static function geoip($IP) {
if (!$Long || $Long == 2130706433) { // No need to check cc for 127.0.0.1
return false;
}
- global $DB;
- $DB->query("
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
SELECT EndIP, Code
FROM geoip_country
WHERE $Long >= StartIP
ORDER BY StartIP DESC
LIMIT 1");
- if ((!list($EndIP, $Country) = $DB->next_record()) || $EndIP < $Long) {
+ if ((!list($EndIP, $Country) = G::$DB->next_record()) || $EndIP < $Long) {
$Country = '?';
}
+ G::$DB->set_query_id($QueryID);
$IPs[$IP] = $Country;
return $Country;
}
@@ -115,7 +118,7 @@ public static function get_host_by_ajax($IP) {
* @return string the host.
*/
public static function lookup_ip($IP) {
- //TODO: use the $Cache
+ //TODO: use the G::$Cache
$Output = explode(' ',shell_exec('host -W 1 '.escapeshellarg($IP)));
if (count($Output) == 1 && empty($Output[0])) {
//No output at all implies the command failed
@@ -145,7 +148,7 @@ public static function display_ip($IP) {
public static function get_country_code_by_ajax($IP) {
static $ID = 0;
++$ID;
- return '
Resolving CC...';
+ return '
Resolving CC...';
}
@@ -156,11 +159,11 @@ public static function get_country_code_by_ajax($IP) {
* @param BanReason 0 - Unknown, 1 - Manual, 2 - Ratio, 3 - Inactive, 4 - Unused.
*/
public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
- global $Cache, $DB;
+ $QueryID = G::$DB->get_query_id();
if (!is_array($UserIDs)) {
$UserIDs = array($UserIDs);
}
- $DB->query("
+ G::$DB->query("
UPDATE users_info AS i
JOIN users_main AS m ON m.ID=i.UserID
SET m.Enabled='2',
@@ -170,35 +173,35 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
i.BanReason='$BanReason',
i.RatioWatchDownload=".($BanReason == 2 ? 'm.Downloaded' : "'0'")."
WHERE m.ID IN(".implode(',', $UserIDs).') ');
- $Cache->decrement('stats_user_count', $DB->affected_rows());
+ G::$Cache->decrement('stats_user_count', G::$DB->affected_rows());
foreach ($UserIDs as $UserID) {
- $Cache->delete_value('enabled_'.$UserID);
- $Cache->delete_value('user_info_'.$UserID);
- $Cache->delete_value('user_info_heavy_'.$UserID);
- $Cache->delete_value('user_stats_'.$UserID);
+ G::$Cache->delete_value("enabled_$UserID");
+ G::$Cache->delete_value("user_info_$UserID");
+ G::$Cache->delete_value("user_info_heavy_$UserID");
+ G::$Cache->delete_value("user_stats_$UserID");
- $DB->query("
+ G::$DB->query("
SELECT SessionID
FROM users_sessions
- WHERE UserID='$UserID'
+ WHERE UserID = '$UserID'
AND Active = 1");
- while (list($SessionID) = $DB->next_record()) {
- $Cache->delete_value('session_'.$UserID.'_'.$SessionID);
+ while (list($SessionID) = G::$DB->next_record()) {
+ G::$Cache->delete_value("session_$UserID"."_$SessionID");
}
- $Cache->delete_value('users_sessions_'.$UserID);
+ G::$Cache->delete_value("users_sessions_$UserID");
- $DB->query("
+ G::$DB->query("
DELETE FROM users_sessions
- WHERE UserID='$UserID'");
+ WHERE UserID = '$UserID'");
}
// Remove the users from the tracker.
- $DB->query("
+ G::$DB->query('
SELECT torrent_pass
FROM users_main
- WHERE ID in (".implode(', ', $UserIDs).')');
- $PassKeys = $DB->collect('torrent_pass');
+ WHERE ID in ('.implode(', ', $UserIDs).')');
+ $PassKeys = G::$DB->collect('torrent_pass');
$Concat = '';
foreach ($PassKeys as $PassKey) {
if (strlen($Concat) > 3950) { // Ocelot's read buffer is 4 KiB and anything exceeding it is truncated
@@ -209,6 +212,7 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
}
}
Tracker::update_tracker('remove_users', array('passkeys' => $Concat));
+ G::$DB->set_query_id($QueryID);
}
/**
@@ -219,49 +223,51 @@ public static function disable_users($UserIDs, $AdminComment, $BanReason = 1) {
* @param string $reason
*/
public static function warn_user($UserID, $Duration, $Reason) {
- global $LoggedUser, $DB, $Cache, $Time;
+ global $Time;
- $DB->query("
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query("
SELECT Warned
FROM users_info
- WHERE UserID=$UserID
+ WHERE UserID = $UserID
AND Warned != '0000-00-00 00:00:00'");
- if ($DB->has_results()) {
+ if (G::$DB->has_results()) {
//User was already warned, appending new warning to old.
- list($OldDate) = $DB->next_record();
+ list($OldDate) = G::$DB->next_record();
$NewExpDate = date('Y-m-d H:i:s', strtotime($OldDate) + $Duration);
Misc::send_pm($UserID, 0,
'You have received multiple warnings.',
- "When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at ".$NewExpDate.'.');
+ "When you received your latest warning (set to expire on ".date('Y-m-d', (time() + $Duration)).'), you already had a different warning (set to expire on '.date('Y-m-d', strtotime($OldDate)).").\n\n Due to this collision, your warning status will now expire at $NewExpDate.");
- $AdminComment = date('Y-m-d').' - Warning (Clash) extended to expire at '.$NewExpDate.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
+ $AdminComment = date('Y-m-d')." - Warning (Clash) extended to expire at $NewExpDate by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
- $DB->query('
+ G::$DB->query('
UPDATE users_info
SET
- Warned=\''.db_string($NewExpDate).'\',
- WarnedTimes=WarnedTimes+1,
- AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
- WHERE UserID=\''.db_string($UserID).'\'');
+ Warned = \''.db_string($NewExpDate).'\',
+ WarnedTimes = WarnedTimes + 1,
+ AdminComment = CONCAT(\''.db_string($AdminComment).'\', AdminComment)
+ WHERE UserID = \''.db_string($UserID).'\'');
} else {
//Not changing, user was not already warned
$WarnTime = time_plus($Duration);
- $Cache->begin_transaction('user_info_'.$UserID);
- $Cache->update_row(false, array('Warned' => $WarnTime));
- $Cache->commit_transaction(0);
+ G::$Cache->begin_transaction("user_info_$UserID");
+ G::$Cache->update_row(false, array('Warned' => $WarnTime));
+ G::$Cache->commit_transaction(0);
- $AdminComment = date('Y-m-d').' - Warned until '.$WarnTime.' by '.$LoggedUser['Username']."\nReason: $Reason\n\n";
+ $AdminComment = date('Y-m-d')." - Warned until $WarnTime by " . G::$LoggedUser['Username'] . "\nReason: $Reason\n\n";
- $DB->query('
+ G::$DB->query('
UPDATE users_info
SET
- Warned=\''.db_string($WarnTime).'\',
- WarnedTimes=WarnedTimes+1,
- AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
- WHERE UserID=\''.db_string($UserID).'\'');
+ Warned = \''.db_string($WarnTime).'\',
+ WarnedTimes = WarnedTimes + 1,
+ AdminComment = CONCAT(\''.db_string($AdminComment).'\',AdminComment)
+ WHERE UserID = \''.db_string($UserID).'\'');
}
+ G::$DB->set_query_id($QueryID);
}
/**
@@ -270,11 +276,12 @@ public static function warn_user($UserID, $Duration, $Reason) {
* @param unknown $AdminComment Comment to update with
*/
public static function update_user_notes($UserID, $AdminComment) {
- global $DB;
- $DB->query('
+ $QueryID = G::$DB->get_query_id();
+ G::$DB->query('
UPDATE users_info
- SET AdminComment=CONCAT(\''.db_string($AdminComment).'\',AdminComment)
- WHERE UserID=\''.db_string($UserID).'\'');
+ SET AdminComment = CONCAT(\''.db_string($AdminComment).'\',AdminComment)
+ WHERE UserID = \''.db_string($UserID).'\'');
+ G::$DB->set_query_id($QueryID);
}
}
?>
diff --git a/classes/torrent_form.class.php b/classes/torrent_form.class.php
index d3c8d474..b6d9c25a 100644
--- a/classes/torrent_form.class.php
+++ b/classes/torrent_form.class.php
@@ -45,14 +45,13 @@ function TORRENT_FORM($Torrent = false, $Error = false, $NewTorrent = true) {
}
function head() {
- global $LoggedUser;
?>