diff --git a/archive/ca.turbo-2017.03.12-x86_64-1.txz b/archive/ca.turbo-2017.03.12-x86_64-1.txz deleted file mode 100644 index a198689..0000000 Binary files a/archive/ca.turbo-2017.03.12-x86_64-1.txz and /dev/null differ diff --git a/archive/ca.turbo-2017.03.14-x86_64-1.txz b/archive/ca.turbo-2017.03.14-x86_64-1.txz new file mode 100644 index 0000000..58a53f9 Binary files /dev/null and b/archive/ca.turbo-2017.03.14-x86_64-1.txz differ diff --git a/plugins/ca.turbo.plg b/plugins/ca.turbo.plg index d37f9a1..7e8b81e 100644 --- a/plugins/ca.turbo.plg +++ b/plugins/ca.turbo.plg @@ -2,8 +2,8 @@ - - + + @@ -13,6 +13,9 @@ +###2017.03.14 +- Support a user script to force modes on a schedule (see support thread) + ###2017.03.12a - Fix minor display aberration diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/images/ca.turbo.png b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/images/ca.turbo.png index a72042f..1b0c8b7 100644 Binary files a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/images/ca.turbo.png and b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/images/ca.turbo.png differ diff --git a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php index bebd022..788eaa5 100644 --- a/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php +++ b/source/ca.turbo/usr/local/emhttp/plugins/ca.turbo/include/exec.php @@ -46,19 +46,26 @@ echo "Settings Updated"; break; case 'status': - if ( is_file($turboPaths['backgroundPID']) ) { - $status = readJsonFile($turboPaths['status']); - } - if ( ! $status ) { + $status = readJsonFile($turboPaths['status']); + if ( (! is_file($turboPaths['backgroundPID']) ) && (! $status['override'] ) ) { $unRaidVars = parse_ini_file("/var/local/emhttp/var.ini"); if ($unRaidVars['md_write_method'] == "1") { $status['mode'] = "turbo"; } } $spunDown = ( $status ) ? $status['spundown'] : "Script Not Running"; + $o = "