X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FConf.pm;h=6bfe047b9ea6baa76260551620a8a18bf5df6e6a;hp=ef2a9388a68e75f8b30e2536c4ac8ce55a05ee62;hb=389b6f1116c3309c2ee57a6c295ed1a793503095;hpb=1d0374a383ba412f9e9390705965a9d8467508f7

diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index ef2a9388a..6bfe047b9 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -774,6 +774,7 @@ my $validate_email = sub { $_[0] =~
     'section'     => 'credit_cards',
     'description' => 'Add a credit card surcharge to invoices, as a % of the invoice total.  WARNING: Although recently permitted to US merchants in general, specific consumer protection laws may prohibit or restrict this practice in California, Colorado, Connecticut, Florda, Kansas, Maine, Massachusetts, New York, Oklahome, and Texas.  Surcharging is also generally prohibited in most countries outside the US, AU and UK.  When allowed, typically not permitted to be above 4%.',
     'type'        => 'text',
+    'per_agent'   => 1,
   },
 
   {
@@ -3073,6 +3074,23 @@ and customer address. Include units.',
   },
 
   {
+    'key'         => 'pingd-interval',
+    'section'     => 'network_monitoring',
+    'description' => 'Run ping scans of broadband services at this interval.',
+    'type'        => 'select',
+    'select_hash' => [ ''     => '',
+                       60     => '1 min',
+                       300    => '5 min',
+                       600    => '10 min',
+                       1800   => '30 min',
+                       3600   => '1 hour',
+                       14400  => '4 hours',
+                       28800  => '8 hours',
+                       86400  => '1 day',
+                     ],
+  },
+
+  {
     'key'         => 'ticket_system-default_queueid',
     'section'     => 'ticketing',
     'description' => 'Default queue used when creating new customer tickets.',
@@ -5402,11 +5420,7 @@ and customer address. Include units.',
     'section'     => 'customer_fields',
     'description' => 'Use customer note classes',
     'type'        => 'select',
-    'select_hash' => [
-                       0 => 'Disabled',
-		       1 => 'Enabled',
-		       2 => 'Enabled, with tabs',
-		     ],
+    'select_enum' => [ '', 'Enabled', 'Required' ],
   },
 
   {