[Rt-commit] r4677 - in rtir/branches/1.9-EXPERIMENTAL: etc html/RTIR/Elements

[ruz at bestpractical.com]

Author: ruz
Date: Fri Mar  3 20:42:34 2006
New Revision: 4677

Modified:
   rtir/branches/1.9-EXPERIMENTAL/   (props changed)
   rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm
   rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky

Log:
 r829 at cubic-pc:  cubic | 2006-03-04 04:38:55 +0300
 * RTIR_MakeClicky config option, that allow admin to define
   allowed clicky actions


Modified: rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/etc/RTIR_Config.pm	Fri Mar  3 20:42:34 2006
@@ -257,7 +257,7 @@
 Set($DisplayAfterEdit, 1);
 
 # path to traceroute command
-Set($TracerouteCommand, '/usr/bin/traceroute');
+Set($TracerouteCommand, '/usr/sbin/traceroute');
 
 
 # Components that available to add on the first page of the RTIR
@@ -277,4 +277,8 @@
 # if true then Blocks queue functionality inactive and disabled
 Set($RTIR_DisableBlocksQueue, 0);
 
+# Define list of enabled MakeClicky extensions, allowed values are
+# httpurl, ip, ipdecimal, email, domain and RIPE
+Set(@RTIR_MakeClicky, qw(httpurl ip email domain));
+
 1;

Modified: rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky
==============================================================================
--- rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky	(original)
+++ rtir/branches/1.9-EXPERIMENTAL/html/RTIR/Elements/MakeClicky	Fri Mar  3 20:42:34 2006
@@ -90,6 +90,13 @@
     F_domain    => [ q[(?:[\w-]+\.)+[A-Za-z]{2,3}],                $cb{host} ],
     G_RIPE      => [ q[(?-i:[A-Z][A-Z0-9-]+)],                     $cb{noc} ],
 );
+my @allowed_types = RT->Config->Get('RTIR_MakeClicky');
+if ( @allowed_types ) {
+    foreach my $t( keys %types ) {
+        delete $types{ $t } unless grep $t =~ /^[a-z]+_\Q$_\E$/i, @allowed_types;
+    }
+}
+
 my @types = sort keys %types;
 
 foreach ( values %types ) {