Use IS and IS NOT for newly added sql NULLs

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 = NULL
+              i.ResetExpires IS 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 = NULL
+            ResetExpires IS 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 = NULL,
+    TimeFilled IS NULL,
     Visible = 1
   WHERE ID = $RequestID");
 

sections/schedule/daily/disable_inactive_users.php

@@ -11,7 +11,7 @@ if (apc_exists('DBKEY')) {
     WHERE um.PermissionID IN ('".USER."', '".MEMBER  ."')
       AND um.LastAccess < '".time_minus(3600 * 24 * 110, true)."'
       AND um.LastAccess > '".time_minus(3600 * 24 * 111, true)."'
-      AND um.LastAccess != NULL
+      AND um.LastAccess IS NOT NULL
       AND ui.Donor = '0'
       AND um.Enabled != '2'
       AND ul.UserID IS NULL
@@ -29,7 +29,7 @@ if (apc_exists('DBKEY')) {
       LEFT JOIN users_levels AS ul ON ul.UserID = um.ID AND ul.PermissionID = '".CELEB."'
     WHERE um.PermissionID IN ('".USER."', '".MEMBER  ."')
       AND um.LastAccess < '".time_minus(3600 * 24 * 30 * 4)."'
-      AND um.LastAccess != NULL
+      AND um.LastAccess IS NOT NULL
       AND ui.Donor = '0'
       AND um.Enabled != '2'
       AND ul.UserID IS NULL

sections/schedule/daily/disable_unconfirmed_users.php

@@ -6,7 +6,7 @@ $DB->query("
   SELECT UserID
   FROM users_info AS ui
     JOIN users_main AS um ON um.ID = ui.UserID
-  WHERE um.LastAccess = NULL
+  WHERE um.LastAccess IS NULL
     AND ui.JoinDate < '".time_minus(60 * 60 * 24 * 7)."'
     AND um.Enabled != '2'");
 $UserIDs = $DB->collect('UserID');
@@ -19,7 +19,7 @@ $DB->query("
     ui.BanDate = '$sqltime',
     ui.BanReason = '3',
     ui.AdminComment = CONCAT('$sqltime - Disabled for inactivity (never logged in)\n\n', ui.AdminComment)
-  WHERE um.LastAccess = NULL
+  WHERE um.LastAccess IS NULL
     AND ui.JoinDate < '".time_minus(60 * 60 * 24 * 7)."'
     AND um.Enabled != '2'");
 $Cache->decrement('stats_user_count', $DB->affected_rows());

sections/schedule/daily/ratio_watch.php

@@ -12,7 +12,7 @@ $UserQuery = $DB->query("
     FROM users_info AS i
       JOIN users_main AS m ON m.ID = i.UserID
     WHERE m.Uploaded/m.Downloaded >= m.RequiredRatio
-      AND i.RatioWatchEnds != NULL
+      AND i.RatioWatchEnds IS NOT NULL
       AND m.can_leech = '0'
       AND m.Enabled = '1'");
 $OffRatioWatch = $DB->collect('ID');
@@ -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 = NULL,
+    SET ui.RatioWatchEnds IS NULL,
       ui.RatioWatchDownload = '0',
       um.can_leech = '1',
       ui.AdminComment = CONCAT('$sqltime - Leeching re-enabled by adequate ratio.\n\n', ui.AdminComment)
@@ -46,14 +46,14 @@ $UserQuery = $DB->query("
       FROM users_info AS i
         JOIN users_main AS m ON m.ID = i.UserID
       WHERE m.Uploaded / m.Downloaded >= m.RequiredRatio
-        AND i.RatioWatchEnds != NULL
+        AND i.RatioWatchEnds IS NOT NULL
         AND m.Enabled = '1'");
 $OffRatioWatch = $DB->collect('ID');
 if (count($OffRatioWatch) > 0) {
   $DB->query("
     UPDATE users_info AS ui
       JOIN users_main AS um ON um.ID = ui.UserID
-    SET ui.RatioWatchEnds = NULL,
+    SET ui.RatioWatchEnds IS NULL,
       ui.RatioWatchDownload = '0',
       um.can_leech = '1'
     WHERE ui.UserID IN(".implode(',', $OffRatioWatch).')');
@@ -79,7 +79,7 @@ $DB->query("
   FROM users_info AS i
     JOIN users_main AS m ON m.ID = i.UserID
   WHERE m.Uploaded / m.Downloaded < m.RequiredRatio
-    AND i.RatioWatchEnds = NULL
+    AND i.RatioWatchEnds IS NULL
     AND m.Enabled = '1'
     AND m.can_leech = '1'");
 $OnRatioWatch = $DB->collect('ID');
@@ -114,7 +114,7 @@ $UserQuery = $DB->query("
     SELECT ID, torrent_pass
     FROM users_info AS i
       JOIN users_main AS m ON m.ID = i.UserID
-    WHERE i.RatioWatchEnds != NULL
+    WHERE i.RatioWatchEnds IS NOT NULL
       AND i.RatioWatchEnds < '$sqltime'
       AND m.Enabled = '1'
       AND m.can_leech != '0'");

sections/schedule/hourly/class_promotion.php

@@ -87,7 +87,7 @@ $Criteria[] = array(
       FROM users_main
         JOIN users_info ON users_main.ID = users_info.UserID
       WHERE PermissionID = ".$L['From']."
-        AND Warned = NULL
+        AND Warned IS NULL
         AND Uploaded >= '$L[MinUpload]'
         AND (Uploaded / Downloaded >= '$L[MinRatio]' OR (Uploaded / Downloaded IS NULL))
         AND JoinDate < '$L[MaxTime]'

sections/schedule/hourly/disable_leech.php

@@ -5,7 +5,7 @@ $DB->query("
   SELECT ID, torrent_pass
   FROM users_info AS i
     JOIN users_main AS m ON m.ID = i.UserID
-  WHERE i.RatioWatchEnds != NULL
+  WHERE i.RatioWatchEnds IS NOT NULL
     AND i.RatioWatchDownload + 10 * 1024 * 1024 * 1024 < m.Downloaded
     AND m.Enabled = '1'
     AND m.can_leech = '1'");

sections/schedule/hourly/expire_warnings.php

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

sections/schedule/hourly/hide_old_requests.php

@@ -5,5 +5,5 @@ $DB->query("
   UPDATE requests
   SET Visible = 0
   WHERE TimeFilled < (NOW() - INTERVAL 7 DAY)
-    AND TimeFilled != NULL");
+    AND TimeFilled IS NOT NULL");
 ?>

sections/tools/data/upscale_pool.php

@@ -23,7 +23,7 @@ $RS = $DB->query("
     m.RequiredRatio
   FROM users_main AS m
     LEFT JOIN users_info AS i ON i.UserID = m.ID
-  WHERE i.RatioWatchEnds != NULL
+  WHERE i.RatioWatchEnds IS NOT NULL
     AND m.Enabled = '1'
   ORDER BY i.RatioWatchEnds ASC
   LIMIT $Limit");
@@ -32,7 +32,7 @@ list($Results) = $DB->next_record();
 $DB->query("
   SELECT COUNT(UserID)
   FROM users_info
-  WHERE BanDate != NULL
+  WHERE BanDate IS NOT NULL
     AND BanReason = '2'");
 list($TotalDisabled) = $DB->next_record();
 $DB->set_query_id($RS);

sections/tools/data/user_flow.php

@@ -77,7 +77,7 @@ $RS = $DB->query("
           DATE_FORMAT(JoinDate, '%Y-%m-%d') AS Date,
           COUNT(UserID) AS Flow
         FROM users_info
-        WHERE JoinDate != NULL
+        WHERE JoinDate IS NOT NULL
         GROUP BY Date
       ) AS j
       LEFT JOIN (
@@ -85,7 +85,7 @@ $RS = $DB->query("
           DATE_FORMAT(BanDate, '%Y-%m-%d') AS Date,
           COUNT(UserID) AS Flow
         FROM users_info
-        WHERE BanDate != NULL
+        WHERE BanDate IS NOT NULL
           AND BanReason = '1'
         GROUP BY Date
       ) AS m ON j.Date = m.Date
@@ -94,7 +94,7 @@ $RS = $DB->query("
           DATE_FORMAT(BanDate, '%Y-%m-%d') AS Date,
           COUNT(UserID) AS Flow
         FROM users_info
-        WHERE BanDate != NULL
+        WHERE BanDate IS NOT NULL
           AND BanReason = '2'
         GROUP BY Date
       ) AS r ON j.Date = r.Date
@@ -103,7 +103,7 @@ $RS = $DB->query("
           DATE_FORMAT(BanDate, '%Y-%m-%d') AS Date,
           COUNT(UserID) AS Flow
         FROM users_info
-        WHERE BanDate != NULL
+        WHERE BanDate IS NOT NULL
           AND BanReason = '3'
         GROUP BY Date
       ) AS i ON j.Date = i.Date

sections/torrents/functions.php

@@ -244,7 +244,7 @@ function get_group_requests($GroupID) {
       SELECT ID
       FROM requests
       WHERE GroupID = $GroupID
-        AND TimeFilled = NULL");
+        AND TimeFilled IS NULL");
     $Requests = $DB->collect('ID');
     $Cache->cache_value("requests_group_$GroupID", $Requests, 0);
   }

sections/user/advancedsearch.php

@@ -413,9 +413,9 @@ if (count($_GET)) {
     }
 
     if ($_GET['warned'] == 'yes') {
-      $Where[] = 'ui1.Warned != NULL';
+      $Where[] = 'ui1.Warned IS NOT NULL';
     } elseif ($_GET['warned'] == 'no') {
-      $Where[] = 'ui1.Warned = NULL';
+      $Where[] = 'ui1.Warned IS NULL';
     }
 
     if ($_GET['disabled_ip']) {

sections/user/take_edit.php

@@ -164,7 +164,7 @@ if ($CurEmail != $_POST['email']) {
       UPDATE users_history_emails
       SET Time = '".sqltime()."'
       WHERE UserID = '$UserID'
-        AND Time = NULL");
+        AND Time IS NULL");
     $DB->query("
       INSERT INTO users_history_emails
         (UserID, Email, Time, IP)

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 = NULL, RatioWatchDownload = '0', RatioWatchTimes = '0'
+    SET RatioWatchEnds IS NULL, RatioWatchDownload = '0', RatioWatchTimes = '0'
     WHERE UserID = '$UserID'");
   $EditSummary[] = 'RatioWatch history reset';
 }
@@ -499,7 +499,7 @@ if ($Warned == 1 && $Cur['Warned'] == NULL && check_perms('users_warn')) {
   $LightUpdates['Warned'] = time_plus(3600 * 24 * 7 * $WarnLength);
 
 } elseif ($Warned == 0 && $Cur['Warned'] != NULL && check_perms('users_warn')) {
-  $UpdateSet[] = "Warned = NULL";
+  $UpdateSet[] = "Warned IS NULL";
   $EditSummary[] = 'warning removed';
   $LightUpdates['Warned'] = NULL;
 
@@ -700,7 +700,7 @@ 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 = NULL";
+      $UpdateSet[] = "i.RatioWatchEnds IS NULL";
       $CanLeech = 1;
       $UpdateSet[] = "m.can_leech = '1'";
       $UpdateSet[] = "i.RatioWatchDownload = '0'";

sections/userhistory/email_history.php

@@ -60,7 +60,7 @@ if ($UsersOnly == 1) {
       LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
     WHERE h.UserID = '$UserID'
       AND h2.UserID > 0"
-      /*AND Time != NULL*/."
+      /*AND Time IS NOT NULL*/."
     ORDER BY Time DESC");
 } else {
   $DB->query("
@@ -81,7 +81,7 @@ if ($UsersOnly == 1) {
     FROM users_history_emails AS h
       LEFT JOIN geoip_country AS c ON INET_ATON(h.IP) BETWEEN c.StartIP AND c.EndIP
     WHERE UserID = '$UserID' "
-      /*AND Time != NULL*/."
+      /*AND Time IS NOT NULL*/."
     ORDER BY Time DESC");
 }
 $History = $DB->to_array();