Plugins 0.1 - Adding LIST setting 0.1

back/pialert.py

@@ -2900,7 +2900,9 @@ def mqtt_start():
     # Get all devices
     devices = get_all_devices()
 
-    file_print("        Estimated delay: ", (len(devices) * int(MQTT_DELAY_SEC)*5), 's ', '(', round((len(devices) * int(MQTT_DELAY_SEC))/60,1) , 'min)' )
+    sec_delay = len(devices) * int(MQTT_DELAY_SEC)*5
+
+    file_print("        Estimated delay: ", (sec_delay), 's ', '(', round(sec_delay/60,1) , 'min)' )
 
     for device in devices:        
 
@@ -3589,8 +3591,10 @@ def get_form_control(setting):
         return 'boolean'
     if type in ['TIMEOUT', 'RUN_TIMEOUT']:
         return 'integer'
-    if type in ['WATCH', 'LIST']:
+    if type in ['WATCH']:
         return 'multiselect'
+    if type in ['LIST']:
+        return 'text'        
 
     return 'text'
 

front/php/server/util.php

@@ -275,24 +275,24 @@ function saveSettings()
     {
       if($group == $setting[0])
       {            
-        if($setting[3] == 'text' or $setting[3] == 'password' or $setting[3] == 'readonly' or $setting[3] == 'selecttext')
+        if($setting[2] == 'text' or $setting[2] == 'password' or $setting[2] == 'readonly' or $setting[2] == 'selecttext')
         {
-          $txt = $txt.$setting[1]."='".$setting[2]."'\n" ; 
+          $txt = $txt.$setting[1]."='".$setting[3]."'\n" ; 
-        } elseif($setting[3] == 'integer' or $setting[3] == 'selectinteger')
+        } elseif($setting[2] == 'integer' or $setting[2] == 'selectinteger')
         {
-          $txt = $txt.$setting[1]."=".$setting[2]."\n" ; 
+          $txt = $txt.$setting[1]."=".$setting[3]."\n" ; 
-        } elseif($setting[3] == 'boolean')
+        } elseif($setting[2] == 'boolean')
         {
           $val = "False";
-          if($setting[2] == 'true')
+          if($setting[3] == 'true')
           {
             $val = "True";
           }
           $txt = $txt.$setting[1]."=".$val."\n" ; 
-        }elseif($setting[3] == 'multiselect' or $setting[3] == 'subnets')
+        }elseif($setting[2] == 'multiselect' or $setting[2] == 'subnets')
         {
           $temp = '[';
-          foreach($setting[2] as $val)
+          foreach($setting[3] as $val)
           {
             $temp = $temp."'". $val."',";
           }

front/plugins/website_monitoring/config.json

@@ -56,7 +56,7 @@
             "localized": ["name", "description"],
             "name" :[{
                 "language_code":"en_us",
-                "string" : "Run condition"
+                "string" : "When to run"
             }],
             "description": [{
                 "language_code":"en_us",

front/settings.php

@@ -30,6 +30,7 @@ global $db;
 $result = $db->query("SELECT * FROM Settings");  
 
 // array 
+$lists = array();
 $settings = array();
 while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {   
   // Push row data      
@@ -232,6 +233,37 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
               // Remove all interfaces button               
               $input = $input.'<div><button class="btn btn-primary" onclick="removeInterfaces()">Remove all</button></div>';
               
+            }               
+            //  list
+            elseif ($set['Type'] == 'list')
+            {
+
+              $lists[] = array($set['Code_Name']);
+
+              $input = $input.
+              '<div class="row form-group">
+                <div class="col-xs-6">
+                  <input class="form-control" type="text" placeholder="Enter value"/>
+                </div>';
+              // Add interface button
+              $input = $input.
+                '<div class="col-xs-3"><button class="btn btn-primary" onclick="addList'.$set['Code_Name'].'()" >Add</button></div>
+                </div>';
+              
+              // list all interfaces as options
+              $input = $input.'<div class="form-group">
+                <select class="form-control" name="'.$set['Code_Name'].'" id="'.$set['Code_Name'].'" multiple readonly>';
+                
+              $options = createArray($set['Value']);                
+
+              foreach ($options as $option) {                                       
+
+                $input = $input.'<option value="'.$option.'" disabled>'.$option.'</option>';
+              }                
+              $input = $input.'</select></div>';
+              // Remove all interfaces button               
+              $input = $input.'<div><button class="btn btn-primary" onclick="removeList'.$set['Code_Name'].'()">Remove all</button></div>';
+              
             }               
 
             $html = $html.$input;
@@ -302,6 +334,13 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
     showModalOk('WARNING', "<?= lang("settings_missing")?>");    
   }
 
+  <?php
+    foreach($list as $lists)
+    {
+      // HERE TODO
+    }
+  ?>
+  
   // ---------------------------------------------------------
   function addInterface()
   {
@@ -340,17 +379,17 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
     // generate javascript to collect values    
     <?php 
 
-    $noConversion = array('text', 'integer', 'password', 'readonly', 'selecttext', 'selectinteger', "multiselect"); 
+    $noConversion = array('text', 'integer', 'password', 'readonly', 'selecttext', 'selectinteger', 'multiselect'); 
 
     foreach ($settings as $set) { 
       if(in_array($set['Type'] , $noConversion))
       {         
-        echo 'settingsArray.push(["'.$set["Group"].'", "'.$set["Code_Name"].'", $("#'.$set["Code_Name"].'").val(), "'.$set["Type"].'" ]);';      
+        echo 'settingsArray.push(["'.$set["Group"].'", "'.$set["Code_Name"].'", "'.$set["Type"].'", $("#'.$set["Code_Name"].'").val() ]);';
       } 
       elseif ($set['Type'] == "boolean")
       {
         echo 'temp = $("#'.$set["Code_Name"].'").is(":checked") ;';
-        echo 'settingsArray.push(["'.$set["Group"].'", "'.$set["Code_Name"].'", temp, "'.$set["Type"].'" ]);';  
+        echo 'settingsArray.push(["'.$set["Group"].'", "'.$set["Code_Name"].'", "'.$set["Type"].'", temp ]);';  
       }
       elseif ($set["Code_Name"] == "SCAN_SUBNETS")
       {        
@@ -361,7 +400,7 @@ while ($row = $result -> fetchArray (SQLITE3_ASSOC)) {
         });       
         
         ";
-        echo 'settingsArray.push(["'.$set["Group"].'", "'.$set["Code_Name"].'", temps, "'.$set["Type"].'" ]);';
+        echo 'settingsArray.push(["'.$set["Group"].'", "'.$set["Code_Name"].'", "'.$set["Type"].'", temps ]);';
       }
     }