Merge branch 'master' of ngxez/Gazelle into master

classes/script_start.php

@@ -158,7 +158,7 @@ if (isset($_COOKIE['session']) && isset($_COOKIE['userid'])) {
 
   // $LoggedUser['RatioWatch'] as a bool to disable things for users on Ratio Watch
   $LoggedUser['RatioWatch'] = (
-    $LoggedUser['RatioWatchEnds'] != NULL
+    !is_null($LoggedUser['RatioWatchEnds'])
     && time() < strtotime($LoggedUser['RatioWatchEnds'])
     && ($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
   );

classes/time.class.php

@@ -5,7 +5,7 @@ if (!extension_loaded('date')) {
 
 function time_ago($TimeStamp) {
   if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    if ($TimeStamp == NULL) {
+    if (is_null($TimeStamp)) {
       return false;
     }
     $TimeStamp = strtotime($TimeStamp);
@@ -22,7 +22,7 @@ function time_ago($TimeStamp) {
  */
 function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false) {
   if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    if ($TimeStamp == NULL) {
+    if (is_null($TimeStamp)) {
       return 'Never';
     }
     $TimeStamp = strtotime($TimeStamp);

classes/tools.class.php

@@ -235,7 +235,7 @@ class Tools {
       SELECT Warned
       FROM users_info
       WHERE UserID = $UserID
-        AND Warned != NULL");
+        AND Warned IS NOT NULL");
     if (G::$DB->has_results()) {
       //User was already warned, appending new warning to old.
       list($OldDate) = G::$DB->next_record();

classes/users.class.php

@@ -419,7 +419,7 @@ class Users {
       $Str .= Badges::display_badges(Badges::get_displayed_badges($UserID), true);
     }
 
-    $Str .= ($IsWarned && $UserInfo['Warned'] != NULL) ? '<a href="wiki.php?action=article&amp;id=218"'
+    $Str .= ($IsWarned && !is_null($UserInfo['Warned'])) ? '<a href="wiki.php?action=article&amp;id=218"'
           . '><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'])) : '')
           . '" class="tooltip" /></a>' : '';

classes/zip.class.php

@@ -80,7 +80,7 @@ if (!extension_loaded('zlib')) {
 //Handles timestamps
 function dostime($TimeStamp = 0) {
   if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    if ($TimeStamp == NULL) {
+    if (is_null($TimeStamp)) {
       return 'Never';
     }
     $TimeStamp = strtotime($TimeStamp);

sections/ajax/forum/forum.php

@@ -140,7 +140,7 @@ if (count($Forum) === 0) {
     $UserInfo = Users::user_info($LastAuthorID);
     $LastAuthorName = $UserInfo['Username'];
     // Bug fix for no last time available
-    if ($LastTime == NULL) {
+    if (is_null($LastTime)) {
       $LastTime = '';
     }
 

sections/ajax/forum/thread.php

@@ -261,7 +261,7 @@ foreach ($Thread as $Key => $Post) {
       'paranoia' => $Paranoia,
       'artist' => $Artist === '1',
       'donor' => $Donor === '1',
-      'warned' => $Warned !== NULL,
+      'warned' => !is_null($Warned),
       'avatar' => $Avatar,
       'enabled' => $Enabled === '2' ? false : true,
       'userTitle' => $UserTitle

sections/ajax/request.php

@@ -67,7 +67,7 @@ foreach ($Thread as $Key => $Post) {
     'authorId'        => (int)$AuthorID,
     'name'            => $Username,
     'donor'           => ($Donor == 1),
-    'warned'          => ($Warned != NULL),
+    'warned'          => !is_null($Warned),
     'enabled'         => ($Enabled == 2 ? false : true),
     'class'           => Users::make_class_string($PermissionID),
     'addedTime'       => $AddedTime,

sections/ajax/tcomments.php

@@ -23,7 +23,7 @@ foreach ($Thread as $Key => $Post) {
       'authorName' => $Username,
       'artist' => $Artist == 1,
       'donor' => $Donor == 1,
-      'warned' => ($Warned != NULL),
+      'warned' => !is_null($Warned),
       'avatar' => $Avatar,
       'enabled' => ($Enabled == 2 ? false : true),
       'userTitle' => $UserTitle

sections/ajax/user.php

@@ -308,7 +308,7 @@ if ($ParanoiaLevel == 0) {
 }
 
 //Bugfix for no access time available
-if ($LastAccess == NULL) {
+if (is_null($LastAccess)) {
   $LastAccess = '';
 }
 
@@ -342,7 +342,7 @@ json_print("success", array(
     'paranoia'      => (int)$ParanoiaLevel,
     'paranoiaText'  => $ParanoiaLevelText,
     'donor'         => ($Donor == 1),
-    'warned'        => ($Warned != NULL),
+    'warned'        => !is_null($Warned),
     'enabled'       => ($Enabled == '1' || $Enabled == '0' || !$Enabled),
     'passkey'       => $torrent_pass
   ),

sections/ajax/usersearch.php

@@ -44,7 +44,7 @@ foreach ($Results as $Result) {
     'userId' => (int)$UserID,
     'username' => $Username,
     'donor' => $Donor == 1,
-    'warned' => ($Warned != NULL),
+    'warned' => !is_null($Warned),
     'enabled' => ($Enabled == 2 ? false : true),
     'class' => Users::make_class_string($PermissionID),
     'avatar' => $Avatar

sections/forums/poll_mod.php

@@ -39,7 +39,7 @@ if (!list($Question,$Answers,$Votes,$Featured,$Closed) = $Cache->get_value('poll
 }
 
 if (isset($_POST['feature'])) {
-  if (!$Featured || $Featured == NULL) {
+  if (!$Featured || is_null($Featured)) {
     $Featured = sqltime();
     $Cache->cache_value('polls_featured',$TopicID,0);
     $DB->query('

sections/forums/thread.php

@@ -260,7 +260,7 @@ if ($ThreadInfo['NoPoll'] == 0) {
 
 ?>
   <div class="box thin clear">
-    <div class="head colhead_dark"><strong>Poll<? if ($Closed) { echo ' [Closed]'; } ?><? if ($Featured && $Featured !== NULL) { echo ' [Featured]'; } ?></strong> <a href="#" onclick="$('#threadpoll').gtoggle(); log_hit(); return false;" class="brackets">View</a></div>
+    <div class="head colhead_dark"><strong>Poll<? if ($Closed) { echo ' [Closed]'; } ?><? if ($Featured && !is_null($Featured)) { echo ' [Featured]'; } ?></strong> <a href="#" onclick="$('#threadpoll').gtoggle(); log_hit(); return false;" class="brackets">View</a></div>
     <div class="pad<? if (/*$LastRead !== null || */$ThreadInfo['IsLocked']) { echo ' hidden'; } ?>" id="threadpoll">
       <p><strong><?=display_str($Question)?></strong></p>
 <?  if ($UserResponse !== null || $Closed || $ThreadInfo['IsLocked'] || !Forums::check_forumperm($ForumID)) { ?>
@@ -383,7 +383,7 @@ if ($ThreadInfo['NoPoll'] == 0) {
       </div>
 <?  }
   if (check_perms('forums_polls_moderate') && !$RevealVoters) {
-    if (!$Featured || $Featured == NULL) {
+    if (!$Featured || is_null($Featured)) {
 ?>
       <form class="manage_form" name="poll" action="forums.php" method="post">
         <input type="hidden" name="action" value="poll_mod" />

sections/login/index.php

@@ -68,7 +68,7 @@ if (isset($_REQUEST['act']) && $_REQUEST['act'] == 'recover') {
               m.PassHash = '".db_string(Users::make_sec_hash($_REQUEST['password']))."',
               i.ResetKey = '',
               m.LastLogin = NOW(),
-              i.ResetExpires IS NULL
+              i.ResetExpires = NULL
             WHERE m.ID = '$UserID'
               AND i.UserID = m.ID");
           $DB->query("
@@ -94,7 +94,7 @@ if (isset($_REQUEST['act']) && $_REQUEST['act'] == 'recover') {
         $DB->query("
           UPDATE users_info
           SET ResetKey = '',
-            ResetExpires IS NULL
+            ResetExpires = NULL
           WHERE UserID = '$UserID'");
         $_SESSION['reseterr'] = 'The link you were given has expired.'; // Error message to display on form
       }

sections/requests/take_unfill.php

@@ -39,7 +39,7 @@ $DB->query("
   UPDATE requests
   SET TorrentID = 0,
     FillerID = 0,
-    TimeFilled IS NULL,
+    TimeFilled = NULL,
     Visible = 1
   WHERE ID = $RequestID");
 

sections/schedule/daily/ratio_watch.php

@@ -20,7 +20,7 @@ if (count($OffRatioWatch) > 0) {
   $DB->query("
     UPDATE users_info AS ui
       JOIN users_main AS um ON um.ID = ui.UserID
-    SET ui.RatioWatchEnds IS NULL,
+    SET ui.RatioWatchEnds = NULL,
       ui.RatioWatchDownload = '0',
       um.can_leech = '1',
       ui.AdminComment = CONCAT('$sqltime - Leeching re-enabled by adequate ratio.\n\n', ui.AdminComment)
@@ -53,7 +53,7 @@ if (count($OffRatioWatch) > 0) {
   $DB->query("
     UPDATE users_info AS ui
       JOIN users_main AS um ON um.ID = ui.UserID
-    SET ui.RatioWatchEnds IS NULL,
+    SET ui.RatioWatchEnds = NULL,
       ui.RatioWatchDownload = '0',
       um.can_leech = '1'
     WHERE ui.UserID IN(".implode(',', $OffRatioWatch).')');

sections/schedule/hourly/expire_warnings.php

@@ -13,6 +13,6 @@ while (list($UserID) = $DB->next_record()) {
 
 $DB->query("
   UPDATE users_info
-  SET Warned IS NULL
+  SET Warned = NULL
   WHERE Warned < '$sqltime'");
 ?>

sections/store/promotion.php

@@ -115,7 +115,7 @@ if ($DB->has_results()) {
 
     }
 
-    if ($Warned != NULL) {
+    if (!is_null($Warned)) {
       $Err[] = "You cannot be promoted while warned";
     }
 

sections/torrents/details.php

@@ -571,14 +571,14 @@ foreach ($TorrentList as $Torrent) {
             <blockquote>
               Uploaded by <?=Users::format_username($UserID, false, false, false)?> <?=time_diff($TorrentTime);?>
 <?  if ($Seeders == 0) {
-    if ($LastActive != NULL && time() - strtotime($LastActive) >= 1209600) { ?>
+    if (!is_null($LastActive) && time() - strtotime($LastActive) >= 1209600) { ?>
             <br /><strong>Last active: <?=time_diff($LastActive); ?></strong>
 <?    } else { ?>
             <br />Last active: <?=time_diff($LastActive); ?>
 <?    }
   }
 
-  if (($Seeders == 0 && $LastActive != NULL && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?>
+  if (($Seeders == 0 && !is_null($LastActive) && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?>
             <br /><a href="torrents.php?action=reseed&amp;torrentid=<?=$TorrentID?>&amp;groupid=<?=$GroupID?>" class="brackets">Request re-seed</a>
 <?  }
 

sections/torrents/functions.php

@@ -416,12 +416,12 @@ function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $G
             <blockquote>
               Uploaded by <?=(Users::format_username($UserID, false, false, false))?> <?=time_diff($TorrentTime);?>
 <?  if ($Seeders == 0) {
-    if ($LastActive != NULL && time() - strtotime($LastActive) >= 1209600) { ?>
+    if (!is_null($LastActive) && time() - strtotime($LastActive) >= 1209600) { ?>
                 <br /><strong>Last active: <?=time_diff($LastActive);?></strong>
 <?    } else { ?>
                 <br />Last active: <?=time_diff($LastActive);?>
 <?    }
-    if ($LastActive != NULL && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
+    if (!is_null($LastActive) && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
                 <br /><a href="torrents.php?action=reseed&amp;torrentid=<?=($TorrentID)?>&amp;groupid=<?=($GroupID)?>" class="brackets">Request re-seed</a>
 <?    }
   } ?>

sections/torrents/reseed.php

@@ -16,7 +16,7 @@ if (!check_perms('users_mod')) {
   if (time() - strtotime($LastReseedRequest) < 864000) {
     error('There was already a re-seed request for this torrent within the past 10 days.');
   }
-  if ($LastActive == NULL || time() - strtotime($LastActive) < 345678) {
+  if (is_null($LastActive) || time() - strtotime($LastActive) < 345678) {
     error(403);
   }
 }

sections/user/takemoderate.php

@@ -226,7 +226,7 @@ $DB->set_query_id($QueryID);
 if ($_POST['ResetRatioWatch'] && check_perms('users_edit_reset_keys')) {
   $DB->query("
     UPDATE users_info
-    SET RatioWatchEnds IS NULL, RatioWatchDownload = '0', RatioWatchTimes = '0'
+    SET RatioWatchEnds = NULL, RatioWatchDownload = '0', RatioWatchTimes = '0'
     WHERE UserID = '$UserID'");
   $EditSummary[] = 'RatioWatch history reset';
 }
@@ -486,7 +486,7 @@ if (check_perms('users_edit_badges')) {
   $Cache->delete_value("user_badges_".$UserID);
 }
 
-if ($Warned == 1 && $Cur['Warned'] == NULL && check_perms('users_warn')) {
+if ($Warned == 1 && is_null($Cur['Warned']) && check_perms('users_warn')) {
   $Weeks = 'week' . ($WarnLength === 1 ? '' : 's');
   Misc::send_pm($UserID, 0, 'You have received a warning', "You have been [url=".site_url()."wiki.php?action=article&id=218]warned for $WarnLength {$Weeks}[/url] by [user]".$LoggedUser['Username']."[/user]. The reason given was:
 [quote]{$WarnReason}[/quote]");
@@ -498,8 +498,8 @@ if ($Warned == 1 && $Cur['Warned'] == NULL && check_perms('users_warn')) {
   $EditSummary[] = db_string($Msg);
   $LightUpdates['Warned'] = time_plus(3600 * 24 * 7 * $WarnLength);
 
-} elseif ($Warned == 0 && $Cur['Warned'] != NULL && check_perms('users_warn')) {
-  $UpdateSet[] = "Warned IS NULL";
+} elseif ($Warned == 0 && !is_null($Cur['Warned']) && check_perms('users_warn')) {
+  $UpdateSet[] = "Warned = NULL";
   $EditSummary[] = 'warning removed';
   $LightUpdates['Warned'] = NULL;
 
@@ -700,13 +700,13 @@ if ($EnableUser != $Cur['Enabled'] && check_perms('users_disable_users')) {
     Tracker::update_tracker('add_user', array('id' => $UserID, 'passkey' => $Cur['torrent_pass'], 'visible' => $VisibleTrIP));
 
     if (($Cur['Downloaded'] == 0) || ($Cur['Uploaded'] / $Cur['Downloaded'] >= $Cur['RequiredRatio'])) {
-      $UpdateSet[] = "i.RatioWatchEnds IS NULL";
+      $UpdateSet[] = "i.RatioWatchEnds = NULL";
       $CanLeech = 1;
       $UpdateSet[] = "m.can_leech = '1'";
       $UpdateSet[] = "i.RatioWatchDownload = '0'";
     } else {
       $EnableStr .= ' (Ratio: '.Format::get_ratio_html($Cur['Uploaded'], $Cur['Downloaded'], false).', RR: '.number_format($Cur['RequiredRatio'],2).')';
-      if ($Cur['RatioWatchEnds'] != NULL) {
+      if (!is_null($Cur['RatioWatchEnds'])) {
         $UpdateSet[] = "i.RatioWatchEnds = NOW()";
         $UpdateSet[] = "i.RatioWatchDownload = m.Downloaded";
         $CanLeech = 0;

sections/user/user.php

@@ -375,7 +375,7 @@ if ($LoggedUser['Class'] >= 200 || $DB->has_results()) { ?>
         <li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>><a href="userhistory.php?action=token_history&amp;userid=<?=$UserID?>">Tokens</a>: <?=number_format($FLTokens)?></li>
 <?
   }
-  if (($OwnProfile || check_perms('users_mod')) && $Warned != NULL) {
+  if (($OwnProfile || check_perms('users_mod')) && !is_null($Warned)) {
 ?>
         <li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Warning expires in: <?=time_diff((date('Y-m-d H:i', strtotime($Warned))))?></li>
 <?  } ?>
@@ -654,7 +654,7 @@ DonationsView::render_donor_stats($UserID);
   </div>
   <div class="main_column">
 <?
-if ($RatioWatchEnds != NULL
+if (!is_null($RatioWatchEnds)
     && (time() < strtotime($RatioWatchEnds))
     && ($Downloaded * $RequiredRatio) > $Uploaded
     ) {
@@ -1324,10 +1324,10 @@ if (!$DisablePoints) {
       <tr>
         <td class="label">Warned:</td>
         <td>
-          <input type="checkbox" name="Warned"<? if ($Warned != NULL) { ?> checked="checked"<? } ?> />
+          <input type="checkbox" name="Warned"<? if (!is_null($Warned)) { ?> checked="checked"<? } ?> />
         </td>
       </tr>
-<?    if ($Warned == NULL) { // user is not warned ?>
+<?    if (is_null($Warned)) { // user is not warned ?>
       <tr>
         <td class="label">Expiration:</td>
         <td>

sections/userhistory/email_history2.php

@@ -114,25 +114,25 @@ if (count($History) === 1) {
   $Invite['EndTime'] = $Joined;
   $Invite['AccountAge'] = date(time() + time() - strtotime($Joined)); // Same as EndTime but without ' ago'
   $Invite['IP'] = $History[0]['IP'];
-  if ($Current['StartTime'] == NULL) {
+  if (is_null($Current['StartTime'])) {
     $Current['StartTime'] = $Joined;
   }
 } else {
   foreach ($History as $Key => $Val) {
-    if (isset($History[$Key + 1]) && $History[$Key + 1]['Time'] == NULL && $Val['Time'] != NULL) {
+    if (isset($History[$Key + 1]) && is_null($History[$Key + 1]['Time']) && is_null($Val['Time'])) {
       // Invited email
       $Invite['Email'] = $Val['Email'];
       $Invite['EndTime'] = $Joined;
       $Invite['AccountAge'] = date(time() + time() - strtotime($Joined)); // Same as EndTime but without ' ago'
       $Invite['IP'] = $Val['IP'];
 
-    } elseif (isset($History[$Key - 1]) && $History[$Key - 1]['Email'] != $Val['Email'] && $Val['Time'] != NULL) {
+    } elseif (isset($History[$Key - 1]) && $History[$Key - 1]['Email'] != $Val['Email'] && !is_null($Val['Time'])) {
       // Old email
       $i = 1;
       while ($Val['Email'] == $History[$Key + $i]['Email']) {
         $i++;
       }
-      $Old[$Key]['StartTime'] = (isset($History[$Key + $i]) && $History[$Key + $i]['Time'] != NULL) ? $History[$Key + $i]['Time'] : $Joined;
+      $Old[$Key]['StartTime'] = (isset($History[$Key + $i]) && !is_null($History[$Key + $i]['Time'])) ? $History[$Key + $i]['Time'] : $Joined;
       $Old[$Key]['EndTime'] = $Val['Time'];
       $Old[$Key]['IP'] = $Val['IP'];
       $Old[$Key]['ElapsedTime'] = date(time() + strtotime($Old[$Key]['EndTime']) - strtotime($Old[$Key]['StartTime']));