diff --git a/agc_2-X/trunk/agi/agi-AGENT_route.agi b/agc_2-X/trunk/agi/agi-AGENT_route.agi index e990196c..e9d3a4d1 100644 --- a/agc_2-X/trunk/agi/agi-AGENT_route.agi +++ b/agc_2-X/trunk/agi/agi-AGENT_route.agi @@ -204,8 +204,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown $calleridname =~ s/\"|\" //gi; } -$callerid =~ s/\D//gi; -$calleridname =~ s/unknown//gi; +$callerid =~ s/\D|\'//gi; +$calleridname =~ s/unknown|\'//gi; if ( (!$callerid) or ($callerid =~ /unknown/) ) {$callerid = $calleridname;} diff --git a/agc_2-X/trunk/agi/agi-CALLCARD_dial_in.agi b/agc_2-X/trunk/agi/agi-CALLCARD_dial_in.agi index cd6b45a5..d75f1456 100644 --- a/agc_2-X/trunk/agi/agi-CALLCARD_dial_in.agi +++ b/agc_2-X/trunk/agi/agi-CALLCARD_dial_in.agi @@ -177,8 +177,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown $calleridname =~ s/\"|\" //gi; } - $callerid =~ s/\D//gi; - $calleridname =~ s/unknown//gi; +$callerid =~ s/\D|\'//gi; +$calleridname =~ s/unknown|\'//gi; if ( (!$callerid) or ($callerid =~ /unknown/) ) {$callerid = $calleridname;} $phone_number=$callerid; diff --git a/agc_2-X/trunk/agi/agi-DID_route.agi b/agc_2-X/trunk/agi/agi-DID_route.agi index c9457368..fb291f1e 100644 --- a/agc_2-X/trunk/agi/agi-DID_route.agi +++ b/agc_2-X/trunk/agi/agi-DID_route.agi @@ -174,8 +174,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown $calleridname =~ s/\"|\" //gi; } -$callerid =~ s/\D//gi; -$calleridname =~ s/unknown//gi; +$callerid =~ s/\D|\'//gi; +$calleridname =~ s/unknown|\'//gi; if ( (!$callerid) or ($callerid =~ /unknown/) ) {$callerid = $calleridname;} diff --git a/agc_2-X/trunk/agi/agi-NVA_recording.agi b/agc_2-X/trunk/agi/agi-NVA_recording.agi index f8a9a02d..70abb6bf 100644 --- a/agc_2-X/trunk/agi/agi-NVA_recording.agi +++ b/agc_2-X/trunk/agi/agi-NVA_recording.agi @@ -150,8 +150,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown $calleridname =~ s/\"|\" //gi; } - $callerid =~ s/\D//gi; - $calleridname =~ s/unknown//gi; +$callerid =~ s/\D|\'//gi; +$calleridname =~ s/unknown|\'//gi; if ( (!$callerid) or ($callerid =~ /unknown/) ) {$callerid = $calleridname;} diff --git a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi index 4cb6c3ad..dd0a9b5b 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi @@ -330,8 +330,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown $calleridname =~ s/\"|\" //gi; } -$callerid =~ s/\D//gi; -$calleridname =~ s/unknown//gi; +$callerid =~ s/\D|\'//gi; +$calleridname =~ s/unknown|\'//gi; if ( (!$callerid) or ($callerid =~ /unknown/) ) {$callerid = $calleridname;} diff --git a/agc_2-X/trunk/agi/agi-VDAD_inbound_calltime_check.agi b/agc_2-X/trunk/agi/agi-VDAD_inbound_calltime_check.agi index 0362c32d..6dcdbbf9 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_inbound_calltime_check.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_inbound_calltime_check.agi @@ -218,8 +218,8 @@ if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown $calleridname =~ s/\"|\" //gi; } -$callerid =~ s/\D//gi; -$calleridname =~ s/unknown//gi; +$callerid =~ s/\D|\'//gi; +$calleridname =~ s/unknown|\'//gi; if ( (!$callerid) or ($callerid =~ /unknown/) ) {$callerid = $calleridname;}