";
+ echo "$errorMsg:";
+ echo "
File '$file' missing!"; + echo "
";
+ return null;
+ }
+
+ $str = file_get_contents($file, true);
+ if ($str === "") {
+ echo "File '$file' missing!"; + echo "
";
+ echo "$errorMsg:";
+ echo "
File '$file' is empty!"; + echo "
";
+ return null;
+ }
+
+ $str_array = json_decode($str, $associative);
+ if ($str_array == null) {
+ echo "File '$file' is empty!"; + echo "
";
+ echo "$errorMsg:";
+ echo "
" . json_last_error_msg(); + $cmd = "json_pp < $file 2>&1"; + exec($cmd, $output); + echo "
" . implode("
", $output); + echo "
";
+ return null;
+ }
+ return $str_array;
+}
+
?>
diff --git a/index.php b/index.php
index 1dfdc81..58b20e0 100644
--- a/index.php
+++ b/index.php
@@ -1,81 +1,254 @@
-
+ Making";
+ if (! mkdir($thumb_dir, 0775, true)) { // true == recursive
+ $ok = false;
+ $last_error = error_get_last();
+ echo "\nUnable to make '$thumb_dir' directory: " . $last_error["message"];
+ }
+ }
+ }
+
+ // TODO: add other checks here
+
+ if (! $ok) exit;
+
+ if ($debug) echo "\n"; // ends any lines already output
+ echo "SUCCESS\n";
+ exit;
+ }
+?>
- " . json_last_error_msg(); + $cmd = "json_pp < $file 2>&1"; + exec($cmd, $output); + echo "
" . implode("
", $output); + echo "
-
+ 0) {
+ echo "\t\n";
+ }
+?>
- {{title}}
-
+
+
- ";
+ }
+?>
+
Aurora activity:
{{key}}:
{{getScale(val)}}
-
- -
-
- -
- -
- -
- -
- + - - "; + } - 50) { - // The initial analyticsTracking.js file has a comment line "//Include your Google Analytics code here" which is < 50 characters. + if ($includeGoogleAnalytics && file_exists("analyticsTracking.js")) { + echo ""; + } ?> - - diff --git a/show_thumbnails.php b/show_thumbnails.php index 251204d..3dba43c 100644 --- a/show_thumbnails.php +++ b/show_thumbnails.php @@ -1,11 +1,15 @@ INTERNAL ERROR: incomplete arguments given to view thumbnails."; echo "dir, prefix, and/or title missing."; exit; } + $homePage = v("homePage", null, $settings_array); + $includeGoogleAnalytics = v("includeGoogleAnalyticsx", false, $homePage); ?> @@ -15,10 +19,11 @@
+
+
+
+
+ Image Settings
++ "; + echo "ERROR: Image settings file '$settings_file_name' not found! Cannot continue."; + echo ""; + exit; + } + $image_settings_str = file_get_contents($settings_file_name, true); + $settings = json_decode($image_settings_str, true); + if ($settings == null) { + echo "
";
+ echo "ERROR: Bad image settings file '$settings_file_name'. Cannot continue.";
+ echo "
Check for missing quotes or commas at the end of every line (except the last one).";
+ echo "
$image_settings_str"; + exit; + } + ?> +
| Setting | Value | Camera Type | $cameraType | "; + $cameraModel = v("cameraModel", "", $settings); + echo "
|---|---|
| Camera Model | $cameraModel |
| Lens | $lens |
| Daytime Auto-Exposure | $value |
| Daytime Manual Exposure | $dayExposure |
| Daytime Brightness | $dayBrightness |
| Daytime Auto-Gain | $value |
| Daytime Manual Gain | $dayGain |
| Daytime AWB | $value |
| Daytime Red Balance | $dayWBR |
| Daytime Blue Balance | $dayWBB |
| Daytime Bin | $dayBin |
| Daytime Mean Target | $dayMean |
| Nighttime Auto-Exposure | $value |
| Nighttime Manual Exposure | $nightExposure |
| Nighttime Brightness | $nightBrightness |
| Nighttime Auto-Gain | $value |
| Nighttime Manual Gain | $nightGain |
| Nighttime AWB | $value |
| Nighttime Red Balance | $nightwbr |
| Nighttime Blue Balance | $nightWBB |
| Nighttime Bin | $nightBin |
| Nighttime Mean Target | $nightMean |
| Offset | $offset |
| Saturation | $saturation |
| Contrast | $contrast |
| Sharpness | $sharpness |