code review

Author: jkrrv

build.sh

@@ -25,7 +25,7 @@ echo "Update version in various json and js files..."
 node ./buildPipeline/versionUpdate.js
 
 echo "Cleaning up old build directory..."
-rm -r build
+rm -rf build
 if [ -f touchpoint-wp.zip ]; then
   rm touchpoint-wp.zip
 fi

src/TouchPoint-WP/Auth.php

@@ -340,7 +340,8 @@ public static function getProfileUrl(?int $peopleId = null): ?string
 			$userId   = get_current_user_id();
 			$peopleId = (int)(get_user_meta($userId, Person::META_PEOPLEID, true));
 		}
-		if ($peopleId >= 0) {
+		$peopleId = intval($peopleId);
+		if ($peopleId >= 0) {  // 0 is a valid peopleId for the purpose of this URL, but not elsewhere.
 			return $tpwp->host() . '/Person2/' . $peopleId . "#tab-personal";
 		}
 

src/TouchPoint-WP/Report.php

@@ -312,7 +312,7 @@ public static function api(array $uri): bool
 							break;
 
 						default:
-							header("Content-Type: text/plain");
+							header("Content-Type: text/html");
 							break;
 					}
 
@@ -339,6 +339,7 @@ public static function api(array $uri): bool
 						exit;
 					}
 
+					header("Content-Type: text/html");
 					echo $content;
 					exit;
 			}
@@ -411,6 +412,8 @@ public static function reportShortcode(mixed $params = [], string $content = "")
 		}
 
 		if (self::$_indexingMode) {
+			// TODO issue #247 Interrogate if parent post has limited access permissions and follow that through with report to be applied in API versions.
+
 			// It has been added to the index already, so our work here is done.
 			return $content;
 		}

src/TouchPoint-WP/Stats.php

@@ -291,7 +291,7 @@ public function getStatsForSubmission(bool $updateQueried = false): array
 	 * Submit stats to Tenth.
 	 *
 	 * @param bool $blocking If true, will wait for the response from the server before returning and the method will
-	 * print a status.  If false, no status prints.
+	 * print a status.  If false, nothing prints.
 	 *
 	 * @return void
 	 */
@@ -327,7 +327,7 @@ protected function submitStats(bool $blocking = false): void
 			'blocking' => $blocking,
 		]);
 
-		if (!$blocking) {
+		if ($blocking) {
 			if (is_wp_error($r)) {
 				echo "error";
 				error_log("TouchPoint-WP: Stats: Failed to submit telemetry to $endpoint: " . $r->get_error_message());
@@ -488,11 +488,17 @@ public static function handleSubmission(): bool
 		$data = array_intersect_key($data, $s->getStatsForSubmission());
 		$data['updatedDT'] = date('Y-m-d H:i:s');
 
-		// upsert the data into the database into the stats table without destructive replace function
+		// Upsert the data into the stats table without treating a no-op update as a failed write.
 		global $wpdb;
-		$r = $wpdb->update($wpdb->prefix . TouchPointWP::TABLE_STATS, $data, ['installId' => $data['installId']]);
-		if ($r < 1) {
-			$r = $wpdb->insert($wpdb->prefix . TouchPointWP::TABLE_STATS, $data);
+		$table = $wpdb->prefix . TouchPointWP::TABLE_STATS;
+		$existingInstallId = $wpdb->get_var($wpdb->prepare(
+			"SELECT installId FROM {$table} WHERE installId = %s LIMIT 1",
+			$data['installId']
+		));
+		if ($existingInstallId !== null) {
+			$r = $wpdb->update($table, $data, ['installId' => $data['installId']]);
+		} else {
+			$r = $wpdb->insert($table, $data);
 		}
 
 		if ($r === false) {