Bumped version to 2.13.0

.version

@@ -1,2 +1,2 @@
-2.12.1
-2014-09-13
+2.13.0
+2016-08-06

CHANGELOG.md

@@ -1,11 +1,105 @@
 #### Current
 
+* [`bdee90b`](../../commit/bdee90b) Add function to reset database readings (Knut Kohl)
+* [`04fc8b7`](../../commit/04fc8b7) Update initial data SQL (Knut Kohl)
+* [`1bef0ed`](../../commit/1bef0ed) Add channel type specific presets for channel attributes (Knut Kohl)
+* [`66a89de`](../../commit/66a89de) Change geocoding (Knut Kohl)
+* [`00576a1`](../../commit/00576a1) Fix readout for period "readlast" for calculated channels (Knut Kohl)
+* [`1381d2a`](../../commit/1381d2a) Fix missing alias click handler (Knut Kohl)
+* [`61076de`](../../commit/61076de) Update ORM table classes, mostly remove requirement of Cache for speed (Knut Kohl)
+* [`1dd85ec`](../../commit/1dd85ec) Fix reading of non meters with defined start timestamp (Knut Kohl)
+* [`c868f86`](../../commit/c868f86) Fix some issues in Dashborad display (Knut Kohl)
+* [`4bc6664`](../../commit/4bc6664) Decode HTML entites in channel attributes in API response (Knut Kohl)
+* [`19f33f4`](../../commit/19f33f4) Load custom font into local storage if possible (Knut Kohl)
+* [`f51ece9`](../../commit/f51ece9) Adjust and simplify session handling (Knut Kohl)
+* [`a930a8f`](../../commit/a930a8f) Add BB token for small text (Knut Kohl)
+* [`bbf04a7`](../../commit/bbf04a7) Adjust most icons to Font Awesome (Knut Kohl)
+* [`fced56a`](../../commit/fced56a) Statify some methods for better access (Knut Kohl)
+* [`fc2c2aa`](../../commit/fc2c2aa) Handle language setting via cookie instead of session, conflicts with remember cookie (Knut Kohl)
+* [`a6d0d3b`](../../commit/a6d0d3b) Fix listing of meter channels (Knut Kohl)
+* [`5c04308`](../../commit/5c04308) Fix meter reading, missing consumption on 1st row (Knut Kohl)
+* [`8e01c90`](../../commit/8e01c90) Adjust meter channel reading to set 1st reading to zero (Knut Kohl)
+* [`e6df206`](../../commit/e6df206) Fix channel settings dialog, uncheck invalid flags for some display types (Knut Kohl)
+* [`cbfc56a`](../../commit/cbfc56a) Streamline channel class (Knut Kohl)
+* [`c687ba2`](../../commit/c687ba2) Fix Switcher with Hook handling (Knut Kohl)
+* [`a8e5c63`](../../commit/a8e5c63) Add state to string mapping for inverter statuus to Kaco template (Knut Kohl)
+* [`b9d0b05`](../../commit/b9d0b05) Adjust Switcher handling (Knut Kohl)
+* [`22b9ba8`](../../commit/22b9ba8) Adjust format for Kaco inverter data (Knut Kohl)
+* [`d279341`](../../commit/d279341) Adjust some issues in frontend and data readout (Knut Kohl)
+* [`4d6a9db`](../../commit/4d6a9db) Update compressed styles and scripts (Knut Kohl)
+* [`fe940ea`](../../commit/fe940ea) Adjust Kaco inverter handling (Knut Kohl)
+* [`c1e2e63`](../../commit/c1e2e63) Add Kaco RS485 grouping channel and a template for it (Knut Kohl)
+* [`91d4d64`](../../commit/91d4d64) Adjust class loader class map handling (Knut Kohl)
+* [`da8833b`](../../commit/da8833b) Fix error if tree hirarchy ID exceeds 1000 (Knut Kohl)
+* [`d01e34d`](../../commit/d01e34d) Simplify class loading logic (Knut Kohl)
+* [`da75e0b`](../../commit/da75e0b) Adjust data reading especially for meter channels in bar chart (Knut Kohl)
+* [`cd5d6c5`](../../commit/cd5d6c5) Adjust Nginx template configuration file (Knut Kohl)
+* [`f01eb74`](../../commit/f01eb74) Adjust a session issue during login (Knut Kohl)
+* [`caabe5c`](../../commit/caabe5c) Update demo charts (Knut Kohl)
+* [`56f58cc`](../../commit/56f58cc) Fix some issues for initial installation (Knut Kohl)
+* [`7c82bec`](../../commit/7c82bec) Upgrade Slim middleware (Knut Kohl)
+* [`835fa90`](../../commit/835fa90) Upgrade PV-Log JSON 1.1 SDK to 1.3.0 (Knut Kohl)
+* [`425c4cf`](../../commit/425c4cf) Added database schema generated by schemaSpy (Knut Kohl)
+* [`54a6925`](../../commit/54a6925) Draft for defered data processing via a socket server and a Memcache based message queue (Knut Kohl)
+* [`544067e`](../../commit/544067e) Memcache builds internal cache key (Knut Kohl)
+* [`a3831e1`](../../commit/a3831e1) Fix display of cache statistics, display always raw data (Knut Kohl)
+* [`c273190`](../../commit/c273190) Adjust default selection for caches, at least file cache will be used if no other is available (Knut Kohl)
+* [`cb3ddb1`](../../commit/cb3ddb1) Reverted cache handling from Ratio channel class (Knut Kohl)
+* [`fbb8d83`](../../commit/fbb8d83) Adjust ORM generated classes (Knut Kohl)
+* [`24acc49`](../../commit/24acc49) Update styles and scripts (Knut Kohl)
+* [`155dd5f`](../../commit/155dd5f) Fix and adjust cache handling (Knut Kohl)
+* [`27badb5`](../../commit/27badb5) Add branches description to README (Knut Kohl)
+* [`1ce5bda`](../../commit/1ce5bda) Adjust HighCharts version pinning to one file for desktop and mobile view (Knut Kohl)
+* [`bcdb9fa`](../../commit/bcdb9fa) Add index to temp. calced data table (Knut Kohl)
+* [`025db1d`](../../commit/025db1d) Add checkbox to control automatic chart refresh (Knut Kohl)
+* [`75a9344`](../../commit/75a9344) Buffer calculated values in the past for 1 day (Knut Kohl)
+* [`118b52a`](../../commit/118b52a) Update and recompress styles and scriptes (Knut Kohl)
+* [`26cb3cd`](../../commit/26cb3cd) Draft for web font usage and local storage (Knut Kohl)
+* [`2d7a8bd`](../../commit/2d7a8bd) Fix typo (Knut Kohl)
+* [`aadf22f`](../../commit/aadf22f) Buffer QR code into local storage and create only once (Knut Kohl)
+* [`fe9134c`](../../commit/fe9134c) Change include directory from indirect to direct (Knut Kohl)
+* [`b2e6202`](../../commit/b2e6202) AOP parses now all files, independent from marker (Knut Kohl)
+* [`275e44d`](../../commit/275e44d) Renamed tools scripts (without extension) (Knut Kohl)
+* [`e90e497`](../../commit/e90e497) Prepare Loader for multiple callbacks, draft extension point logic for source files (Knut Kohl)
+* [`b218ec7`](../../commit/b218ec7) Adjust icon title and tip (Knut Kohl)
+* [`07bc624`](../../commit/07bc624) Fix wrong calculation for data holes in child channel 1 (Knut Kohl)
+* [`86a8468`](../../commit/86a8468) Fix to show correct API version in API help (Knut Kohl)
+* [`e9d4b88`](../../commit/e9d4b88) App SQL patch 002 (Knut Kohl)
+* [`80d6f28`](../../commit/80d6f28) Update styles and scripts (Knut Kohl)
+* [`888ca4a`](../../commit/888ca4a) Add QR-code for mobile view (Knut Kohl)
+* [`a98271f`](../../commit/a98271f) Minor layout fixes (Knut Kohl)
+* [`b862b33`](../../commit/b862b33) Add API r6 and set as latest (Knut Kohl)
+* [`9d86fae`](../../commit/9d86fae) Fix labels with temperatures below 0 °C (Knut Kohl)
+* [`c4e76da`](../../commit/c4e76da) Fix indent (Knut Kohl)
+* [`8a15089`](../../commit/8a15089) Add databse table size information to Info module (Knut Kohl)
+* [`43138db`](../../commit/43138db) Fix Hash route description (Knut Kohl)
+* [`d40da25`](../../commit/d40da25) Minor frontend and layout changes (Knut Kohl)
+* [`4750d8d`](../../commit/4750d8d) Upgrade JQuery UI to v1.11.2 (Knut Kohl)
+* [`7caeae4`](../../commit/7caeae4) Minor frontend changes (Knut Kohl)
+* [`74b5bb5`](../../commit/74b5bb5) Some fixes for data readout of calculated channels (Knut Kohl)
+* [`325be7b`](../../commit/325be7b) Move install and upgrade helper scripts to tools directory (Knut Kohl)
+* [`4d75ed3`](../../commit/4d75ed3) Update README.md (Knut Kohl)
+* [`d2e0bc9`](../../commit/d2e0bc9) Move application settings to database, change initial setup and user auth. handling (Knut Kohl)
+* [`b4ff4bf`](../../commit/b4ff4bf) Adjust data readout, especially for channels used as childs (Knut Kohl)
+* [`c064a6e`](../../commit/c064a6e) Adjust cron.php, fork out processes for each section to handle (Knut Kohl)
+* [`eaaa54e`](../../commit/eaaa54e) Change upgrade logic from GitHub, apply database patches via script automatic (Knut Kohl)
+* [`b5519d2`](../../commit/b5519d2) Move settings from config file to database (Knut Kohl)
+* [`adc3db3`](../../commit/adc3db3) Add configuration for daylight curve calculation using harmonic mean (Knut Kohl)
+* [`8fd2411`](../../commit/8fd2411) Fix layout for chart handling options (Knut Kohl)
+* [`e900e43`](../../commit/e900e43) Delete channels correct from hierarchy in front end, close  [#33](../../issues/33) (Knut Kohl)
+* [`0976a97`](../../commit/0976a97) Add option to hide a channel initially in chart (Knut Kohl)
+* [`a0c683b`](../../commit/a0c683b) Set latest API version to r5 (Knut Kohl)
+* [`892d038`](../../commit/892d038) Add API r5 with some improvements for CSV and batch load (Knut Kohl)
+* [`b5b04af`](../../commit/b5b04af) Add sprites for common function images (Knut Kohl)
+* [`debd35e`](../../commit/debd35e) Change menu to SmartMenu (Knut Kohl)
+* [`c68ebed`](../../commit/c68ebed) Adjust nginx config template (Knut Kohl)
+* [`5456475`](../../commit/5456475) Add anonymous usage statistics (Knut Kohl)
+* [`30586e4`](../../commit/30586e4) Update CHANGELOG (Knut Kohl)
 * [`d31c1b5`](../../commit/d31c1b5) Update compressed styles and scripts (Knut Kohl)
 * [`a0fb4ca`](../../commit/a0fb4ca) Add irradiation forcast channel type to Wunderground group. (Knut Kohl)
 * [`b6b8b04`](../../commit/b6b8b04) Simplify logic for latest API release (Knut Kohl)
 * [`01e07a8`](../../commit/01e07a8) Fix some errors in add/edit of a channel and frontend (Knut Kohl)
 * [`384ef11`](../../commit/384ef11) Fix template handling without grouping header (Knut Kohl)
-* [`5153213`](../../commit/5153213) Minor changes (Knut Kohl)
 * [`08ad3cf`](../../commit/08ad3cf) Fix not working node deletion from hierarchy via API (Knut Kohl)
 * [`5406736`](../../commit/5406736) Fixed typos in Solar Edge templates (Knut Kohl)
 * [`87ef390`](../../commit/87ef390) Add count of stored readings to response and header (Knut Kohl)
@@ -18,6 +112,21 @@
 * [`66c3f4a`](../../commit/66c3f4a) Fix wrong ignored config files (Knut Kohl)
 * [`7e7d77e`](../../commit/7e7d77e) Centralize API key setting for front end JS (Knut Kohl)
 
+#### v2.12.4
+
+* [`eb51482`](../../commit/eb51482) Fix install script to work with empty MySQL passwords (Knut Kohl)
+
+#### v2.12.3
+
+* [`3969c5d`](../../commit/3969c5d) Fix install script to work with empty MySQL passwords (Knut Kohl)
+
+#### v2.12.2
+
+* [`2d5f71b`](../../commit/2d5f71b) Fix error on initial startup (Knut Kohl)
+* [`d666170`](../../commit/d666170) Merge pull request  [#34](../../issues/34) from gitter-badger/gitter-badge (Knut Kohl)
+* [`8536d99`](../../commit/8536d99) Added Gitter badge (The Gitter Badger)
+* [`c669824`](../../commit/c669824) Fixed missing view pvlng_channel_view (Knut Kohl)
+
 #### v2.12.1
 
 * [`d2a3a8e`](../../commit/d2a3a8e) Fixed missing view pvlng_channel_view (Knut Kohl)
@@ -735,4 +844,4 @@
 
 * [`35d76c8`](../../commit/35d76c8) Bumped version 1.0.0 (Knut Kohl)
 * [`94e8371`](../../commit/94e8371) First source commit (Knut Kohl)
-* [`404a205`](../../commit/404a205) Initial commit (Knut Kohl)
+* [`404a205`](../../commit/404a205) Initial commit (Knut Kohl)

frontend/Controller/Admin.php

@@ -47,8 +47,8 @@ public function LoginPOST_Action() {
     public function LoginGET_Action() {
         if ($this->app->params->get('token') == \PVLng::getLoginToken()) {
             \Session::login($this->config->get('Core.Password'));
+            $this->app->redirect();
         }
-        $this->app->redirect();
     }
 
     /**
@@ -98,7 +98,7 @@ public function AdminPasswordPOST_Action() {
 
         if ($this->view->Ok) {
             \Messages::Success(__('PasswordSaved'));
-            \Session::set('user', TRUE);
+            \Session::login($settings->getValue());
             $this->app->user = TRUE;
             $this->app->redirect('/');
         }

prepend.php.dist → prepend.dist.php

@@ -12,3 +12,8 @@
  * Example for monitored installation by Newrelic ()
  */
 # if (extension_loaded('newrelic')) newrelic_set_appname('PVLng');
+
+/**
+ * If you encounter problems, make PVLng more chatty
+ */
+# define('DEVELOP', true);

public/index.php

@@ -231,7 +231,8 @@ function _redirect( $route ) {
      * Check location
      */
     if (($app->config->get('Core.Latitude') == '' || $app->config->get('Core.Longitude') == '') &&
-        strpos($pattern, '/adminpass') === false && strpos($pattern, '/location') === false) {
+        strpos($pattern, '/login') === false && strpos($pattern, '/adminpass') === false &&
+        strpos($pattern, '/location') === false) {
         $app->redirect('/location');
     }
 
@@ -315,7 +316,8 @@ function _redirect( $route ) {
     // Check logged in user
     if (!$app->user) {
         Messages::Info(__('LoginRequired'));
-        $app->redirect('/');
+        \Session::set('returnto', $_SERVER['REQUEST_URI']);
+        $app->redirect('/login');
     }
 };