Events, CurrentScan, pluginsState, APPRISE work

front/php/server/util.php

@@ -202,7 +202,7 @@ function cleanLog($logFile)
 
   $path = "";
 
-  $allowedFiles = ['pialert.log', 'pialert_front.log', 'IP_changes.log', 'stdout.log', 'stderr.log', "pialert_pholus_lastrun.log"];
+  $allowedFiles = ['pialert.log', 'pialert_front.log', 'IP_changes.log', 'stdout.log', 'stderr.log', "pialert_pholus_lastrun.log", 'pialert.php_errors.log'];
   
   if(in_array($logFile, $allowedFiles))
   {
@@ -365,10 +365,39 @@ function encode_single_quotes ($val) {
 // -------------------------------------------------------------------------------------------
 
 function getDateFromPeriod () {
-  $period = $_REQUEST['period'];    
-  return '"'. date ('Y-m-d', strtotime ('+2 day -'. $period) ) .'"';
+
+  $periodDate = $_REQUEST['period'];
+
+  $periodDateSQL = "";
+  $days = "";
+
+  switch ($periodDate) {
+    case '7 days':
+      $days = "7";
+      break;
+    case '1 month':
+      $days = "30";
+      break;
+    case '1 year':
+      $days = "365";
+      break;
+    case '100 years':
+      $days = "3650"; //10 years
+      break;
+    default:
+    $days = "1";    
+  }  
+
+  $periodDateSQL = "-".$days." day"; 
+
+  return " date('now', '".$periodDateSQL."') ";
+ 
+  // $period = $_REQUEST['period'];    
+  // return '"'. date ('Y-m-d', strtotime ('+2 day -'. $period) ) .'"';
 }
 
+
+
 // -------------------------------------------------------------------------------------------
 function quotes ($text) {
   return str_replace ('"','""',$text);

front/php/templates/language/en_us.json

@@ -492,7 +492,7 @@
         "WEBHOOK_REQUEST_METHOD_name" : "Request method",
         "WEBHOOK_REQUEST_METHOD_description" : "The HTTP request method to be used for the webhook call.",
         "WEBHOOK_SIZE_name" : "Max payload size",
-        "WEBHOOK_SIZE_description" : "The maximum size of the webhook payload as number of characters in the passed string. If above limit, it will be truncated and a <code>(text was truncated)</code> message is appended.",
+        "WEBHOOK_SIZE_description" : "The maximum size of the webhook payload as number of characters in the passed string. If above limit, it will be truncated and a <code>(text was truncated)</code> message is appended.",        
         "Apprise_display_name" : "Apprise",
         "Apprise_icon" : "<i class=\"fa fa-bullhorn\"></i>",
         "REPORT_APPRISE_name" : "Enable Apprise",
@@ -501,6 +501,8 @@
         "APPRISE_HOST_description" : "Apprise host URL starting with <code>http://</code> or <code>https://</code>. (don not forget to include <code>/notify</code> at the end)",
         "APPRISE_URL_name" : "Apprise notification URL",
         "APPRISE_URL_description" : "Apprise notification target URL. For example for Telegram it would be <code>tgram://{bot_token}/{chat_id}</code>.",
+        "APPRISE_SIZE_name" : "Max payload size",
+        "APPRISE_SIZE_description" : "The maximum size of the apprise payload as number of characters in the passed string. If above limit, it will be truncated and a <code>(text was truncated)</code> message is appended.",
         "NTFY_display_name" : "NTFY",
         "NTFY_icon" : "<i class=\"fa fa-terminal\"></i>",
         "REPORT_NTFY_name" : "Enable NTFY",

front/plugins/plugin_helper.py

@@ -14,7 +14,9 @@ def read_config_file():
 
     print('[plugin_helper] reading config file')
     # load the variables from  pialert.conf
-    code = compile(filename.read_text(), filename.name, "exec")
+    with open(filename, "r") as file:
+        code = compile(file.read(), filename, "exec")
+
     confDict = {} # config dictionary
     exec(code, {"__builtins__": {}}, confDict)
     return confDict