Merge pull request #53 from acuparse/dev

Version to 2.7.1
acuparse · Jan 3, 2019 · ab96178 · ab96178
2 parents 78cd9de + 931dae6
commit ab96178
Show file tree

Hide file tree

Showing 60 changed files with 14,266 additions and 106 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-{"name":"acuparse","version":"2.7.0-release","schema":"2.5","repo":"https://raw.githubusercontent.com/acuparse/acuparse/master/.version","homepage":"https://www.acuparse.com"}
+{"name":"acuparse","version":"2.7.1-release","schema":"2.5","repo":"https://raw.githubusercontent.com/acuparse/acuparse/master/.version","homepage":"https://www.acuparse.com"}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [[2.7.1]](https://www.acuparse.com/releases/v2-7-1/) - 2019-01-02
+### Changed
+- Bootstrap to V4.2.1.
+- Font Awesome to V5.6.3.
+- Cleanup variables in camera upload scripts.
+- Update Copyright.
+
+### Fixed
+- Header display on tiny screens.
+
 ## [[2.7.0]](https://www.acuparse.com/releases/v2-7-0/) - 2018-12-01
 ### Added
 - Display Mode.

diff --git a/cam/templates/combined.sh b/cam/templates/combined.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ##
 # Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
-# @copyright Copyright (C) 2015-2018 Maxwell Power
+# @copyright Copyright (C) 2015-2019 Maxwell Power
 # @author Maxwell Power <max@acuparse.com>
 # @link http://www.acuparse.com
 # @license AGPL-3.0+
@@ -42,44 +42,44 @@ STATION_INFO=$(wget 'http://127.0.0.1/?cam' -q -O -)
 TIMESTAMP=$(date +"%A, %d %B %Y %H:%M %Z")
 
 echo "Getting camera image"
-wget $CAMERA_HOST/$CAMERA_FILENAME
+wget ${CAMERA_HOST}/${CAMERA_FILENAME}
 
 echo "Applying Timestamp and Copyright"
-convert $CAMERA_FILENAME \
-    -resize $RESIZE \
+convert ${CAMERA_FILENAME} \
+    -resize ${RESIZE} \
     -font DejaVu-Sans-Bold -pointsize 20 \
     -draw "gravity south \
-        fill black  text 0,36 '$TIMESTAMP' \
-        fill OrangeRed2  text 1,37 '$TIMESTAMP' " \
+        fill black  text 0,36 '${TIMESTAMP}' \
+        fill OrangeRed2  text 1,37 '${TIMESTAMP}' " \
     -font DejaVu-Sans-Bold -pointsize 12 \
     -draw "gravity south \
-        fill black  text 0,18 '$STATION_INFO' \
-        fill OrangeRed2  text 1,19 '$STATION_INFO' " \
+        fill black  text 0,18 '${STATION_INFO}' \
+        fill OrangeRed2  text 1,19 '${STATION_INFO}' " \
     -draw "gravity south \
-        fill black  text 0,0 '$WATERMARK' \
-        fill OrangeRed2  text 1,1 '$WATERMARK' " \
+        fill black  text 0,0 '${WATERMARK}' \
+        fill OrangeRed2  text 1,1 '${WATERMARK}' " \
     image.jpg
 
 echo "Sending image to Weather Underground"
 ftp -n webcam.wunderground.com <<END_SCRIPT > /opt/acuparse/logs/wu_upload.log 2>&1
-quote USER $WU_CAM_USER
-quote PASS $WU_CAM_PASS
+quote USER ${WU_CAM_USER}
+quote PASS ${WU_CAM_PASS}
 binary
 put image.jpg
 quit
 END_SCRIPT
 
 echo "Moving image to webserver"
-cp image.jpg $WEBDIR/latest.jpg
-mkdir -p $WEBDIR/$ARCHIVE_DATE
-cp image.jpg $WEBDIR/$ARCHIVE_DATE/$ARCHIVE_TIME.jpg
-chown -R www-data:www-data $WEBDIR
+cp image.jpg ${WEBDIR}/latest.jpg
+mkdir -p ${WEBDIR}/${ARCHIVE_DATE}
+cp image.jpg ${WEBDIR}/${ARCHIVE_DATE}/${ARCHIVE_TIME}.jpg
+chown -R www-data:www-data ${WEBDIR}
 echo "Updating Animation"
-convert -delay 25 -loop 0 $WEBDIR/$ARCHIVE_DATE/*.jpg $WEBDIR/$ARCHIVE_DATE/daily.gif
+convert -delay 25 -loop 0 ${WEBDIR}/${ARCHIVE_DATE}/*.jpg ${WEBDIR}/${ARCHIVE_DATE}/daily.gif
 
 echo "Cleaning up files"
 
 rm image.jpg*
-rm $CAMERA_FILENAME*
+rm ${CAMERA_FILENAME}*
 
 echo "Done Processing"
diff --git a/cam/templates/local.sh b/cam/templates/local.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ##
 # Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
-# @copyright Copyright (C) 2015-2018 Maxwell Power
+# @copyright Copyright (C) 2015-2019 Maxwell Power
 # @author Maxwell Power <max@acuparse.com>
 # @link http://www.acuparse.com
 # @license AGPL-3.0+
@@ -40,11 +40,11 @@ REMOTE_SCRIPT='/opt/acuparse/cam/remote.sh'
 TIMESTAMP=$(date +"%A, %d %B %Y %H:%M %Z")
 
 echo "Getting camera image"
-wget $CAMERA_HOST/$CAMERA_FILENAME
+wget ${CAMERA_HOST}/${CAMERA_FILENAME}
 
 echo "Applying Timestamp and Copyright"
-convert $CAMERA_FILENAME \
-    -resize $RESIZE \
+convert ${CAMERA_FILENAME} \
+    -resize ${RESIZE} \
     -font DejaVu-Sans-Bold -pointsize 20 \
     -draw "gravity south \
         fill black  text 0,36 '$TIMESTAMP' \
@@ -56,24 +56,24 @@ convert $CAMERA_FILENAME \
     image.jpg
 
 echo "Sending image to remote server for processing"
-scp image.jpg $REMOTE_USER@$REMOTE_HOST:$REMOTE_TMP
+scp image.jpg ${REMOTE_USER}@${REMOTE_HOST}:${REMOTE_TMP}
 
 echo "Running remote commands"
-ssh $REMOTE_USER@$REMOTE_HOST 'sh ' $REMOTE_SCRIPT
+ssh ${REMOTE_USER}@${REMOTE_HOST} 'sh ' ${REMOTE_SCRIPT}
 
 # Local Archiving
 # ARCHIVE=$(date +"%F_%H%M")
 # echo "Archiving"
-# convert $CAMERA_FILENAME \
+# convert ${CAMERA_FILENAME} \
 #     -font DejaVu-Sans-Bold -pointsize 16 \
 #     -draw "gravity south \
 #     fill black  text 0,0 '$TIMESTAMP' \
 #     fill OrangeRed2  text 1,1 '$TIMESTAMP' " \
 #     archive.jpg
-# mv archive.jpg archive/$ARCHIVE.jpg
+# mv archive.jpg archive/${ARCHIVE}.jpg
 
 echo "Cleaning up files"
 rm image.jpg*
-rm $CAMERA_FILENAME*
+rm ${CAMERA_FILENAME}*
 
 echo "Done Processing"
diff --git a/cam/templates/remote.sh b/cam/templates/remote.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 ##
 # Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
-# @copyright Copyright (C) 2015-2018 Maxwell Power
+# @copyright Copyright (C) 2015-2019 Maxwell Power
 # @author Maxwell Power <max@acuparse.com>
 # @link http://www.acuparse.com
 # @license AGPL-3.0+
@@ -40,7 +40,7 @@ APACHE_GROUP='www-data'
 
 echo "Starting remote processing"
 
-cd $BASEDIR
+cd ${BASEDIR}
 
 echo "Applying Weather Info Watermark"
 convert image.jpg \
@@ -52,21 +52,21 @@ convert image.jpg \
 
 echo "Sending image to Weather Underground"
 ftp -n webcam.wunderground.com <<EOF > /opt/acuparse/logs/wu_upload.log 2>&1
-quote USER $WU_CAM_USER
-quote PASS $WU_CAM_PASS
+quote USER ${WU_CAM_USER}
+quote PASS ${WU_CAM_PASS}
 binary
 put image.jpg
 quit
 EOF
 
 echo "Moving image to webserver"
-cp image.jpg $WEBDIR/latest.jpg
-mkdir -p $WEBDIR/$ARCHIVE_DATE
-cp image.jpg $WEBDIR/$ARCHIVE_DATE/$ARCHIVE_TIME.jpg
-chown -R $APACHE_USER:$APACHE_GROUP $WEBDIR
+cp image.jpg ${WEBDIR}/latest.jpg
+mkdir -p ${WEBDIR}/${ARCHIVE_DATE}
+cp image.jpg ${WEBDIR}/${ARCHIVE_DATE}/${ARCHIVE_TIME}.jpg
+chown -R ${APACHE_USER}:${APACHE_GROUP} ${WEBDIR}
 
 echo "Updating Animation"
-convert -delay 25 -loop 0 $WEBDIR/$ARCHIVE_DATE/*.jpg $WEBDIR/$ARCHIVE_DATE/daily.gif
+convert -delay 25 -loop 0 ${WEBDIR}/${ARCHIVE_DATE}/*.jpg ${WEBDIR}/${ARCHIVE_DATE}/daily.gif
 
 echo "Removing processed image"
 rm image.jpg*

diff --git a/config/acuparse-ssl.conf b/config/acuparse-ssl.conf
@@ -1,6 +1,6 @@
 ##
 # Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
-# @copyright Copyright (C) 2015-2018 Maxwell Power
+# @copyright Copyright (C) 2015-2019 Maxwell Power
 # @author Maxwell Power <max@acuparse.com>
 # @link http://www.acuparse.com
 # @license AGPL-3.0+

diff --git a/config/acuparse.conf b/config/acuparse.conf
@@ -1,6 +1,6 @@
 ##
 # Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
-# @copyright Copyright (C) 2015-2018 Maxwell Power
+# @copyright Copyright (C) 2015-2019 Maxwell Power
 # @author Maxwell Power <max@acuparse.com>
 # @link http://www.acuparse.com
 # @license AGPL-3.0+

diff --git a/cron/cron.php b/cron/cron.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/sql/master.sql b/sql/master.sql
@@ -1,6 +1,6 @@
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+
@@ -294,10 +294,13 @@ ALTER TABLE `password_recover`
   ON DELETE CASCADE
   ON UPDATE CASCADE;
 
-INSERT INTO `rainfall` (`rainin`, `last_update`) VALUES ('0.00', '2018-01-01 00:00:00');
+INSERT INTO `rainfall` (`rainin`, `last_update`)
+VALUES ('0.00', '2019-01-01 00:00:00');
 
-INSERT INTO `outage_alert` (`last_sent`, `status`) VALUES ('2018-01-01 00:00:00', '0');
+INSERT INTO `outage_alert` (`last_sent`, `status`)
+VALUES ('2019-01-01 00:00:00', '0');
 
-INSERT INTO `last_update` (`timestamp`) VALUES ('2018-01-01 00:00:00');
+INSERT INTO `last_update` (`timestamp`)
+VALUES ('2019-01-01 00:00:00');
 
 INSERT INTO `system` (`name`, `value`) VALUES ('schema', '2.5');
diff --git a/sql/trim/disable.sql b/sql/trim/disable.sql
@@ -1,6 +1,6 @@
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/sql/trim/enable.sql b/sql/trim/enable.sql
@@ -1,6 +1,6 @@
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/sql/trim/enable_xtower.sql b/sql/trim/enable_xtower.sql
@@ -1,6 +1,6 @@
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/mailer.php b/src/fcn/mailer.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/updater/2_x/2_1.php b/src/fcn/updater/2_x/2_1.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/updater/2_x/2_2.php b/src/fcn/updater/2_x/2_2.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/updater/2_x/2_3.php b/src/fcn/updater/2_x/2_3.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/updater/2_x/2_4.php b/src/fcn/updater/2_x/2_4.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/updater/2_x/2_5.php b/src/fcn/updater/2_x/2_5.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/updater/2_x/2_6.php b/src/fcn/updater/2_x/2_6.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/updater/2_x/2_7.php b/src/fcn/updater/2_x/2_7.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+
@@ -35,4 +35,9 @@
         $config->upload->generic->url = '';
         $config->version->app = '2.7.0-release';
         $notes .= '<li><strong>' . $config->version->app . '</strong> - ' . 'Numerous changes, see CHANGELOG.md for details.</li>';
+
+    // Update from 2.7.0-release
+    case '2.7.0-release':
+        $config->version->app = '2.7.1-release';
+        $notes .= '<li><strong>' . $config->version->app . '</strong> - ' . 'Script Updates and Bug Fixes.</li>';
 }
diff --git a/src/fcn/weather/getArchiveHTML.php b/src/fcn/weather/getArchiveHTML.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/weather/getArchiveWeatherData.php b/src/fcn/weather/getArchiveWeatherData.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/weather/getCurrentHTML.php b/src/fcn/weather/getCurrentHTML.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/weather/getCurrentWeatherData.php b/src/fcn/weather/getCurrentWeatherData.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+

diff --git a/src/fcn/weather/weatherIcons.php b/src/fcn/weather/weatherIcons.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Acuparse - AcuRite®‎ Access/smartHUB and IP Camera Data Processing, Display, and Upload.
- * @copyright Copyright (C) 2015-2018 Maxwell Power
+ * @copyright Copyright (C) 2015-2019 Maxwell Power
  * @author Maxwell Power <max@acuparse.com>
  * @link http://www.acuparse.com
  * @license AGPL-3.0+