FS-8871: Fixed encoding "&" and "<" symbols in vanilla config

This commit is contained in:
Sergey Safarov 2016-02-25 13:32:13 +03:00
parent 46599c5a8b
commit 4827e22114
4 changed files with 303 additions and 334 deletions

View File

@ -1,5 +1,5 @@
<configuration name="abstraction.conf" description="Abstraction"> <configuration name="abstraction.conf" description="Abstraction">
<apis> <apis>
<api name="user_name" description="Return Name for extension" syntax="<exten>" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/> <api name="user_name" description="Return Name for extension" syntax="&lt;exten&gt;" parse="(.*)" destination="user_data" argument="$1@default var effective_caller_id_name"/>
</apis> </apis>
</configuration> </configuration>

View File

@ -1,7 +1,7 @@
<configuration name="cidlookup.conf" description="cidlookup Configuration"> <configuration name="cidlookup.conf" description="cidlookup Configuration">
<settings> <settings>
<!-- comment out url to not setup a url based lookup --> <!-- comment out url to not setup a url based lookup -->
<param name="url" value="http://query.voipcnam.com/query.php?api_key=MYAPIKEY&number=${caller_id_number}"/> <param name="url" value="http://query.voipcnam.com/query.php?api_key=MYAPIKEY&amp;number=${caller_id_number}"/>
<!-- comment out whitepages-apikey to not use whitepages.com, you must <!-- comment out whitepages-apikey to not use whitepages.com, you must
get an API key from http://developer.whitepages.com/ --> get an API key from http://developer.whitepages.com/ -->

File diff suppressed because it is too large Load Diff

View File

@ -2,6 +2,9 @@
use strict; use strict;
use Getopt::Long; use Getopt::Long;
use XML::Entities;
use HTML::Entities;
my $base = "/usr/share/zoneinfo"; my $base = "/usr/share/zoneinfo";
my $output = "timezones.conf.xml"; my $output = "timezones.conf.xml";
@ -70,7 +73,7 @@ print $out " " x 4, "<timezones>\n";
my $lastprefix = ""; my $lastprefix = "";
foreach my $zone ( sort( keys(%zones) ) ) { foreach my $zone ( sort( keys(%zones) ) ) {
my $str = $zones{$zone}; my $str = encode_entities($zones{$zone});
next if ( !$str ); next if ( !$str );
my $newprefix = $zone; my $newprefix = $zone;