Merge pull request #6948 from BOINC/dpa_copilot

Web: fix copilot warnings, remove deprecated files.  No functional changes

Author: AenBleidd

html/inc/db.inc

@@ -168,10 +168,10 @@ function db_init_aux($try_replica=false) {
             if ($x) $db_name = $x;
         }
     }
-    if ($host == null) {
+    if (is_blank($host)) {
         $host = parse_config($config, "<db_host>");
     }
-    if ($host == null) {
+    if (is_blank($host)) {
         $host = "localhost";
     }
     if (1) {

html/inc/util_basic.inc

@@ -242,6 +242,13 @@ function time_diff($x, $res=3) {
     return $s;
 }
 
+// is the arg either null, '', or whitespace?
+// Note: if ($x) will be false if $x is '0'.
+// We don't want to treat '0' as blank.
+//
+function is_blank($x) {
+    return $x === null || trim($x) === '';
+}
 
 // security vulnerabilities and user-supplied strings:
 // sources:

html/inc/util_ops.inc

@@ -103,7 +103,7 @@ function db_init_cli() {
     $config = get_config();
     $db_name = parse_config($config, "<db_name>");
     $host = parse_config($config, "<db_host>");
-    if ($host == null) {
+    if (is_blank($host)) {
         $host = "localhost";
     }
     $in = fopen("php://stdin","r");

html/ops/analyze_coproc_log.php

@@ -29,7 +29,7 @@
 admin_page_head("Cancel Jobs");
 
 $limit = get_int('limit', true);
-if (!$limit || $limit==0) {
+if (!$limit) {
     $limit = 100;
 }
 

html/ops/cancel_workunits.php

@@ -117,7 +117,7 @@ function repair_prefs($prefs) {
     }
 
     $root = $prefs_dom->firstChild;
-    if ($root->hasChildNodes()) {
+    if ($root && $root->hasChildNodes()) {
         $subNodes = $root->childNodes;
         $to_remove = array();
         foreach ($subNodes as $subNode) {

html/ops/fix_project_prefs.php

@@ -18,7 +18,7 @@
 
 // script for studying NVIDIA GPUs on hosts
 
-DEPRECATED: we don't use host.serialnum anymore
+TODO: use host.misc instead of host.serialnum
 
 $cli_only = true;
 require_once("../inc/util_ops.inc");