Merge branch 'master' of github.com:laf/librenms into issue-laf-110-new

Conflicts:
	includes/defaults.inc.php

html/forms/create-alert-item.inc.php

@@ -27,7 +27,7 @@ $invert = mres($_POST['invert']);
 $name = mres($_POST['name']);
 
 if(empty($rule)) {
-    $update_message = "ERROR: No rule was generated";
+    $update_message = "ERROR: No rule was generated - did you forget to click and / or?";
 } elseif(validate_device_id($_POST['device_id']) || $_POST['device_id'] == '-1' || $_POST['device_id'][0] == ':') {
     $device_id = $_POST['device_id'];
     if(!is_numeric($count)) {

html/forms/sensor-alert-update.inc.php

@@ -14,6 +14,10 @@
 
 // FUA
 
+if (isset($_POST['sub_type']) && !empty($_POST['sub_type'])) {
+    dbUpdate(array('sensor_custom' => 'No'), 'sensors', '`sensor_id` = ?', array($_POST['sensor_id']));
+} else {
+
 if(!is_numeric($_POST['device_id']) || !is_numeric($_POST['sensor_id']))
 {
   echo('error with data');
@@ -45,4 +49,5 @@ else
     exit;
   }
 }
+}