Apparently NULL from the database becomes an empty string in PHP, not null

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'] = (
-    !is_null($LoggedUser['RatioWatchEnds'])
+    $LoggedUser['RatioWatchEnds']
     && time() < strtotime($LoggedUser['RatioWatchEnds'])
     && ($LoggedUser['BytesDownloaded'] * $LoggedUser['RequiredRatio']) > $LoggedUser['BytesUploaded']
   );

classes/time.class.php

@@ -4,15 +4,10 @@ if (!extension_loaded('date')) {
 }
 
 function time_ago($TimeStamp) {
+  if (!$TimeStamp) { return false; }
   if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    if (is_null($TimeStamp)) {
-      return false;
-    }
     $TimeStamp = strtotime($TimeStamp);
   }
-  if ($TimeStamp == 0) {
-    return false;
-  }
   return time() - $TimeStamp;
 }
 
@@ -21,15 +16,10 @@ function time_ago($TimeStamp) {
  * difference in text (e.g. "16 hours and 28 minutes", "1 day, 18 hours").
  */
 function time_diff($TimeStamp, $Levels = 2, $Span = true, $Lowercase = false) {
+  if (!$TimeStamp) { return 'Never'; }
   if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    if (is_null($TimeStamp)) {
-      return 'Never';
-    }
     $TimeStamp = strtotime($TimeStamp);
   }
-  if ($TimeStamp == 0) {
-    return 'Never';
-  }
   $Time = time() - $TimeStamp;
 
   // If the time is negative, then it expires in the future.

classes/users.class.php

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

@@ -76,21 +76,6 @@ http://www.fileformat.info/tool/hexdump.htm - Useful for analyzing ZIP files
 if (!extension_loaded('zlib')) {
   error('Zlib Extension not loaded.');
 }
-/*
-//Handles timestamps
-function dostime($TimeStamp = 0) {
-  if (!is_number($TimeStamp)) { // Assume that $TimeStamp is SQL timestamp
-    if (is_null($TimeStamp)) {
-      return 'Never';
-    }
-    $TimeStamp = strtotime($TimeStamp);
-  }
-  $Date = (($TimeStamp == 0) ? getdate() : getdate($TimeStamp));
-  $Hex = dechex((($Date['year'] - 1980) << 25) | ($Date['mon'] << 21) | ($Date['mday'] << 16) | ($Date['hours'] << 11) | ($Date['minutes'] << 5) | ($Date['seconds'] >> 1));
-  eval("\$Return = \"\x$Hex[6]$Hex[7]\x$Hex[4]$Hex[5]\x$Hex[2]$Hex[3]\x$Hex[0]$Hex[1]\";");
-  return $Return;
-}
-*/
 
 class Zip {
   public $ArchiveSize = 0; // Total size
@@ -116,7 +101,6 @@ class Zip {
     $this->Data .= "\x14\x00"; // Version requirements
     $this->Data .= "\x00\x08"; // Bit flag - 0x8 = UTF-8 file names
     $this->Data .= "\x08\x00"; // Compression
-    //$this->Data .= dostime($TimeStamp); // Last modified
     $this->Data .= "\x00\x00\x00\x00";
     $DataLength = strlen($FileData); // Saved as variable to avoid wasting CPU calculating it multiple times.
     $CRC32 = crc32($FileData); // Ditto.

sections/ajax/forum/forum.php

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

sections/ajax/forum/thread.php

@@ -247,7 +247,7 @@ foreach ($Thread as $Key => $Post) {
 
 
   $UserInfo = Users::user_info($EditedUserID);
-  $JsonPosts[] = array(
+  $JsonPosts[] = [
     'postId' => (int)$PostID,
     'addedTime' => $AddedTime,
     'bbBody' => $Body,
@@ -255,37 +255,33 @@ foreach ($Thread as $Key => $Post) {
     'editedUserId' => (int)$EditedUserID,
     'editedTime' => $EditedTime,
     'editedUsername' => $UserInfo['Username'],
-    'author' => array(
+    'author' => [
       'authorId' => (int)$AuthorID,
       'authorName' => $Username,
       'paranoia' => $Paranoia,
       'artist' => $Artist === '1',
       'donor' => $Donor === '1',
-      'warned' => !is_null($Warned),
+      'warned' => (bool)$Warned,
       'avatar' => $Avatar,
       'enabled' => $Enabled === '2' ? false : true,
       'userTitle' => $UserTitle
-    ),
-
-  );
+    ]
+  ];
 }
 
-print
-  json_encode(
-    array(
-      'status' => 'success',
-      'response' => array(
-        'forumId' => (int)$ForumID,
-        'forumName' => $Forums[$ForumID]['Name'],
-        'threadId' => (int)$ThreadID,
-        'threadTitle' => display_str($ThreadInfo['Title']),
-        'subscribed' => in_array($ThreadID, $UserSubscriptions),
-        'locked' => $ThreadInfo['IsLocked'] == 1,
-        'sticky' => $ThreadInfo['IsSticky'] == 1,
-        'currentPage' => (int)$Page,
-        'pages' => ceil($ThreadInfo['Posts'] / $PerPage),
-        'poll' => empty($JsonPoll) ? null : $JsonPoll,
-        'posts' => $JsonPosts
-      )
-    )
-  );
+print json_encode([
+  'status' => 'success',
+  'response' => [
+    'forumId' => (int)$ForumID,
+    'forumName' => $Forums[$ForumID]['Name'],
+    'threadId' => (int)$ThreadID,
+    'threadTitle' => display_str($ThreadInfo['Title']),
+    'subscribed' => in_array($ThreadID, $UserSubscriptions),
+    'locked' => $ThreadInfo['IsLocked'] == 1,
+    'sticky' => $ThreadInfo['IsSticky'] == 1,
+    'currentPage' => (int)$Page,
+    'pages' => ceil($ThreadInfo['Posts'] / $PerPage),
+    'poll' => empty($JsonPoll) ? null : $JsonPoll,
+    'posts' => $JsonPosts
+  ]
+]);

sections/ajax/request.php

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

sections/ajax/tcomments.php

@@ -10,7 +10,7 @@ $JsonComments = array();
 foreach ($Thread as $Key => $Post) {
   list($PostID, $AuthorID, $AddedTime, $Body, $EditedUserID, $EditedTime, $EditedUsername) = array_values($Post);
   list($AuthorID, $Username, $PermissionID, $Paranoia, $Artist, $Donor, $Warned, $Avatar, $Enabled, $UserTitle) = array_values(Users::user_info($AuthorID));
-  $JsonComments[] = array(
+  $JsonComments[] = [
     'postId' => (int)$PostID,
     'addedTime' => $AddedTime,
     'bbBody' => $Body,
@@ -18,21 +18,21 @@ foreach ($Thread as $Key => $Post) {
     'editedUserId' => (int)$EditedUserID,
     'editedTime' => $EditedTime,
     'editedUsername' => $EditedUsername,
-    'userinfo' => array(
+    'userinfo' => [
       'authorId' => (int)$AuthorID,
       'authorName' => $Username,
       'artist' => $Artist == 1,
       'donor' => $Donor == 1,
-      'warned' => !is_null($Warned),
+      'warned' => (bool)$Warned,
       'avatar' => $Avatar,
       'enabled' => ($Enabled == 2 ? false : true),
       'userTitle' => $UserTitle
-    )
-  );
+    ]
+  ];
 }
 
-json_die("success", array(
+json_die("success", [
   'page' => (int)$Page,
   'pages' => ceil($NumComments / TORRENT_COMMENTS_PER_PAGE),
   'comments' => $JsonComments
-));
+]);

sections/ajax/user.php

@@ -308,26 +308,24 @@ if ($ParanoiaLevel == 0) {
 }
 
 //Bugfix for no access time available
-if (is_null($LastAccess)) {
-  $LastAccess = '';
-}
+if (!$LastAccess) { $LastAccess = ''; }
 
 header('Content-Type: text/plain; charset=utf-8');
 
-json_print("success", array(
+json_print("success", [
   'username'    => $Username,
   'avatar'      => $Avatar,
   'isFriend'    => (bool)$Friend,
   'profileText' => Text::full_format($Info),
-  'stats'       => array(
+  'stats'       => [
     'joinedDate'    => $JoinDate,
     'lastAccess'    => $LastAccess,
     'uploaded'      => (int)$Uploaded,
     'downloaded'    => (int)$Downloaded,
     'ratio'         => (float)$Ratio,
     'requiredRatio' => (float)$RequiredRatio
-  ),
-  'ranks' => array(
+  ],
+  'ranks' => [
     'uploaded'    => (int)$UploadedRank,
     'downloaded'  => (int)$DownloadedRank,
     'uploads'     => (int)$UploadsRank,
@@ -336,17 +334,17 @@ json_print("success", array(
     'posts'       => (int)$PostRank,
     'artists'     => (int)$ArtistsRank,
     'overall'     => (int)$OverallRank
-  ),
-  'personal' => array(
+  ],
+  'personal' => [
     'class'         => $ClassLevels[$Class]['Name'],
     'paranoia'      => (int)$ParanoiaLevel,
     'paranoiaText'  => $ParanoiaLevelText,
     'donor'         => ($Donor == 1),
-    'warned'        => !is_null($Warned),
+    'warned'        => (bool)$Warned,
     'enabled'       => ($Enabled == '1' || $Enabled == '0' || !$Enabled),
     'passkey'       => $torrent_pass
-  ),
-  'community' => array(
+  ],
+  'community' => [
     'posts'           => (int)$ForumPosts,
     'torrentComments' => (int)$NumComments,
     'artistComments'  => (int)$NumArtistComments,
@@ -365,6 +363,6 @@ json_print("success", array(
     'snatched'        => (int)$Snatched,
     'invited'         => (int)$Invited,
     'artistsAdded'    => (int)$ArtistsAdded
-  )
-));
+  ]
+]);
 ?>

sections/ajax/usersearch.php

@@ -36,23 +36,23 @@ if (isset($_GET['username'])) {
 
 }
 
-$JsonUsers = array();
+$JsonUsers = [];
 foreach ($Results as $Result) {
   list($UserID, $Username, $Enabled, $PermissionID, $Donor, $Warned, $Avatar) = $Result;
 
-  $JsonUsers[] = array(
+  $JsonUsers[] = [
     'userId' => (int)$UserID,
     'username' => $Username,
     'donor' => $Donor == 1,
-    'warned' => !is_null($Warned),
+    'warned' => (bool)$Warned,
     'enabled' => ($Enabled == 2 ? false : true),
     'class' => Users::make_class_string($PermissionID),
     'avatar' => $Avatar
-  );
+  ];
 }
 
-json_die("success", array(
+json_die("success", [
   'currentPage' => (int)$Page,
   'pages' => ceil($NumResults / USERS_PER_PAGE),
   'results' => $JsonUsers
-));
+]);

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 || is_null($Featured)) {
+  if (!$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 && !is_null($Featured)) { 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) { 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 || is_null($Featured)) {
+    if (!$Featured) {
 ?>
       <form class="manage_form" name="poll" action="forums.php" method="post">
         <input type="hidden" name="action" value="poll_mod" />

sections/store/promotion.php

@@ -115,7 +115,7 @@ if ($DB->has_results()) {
 
     }
 
-    if (!is_null($Warned)) {
+    if ($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 (!is_null($LastActive) && time() - strtotime($LastActive) >= 1209600) { ?>
+    if ($LastActive && time() - strtotime($LastActive) >= 1209600) { ?>
             <br /><strong>Last active: <?=time_diff($LastActive); ?></strong>
 <?    } else { ?>
             <br />Last active: <?=time_diff($LastActive); ?>
 <?    }
   }
 
-  if (($Seeders == 0 && !is_null($LastActive) && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) || check_perms('users_mod')) { ?>
+  if (($Seeders == 0 && $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 (!is_null($LastActive) && time() - strtotime($LastActive) >= 1209600) { ?>
+    if ($LastActive && time() - strtotime($LastActive) >= 1209600) { ?>
                 <br /><strong>Last active: <?=time_diff($LastActive);?></strong>
 <?    } else { ?>
                 <br />Last active: <?=time_diff($LastActive);?>
 <?    }
-    if (!is_null($LastActive) && time() - strtotime($LastActive) >= 345678 && time() - strtotime($LastReseedRequest) >= 864000) { ?>
+    if ($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 (is_null($LastActive) || time() - strtotime($LastActive) < 345678) {
+  if ($LastActive || time() - strtotime($LastActive) < 345678) {
     error(403);
   }
 }

sections/user/takemoderate.php

@@ -486,7 +486,7 @@ if (check_perms('users_edit_badges')) {
   $Cache->delete_value("user_badges_".$UserID);
 }
 
-if ($Warned == 1 && is_null($Cur['Warned']) && check_perms('users_warn')) {
+if ($Warned == 1 && !$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,7 +498,7 @@ if ($Warned == 1 && is_null($Cur['Warned']) && check_perms('users_warn')) {
   $EditSummary[] = db_string($Msg);
   $LightUpdates['Warned'] = time_plus(3600 * 24 * 7 * $WarnLength);
 
-} elseif ($Warned == 0 && !is_null($Cur['Warned']) && check_perms('users_warn')) {
+} elseif ($Warned == 0 && $Cur['Warned'] && check_perms('users_warn')) {
   $UpdateSet[] = "Warned = NULL";
   $EditSummary[] = 'warning removed';
   $LightUpdates['Warned'] = NULL;
@@ -706,7 +706,7 @@ if ($EnableUser != $Cur['Enabled'] && check_perms('users_disable_users')) {
       $UpdateSet[] = "i.RatioWatchDownload = '0'";
     } else {
       $EnableStr .= ' (Ratio: '.Format::get_ratio_html($Cur['Uploaded'], $Cur['Downloaded'], false).', RR: '.number_format($Cur['RequiredRatio'],2).')';
-      if (!is_null($Cur['RatioWatchEnds'])) {
+      if ($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')) && !is_null($Warned)) {
+  if (($OwnProfile || check_perms('users_mod')) && $Warned) {
 ?>
         <li<?=($Override === 2 ? ' class="paranoia_override"' : '')?>>Warning expires in: <?=time_diff((date('Y-m-d H:i', strtotime($Warned))))?></li>
 <?  } ?>
@@ -654,10 +654,7 @@ DonationsView::render_donor_stats($UserID);
   </div>
   <div class="main_column">
 <?
-if (!is_null($RatioWatchEnds)
-    && (time() < strtotime($RatioWatchEnds))
-    && ($Downloaded * $RequiredRatio) > $Uploaded
-    ) {
+if ($RatioWatchEnds && (time() < strtotime($RatioWatchEnds)) && ($Downloaded * $RequiredRatio) > $Uploaded) {
 ?>
     <div class="box">
       <div class="head">Ratio watch</div>
@@ -1324,10 +1321,10 @@ if (!$DisablePoints) {
       <tr>
         <td class="label">Warned:</td>
         <td>
-          <input type="checkbox" name="Warned"<? if (!is_null($Warned)) { ?> checked="checked"<? } ?> />
+          <input type="checkbox" name="Warned"<? if ($Warned) { ?> checked="checked"<? } ?> />
         </td>
       </tr>
-<?    if (is_null($Warned)) { // user is not warned ?>
+<?    if (!$Warned) { ?>
       <tr>
         <td class="label">Expiration:</td>
         <td>
@@ -1340,7 +1337,7 @@ if (!$DisablePoints) {
           </select>
         </td>
       </tr>
-<?    } else { // user is warned ?>
+<?    } else { ?>
       <tr>
         <td class="label">Extension:</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 (is_null($Current['StartTime'])) {
+  if (!$Current['StartTime']) {
     $Current['StartTime'] = $Joined;
   }
 } else {
   foreach ($History as $Key => $Val) {
-    if (isset($History[$Key + 1]) && is_null($History[$Key + 1]['Time']) && is_null($Val['Time'])) {
+    if (isset($History[$Key + 1]) && !$History[$Key + 1]['Time'] && !$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'] && !is_null($Val['Time'])) {
+    } elseif (isset($History[$Key - 1]) && $History[$Key - 1]['Email'] != $Val['Email'] && $Val['Time']) {
       // Old email
       $i = 1;
       while ($Val['Email'] == $History[$Key + $i]['Email']) {
         $i++;
       }
-      $Old[$Key]['StartTime'] = (isset($History[$Key + $i]) && !is_null($History[$Key + $i]['Time'])) ? $History[$Key + $i]['Time'] : $Joined;
+      $Old[$Key]['StartTime'] = (isset($History[$Key + $i]) && $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']));