From fea94df0f3314a9334826014410d349b487f0a21 Mon Sep 17 00:00:00 2001 From: Juan Ferrer Toribio Date: Mon, 12 Dec 2016 09:29:35 +0100 Subject: [PATCH] Compatible con la ultima version de php-vn-lib --- agi-bin/agi.php | 62 --------------------- agi-bin/incoming.php | 70 ------------------------ config.php | 1 - configure.php | 14 ----- debian/changelog | 2 +- debian/install | 3 +- extensions.conf | 125 ------------------------------------------- php-test | 3 -- 8 files changed, 3 insertions(+), 277 deletions(-) delete mode 100644 agi-bin/agi.php delete mode 100755 agi-bin/incoming.php delete mode 100644 configure.php delete mode 100644 extensions.conf delete mode 100755 php-test diff --git a/agi-bin/agi.php b/agi-bin/agi.php deleted file mode 100644 index dd3b4a9..0000000 --- a/agi-bin/agi.php +++ /dev/null @@ -1,62 +0,0 @@ - 0) - $result = $match[3]; - return $ret; - } - } - - return -1; - } -} - -?> diff --git a/agi-bin/incoming.php b/agi-bin/incoming.php deleted file mode 100755 index 641cab5..0000000 --- a/agi-bin/incoming.php +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/php -q -init (); -$db = $app->getSysConn (); - -Agi::init (); - -// Formats the caller phone number - -$callerId = str_replace ('+', '00', Agi::get ('agi_callerid')); - -$countryPrefix = $db->getValue ('SELECT country_prefix FROM config'); -$prefixLen = strlen ($countryPrefix); - -if (substr ($callerId, 0, $prefixLen) === $countryPrefix) - $callerId = substr ($callerId, $prefixLen); - -// Checks if phone number is on the blacklist - -if ($db->getValue ('SELECT COUNT(*) > 0 FROM blacklist WHERE phone = #', [$callerId])) -{ - Agi::exec ('HANGUP'); - exit (); -} - -// Checks whether its a festive day - -$sundayFestive = $db->getValue ('SELECT sunday_festive FROM config'); - -if (date ('N') == 7 && $sundayFestive) -{ - Agi::exec ('SET VARIABLE MACRO playback'); - Agi::exec ('SET VARIABLE ARG1 out-of-ours'); - exit (); -} - -// Gets the customer from the phone number - -$customer = $db->getValue ('SELECT customer_from_phone(#)', [$callerId]); - -if ($customer) -{ - // Gets the customer salesperson extension - - $extension = $db->getValue ( - 'SELECT s.extension - FROM sip s - JOIN vn2008.Trabajadores t ON t.user_id = s.user_id - WHERE t.id_trabajador = vn2008.Averiguar_ComercialCliente_Id(#, CURDATE())' - ,[$customer] - ); - - if ($extension) - { - Agi::exec ('SET VARIABLE MACRO exten'); - Agi::exec ("SET VARIABLE ARG1 $extension"); - } - else - { - Agi::exec ('SET VARIABLE MACRO playback'); - Agi::exec ('SET VARIABLE ARG1 busy'); - } -} - -?> diff --git a/config.php b/config.php index ef50258..04595bd 100644 --- a/config.php +++ b/config.php @@ -20,4 +20,3 @@ return [ ]; -?> diff --git a/configure.php b/configure.php deleted file mode 100644 index 4d37a17..0000000 --- a/configure.php +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/debian/changelog b/debian/changelog index 68e3003..a50c277 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -vn-asterisk (1.005-deb7) stable; urgency=low +vn-asterisk (1.008-deb7) stable; urgency=low * Initial Release. diff --git a/debian/install b/debian/install index 6658c39..bd79db0 100644 --- a/debian/install +++ b/debian/install @@ -1,4 +1,5 @@ config.php etc/vn-asterisk -agi-bin/* usr/share/asterisk/agi-bin sounds/* usr/share/asterisk/sounds/custom moh/* usr/share/asterisk/moh +incoming.php usr/share/asterisk/agi-bin +agi.php usr/share/asterisk/agi-bin diff --git a/extensions.conf b/extensions.conf deleted file mode 100644 index d016447..0000000 --- a/extensions.conf +++ /dev/null @@ -1,125 +0,0 @@ -[general] - -static=yes -writeprotect=no - -[default] - -exten => s,1,Hangup - -;+++++++++++++++++++++++++++++++++++++++++++++++++++++++ Outgoing calls - -[outgoing] - -;-------------- Urgent calls - -exten => _091,1,Macro(external,pri,${EXTEN}) -exten => _112,1,Macro(external,pri,${EXTEN}) - -;-------------- Internal extensions - -exten => _1006,1,Dial(SIP/${EXTEN},14,tT) - same => n,GotoIf($["${DIALSTATUS}" != "ANSWER"]?redirect) - same => n(redirect),Dial(SIP/1104,,tT) - same => n,Hangup - -exten => _XX00,1,Queue(${EXTEN},tT) - same => n,Hangup - -exten => _XX98,1,RemoveQueueMember(${EXTEN:0:2}00) - same => n,Playback(removed) - same => n,Hangup - -exten => _XX99,1,AddQueueMember(${EXTEN:0:2}00) - same => n,Playback(added) - same => n,Hangup - -exten => _XXXX,1,Dial(SIP/${EXTEN},,tT) - same => n,Followme(${EXTEN}) - same => n,Hangup - -;-------------- External numbers - -exten => _[98][1-9]XXXXXXX,1,Macro(external,pri,${EXTEN}) -exten => _[67]XXXXXXXX,1,Macro(external,pri,${EXTEN}) -exten => _900XXXXXX,1,Macro(external,pri,${EXTEN}) - -exten => _0034XXXX,1,Goto(internal,0${EXTEN:4},1) -exten => _0034X.,1,Goto(internal,${EXTEN:4},1) -exten => _0031XXXXXXXXX,1,Macro(external,xtratelecom,${EXTEN}) -exten => _00X.,1,Macro(external,wcd,${EXTEN}) - -exten => _0XXXX,1,Macro(authenticate,pri,${EXTEN:1:4}) -exten => _X.,1,Macro(authenticate,pri,${EXTEN}) - -;-------------- Invalid numbers - -exten => i,1,Playback(invalid) - same => n,Hangup - -exten => t,1,Playback(invalid) - same => n,Hangup - -;-------------- Macros - -[macro-authenticate] - -exten => s,1,Authenticate(7070) - same => n,Macro(external,${ARG1},${ARG2}) - -[macro-external] - -exten => s,1,Dial(SIP/${ARG1}/${ARG2},,T) - same => n,Hangup - -;+++++++++++++++++++++++++++++++++++++++++++++++++++++++ Incomings calls - -[incoming] - -exten => _X.,1,AGI(incoming.php) - same => n,GotoIf($["${MACRO}" != ""]?macro:ivr) - same => n(macro),Macro(${MACRO},${ARG1}) - same => n,Hangup - same => n(ivr),Goto(ivr,s,1) - -exten => _XX00,1,Macro(queue,${EXTEN}) -exten => _XXXX,1,Macro(exten,${EXTEN}) - -[ivr] - -exten => s,1,Answer - same => n,BackGround(custom/ivr) - same => n,WaitExten(5) - -exten => 1,1,Macro(queue,1500) -exten => 2,1,Macro(queue,1100) -exten => 3,1,Macro(queue,1400) -exten => 4,1,Macro(queue,1500) -exten => 5,1,Macro(queue,1500) -exten => 6,1,Macro(queue,1000) - -exten => i,1,Playback(invalid) - same => n,Goto(ivr,s,1) - -exten => t,1,Playback(invalid) - same => n,Goto(ivr,s,1) - -;-------------- Macros - -[macro-queue] - -exten => s,1,Answer - same => n,Queue(${ARG1},t,,,60) - same => n,Macro(playback,busy) - -[macro-exten] - -exten => s,1,Dial(SIP/${ARG1},60,t) - same => n,Followme(${ARG1}) - same => n,Macro(playback,busy) - -[macro-playback] - -exten => s,1,Playback(custom/${ARG1}) - same => n,Hangup - diff --git a/php-test b/php-test deleted file mode 100755 index 267e94b..0000000 --- a/php-test +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -php5 -d auto_prepend_file=configure.php "$@"