remove apostrophes from incoming CIDnames

git-svn-id: svn://192.168.202.10@1587 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2011-01-11 02:02:00 +00:00
parent fdb3906362
commit 1b7d5f68a2
6 changed files with 12 additions and 12 deletions
+2 -2
View File
@@ -204,8 +204,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown
$calleridname =~ s/\"|\" //gi; $calleridname =~ s/\"|\" //gi;
} }
$callerid =~ s/\D//gi; $callerid =~ s/\D|\'//gi;
$calleridname =~ s/unknown//gi; $calleridname =~ s/unknown|\'//gi;
if ( (!$callerid) or ($callerid =~ /unknown/) ) if ( (!$callerid) or ($callerid =~ /unknown/) )
{$callerid = $calleridname;} {$callerid = $calleridname;}
+2 -2
View File
@@ -177,8 +177,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown
$calleridname =~ s/\"|\" //gi; $calleridname =~ s/\"|\" //gi;
} }
$callerid =~ s/\D//gi; $callerid =~ s/\D|\'//gi;
$calleridname =~ s/unknown//gi; $calleridname =~ s/unknown|\'//gi;
if ( (!$callerid) or ($callerid =~ /unknown/) ) if ( (!$callerid) or ($callerid =~ /unknown/) )
{$callerid = $calleridname;} {$callerid = $calleridname;}
$phone_number=$callerid; $phone_number=$callerid;
+2 -2
View File
@@ -174,8 +174,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown
$calleridname =~ s/\"|\" //gi; $calleridname =~ s/\"|\" //gi;
} }
$callerid =~ s/\D//gi; $callerid =~ s/\D|\'//gi;
$calleridname =~ s/unknown//gi; $calleridname =~ s/unknown|\'//gi;
if ( (!$callerid) or ($callerid =~ /unknown/) ) if ( (!$callerid) or ($callerid =~ /unknown/) )
{$callerid = $calleridname;} {$callerid = $calleridname;}
+2 -2
View File
@@ -150,8 +150,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown
$calleridname =~ s/\"|\" //gi; $calleridname =~ s/\"|\" //gi;
} }
$callerid =~ s/\D//gi; $callerid =~ s/\D|\'//gi;
$calleridname =~ s/unknown//gi; $calleridname =~ s/unknown|\'//gi;
if ( (!$callerid) or ($callerid =~ /unknown/) ) if ( (!$callerid) or ($callerid =~ /unknown/) )
{$callerid = $calleridname;} {$callerid = $calleridname;}
+2 -2
View File
@@ -330,8 +330,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown
$calleridname =~ s/\"|\" //gi; $calleridname =~ s/\"|\" //gi;
} }
$callerid =~ s/\D//gi; $callerid =~ s/\D|\'//gi;
$calleridname =~ s/unknown//gi; $calleridname =~ s/unknown|\'//gi;
if ( (!$callerid) or ($callerid =~ /unknown/) ) if ( (!$callerid) or ($callerid =~ /unknown/) )
{$callerid = $calleridname;} {$callerid = $calleridname;}
@@ -218,8 +218,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown
$calleridname =~ s/\"|\" //gi; $calleridname =~ s/\"|\" //gi;
} }
$callerid =~ s/\D//gi; $callerid =~ s/\D|\'//gi;
$calleridname =~ s/unknown//gi; $calleridname =~ s/unknown|\'//gi;
if ( (!$callerid) or ($callerid =~ /unknown/) ) if ( (!$callerid) or ($callerid =~ /unknown/) )
{$callerid = $calleridname;} {$callerid = $calleridname;}