From d07fec0c6ff594783ef0eff1544d3299e57ff7d6 Mon Sep 17 00:00:00 2001
From: bergware <ronald.vd.berg62@gmail.com>
Date: Sat, 8 Sep 2018 15:30:02 +0200
Subject: [PATCH] Updated parity help text and simplified cron entries

---
 plugins/dynamix/ParityCheck.page          |  9 ++---
 plugins/dynamix/include/update.parity.php | 42 +++++++----------------
 2 files changed, 17 insertions(+), 34 deletions(-)

diff --git a/plugins/dynamix/ParityCheck.page b/plugins/dynamix/ParityCheck.page
index bb87f5f05..c92c66e56 100644
--- a/plugins/dynamix/ParityCheck.page
+++ b/plugins/dynamix/ParityCheck.page
@@ -115,7 +115,7 @@ Day of the week:
 <?endif;?>
   </select>
 
-> When a weekly or custom schedule is selected then choose here the preferred day of the week, otherwise this setting is unavailable.
+> When a **weekly** or **custom** schedule is selected then choose here the preferred *day of the week*, in the other schedules this setting is not used and unavailable.
 
 <?if ($parity['mode']<5):?>
 Day of the month:
@@ -143,7 +143,8 @@ Week of the month:
 <?endif;?>
   </select>
 
-> When a monthly, yearly or custom schedule is selected then choose here the preferred day of the month, otherwise this setting is unavailable.
+> When a **monthly** or **yearly** schedule is selected then choose here the preferred *day of the month*.
+> When a **custom** schedule is selected then choose here the preferred *week of the month*, in the other schedules this setting is not used and unavailable.
 
 Time of the day:
 : <select name="hour" size="1">
@@ -157,7 +158,7 @@ Time of the day:
 <?endif;?>
   </select>
 
-> Choose the desired time to start the schedule. Granularity is given in half hour periods.
+> Choose the desired *time of the day* to start the schedule. Time granularity is given in half hour periods.
 
 Month of the year:
 <?if ($parity['mode']>=4):?>
@@ -178,7 +179,7 @@ Month of the year:
 <?endif;?>
   </select>
 
-> When a yearly or custom schedule is selected then choose here the preferred month of the year, otherwise this setting is unavailable.
+> When a **yearly** or **custom** schedule is selected then choose here the preferred *month of the year*, in the other schedules this setting is not used and unavailable.
 
 Write corrections to parity disk:
 : <select name="write" size="1">
diff --git a/plugins/dynamix/include/update.parity.php b/plugins/dynamix/include/update.parity.php
index 4e40b9e7b..ec69b70f0 100644
--- a/plugins/dynamix/include/update.parity.php
+++ b/plugins/dynamix/include/update.parity.php
@@ -1,6 +1,6 @@
 <?PHP
-/* Copyright 2005-2017, Lime Technology
- * Copyright 2012-2017, Bergware International.
+/* Copyright 2005-2018, Lime Technology
+ * Copyright 2012-2018, Bergware International.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License version 2,
@@ -18,39 +18,21 @@ $memory = '/tmp/memory.tmp';
 if (isset($_POST['#apply'])) {
   $cron = "";
   if ($_POST['mode']>0) {
-    $time = isset($_POST['hour']) ? $_POST['hour'] : '* *';
-    $dotm = isset($_POST['dotm']) ? $_POST['dotm'] : '*';
+    $time = $_POST['hour'] ?? '* *';
+    $dotm = $_POST['dotm'] ?? '*';
+    $term = $echo = '';
     switch ($dotm) {
-    case '28-31':
-      $term = '[[ $(date +%e -d +1day) -eq 1 ]] && ';
-      break;
-    case 'W1':
-      $dotm = '*';
-      $term = '[[ $(date +%e) -le 7 ]] && ';
-    break;
-    case 'W2':
-      $dotm = '*';
-      $term = '[[ $(date +%e -d -7days) -le 7 ]] && ';
-      break;
-    case 'W3':
-      $dotm = '*';
-      $term = '[[ $(date +%e -d -14days) -le 7 ]] && ';
-      break;
-    case 'W4':
-      $dotm = '*';
-      $term = '[[ $(date +%e -d -21days) -le 7 ]] && ';
-      break;
-    case 'WL':
-      $dotm = '*';
-      $term = '[[ $(date +%e -d +7days) -le 7 ]] && ';
-      break;
-    default:
-      $term = '';
+      case '28-31': $term = '[[ $(date +%e -d +1day) -eq 1 ]] && '; $echo = ' || :'; break;
+      case 'W1'   : $dotm = '1-7'; break;
+      case 'W2'   : $dotm = '8-14'; break;
+      case 'W3'   : $dotm = '15-21'; break;
+      case 'W4'   : $dotm = '22-28'; break;
+      case 'WL'   : $dotm = '24-31'; break;
     }
     $month = isset($_POST['month']) ? $_POST['month'] : '*';
     $day = isset($_POST['day']) ? $_POST['day'] : '*';
     $write = isset($_POST['write']) ? $_POST['write'] : '';
-    $cron = "# Generated parity check schedule:\n$time $dotm $month $day $term/usr/local/sbin/mdcmd check $write &> /dev/null || :\n\n";
+    $cron = "# Generated parity check schedule:\n$time $dotm $month $day $term/usr/local/sbin/mdcmd check $write &> /dev/null{$echo}\n\n";
   }
   parse_cron_cfg("dynamix", "parity-check", $cron);
   @unlink($memory);