From 145fcbf932ffab45ca36cbcf1ec8737bd6c30658 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 30 Aug 2019 16:31:33 +0000 Subject: [PATCH 1/2] freepbx-17661 --- Superfecta.class.php | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/Superfecta.class.php b/Superfecta.class.php index 5cab4d91..1ae7a8f8 100644 --- a/Superfecta.class.php +++ b/Superfecta.class.php @@ -654,6 +654,37 @@ public function updateScheme($scheme, $data = array()) { return array("status" => true); } + public function bulkhandler_superfecta_cfg($settings) { + global $db; + $sfenable = $settings['sf_enable']; + if (isset($sfenable) && !empty($sfenable) && (strtolower($sfenable) == 'true')) { + if (!isset($settings['sf_scheme']) || empty($settings['sf_scheme'])) { + $sfscheme = 'ALL|ALL'; //default scheme + } else if (strstr($settings['sf_scheme'],'ALL')) { + $sfscheme = 'ALL|ALL'; //default scheme + } else { + $sfscheme = $settings['sf_scheme']; + $res = $this->getScheme(trim($sfscheme)); + if(!$res || empty($res)) { + dbug("bulkhandler_scheme_cfg: Invalid superfecta scheme ".$sfscheme); + return; + } + $sfscheme = 'base_'.$sfscheme; + } + $invalidDIDChars = array('<', '>'); + $settings['extension'] = trim(str_replace($invalidDIDChars, "", $settings['extension'])); + $settings['cidnum'] = trim(str_replace($invalidDIDChars, "", $settings['cidnum'])); + + $sql = "INSERT INTO superfecta_to_incoming (extension, cidnum, scheme) values (:extension, :cidnum,:superfecta_scheme)"; + $q = $db->prepare($sql); + $q->bindParam(':extension', $settings['extension'], \PDO::PARAM_STR); + $q->bindParam(':cidnum', $settings['cidnum'], \PDO::PARAM_STR); + $q->bindParam(':superfecta_scheme', $sfscheme, \PDO::PARAM_STR); + $q->execute(); + dbug("bulkhandler_scheme_cfg: superfecta scheme ".$sfscheme. " enabled for incoming did".$settings['extension']); + } + } + public function getScheme($scheme) { //strip off base if it's sent to us we dont need it $scheme = preg_replace('/^base_/','',$scheme); From 14d2c12c896b598f427fff4d5b1a21bd4d7b0684 Mon Sep 17 00:00:00 2001 From: kapil gupta Date: Tue, 3 Sep 2019 13:44:25 +0530 Subject: [PATCH 2/2] [Module Tag script: superfecta 14.0.22] freepbx-17661 --- i18n/de_DE/LC_MESSAGES/superfecta.mo | Bin 3072 -> 3072 bytes i18n/de_DE/LC_MESSAGES/superfecta.po | 6 +++--- i18n/es_ES/LC_MESSAGES/superfecta.mo | Bin 18401 -> 18401 bytes i18n/es_ES/LC_MESSAGES/superfecta.po | 6 +++--- i18n/fr_FR/LC_MESSAGES/superfecta.mo | Bin 1844 -> 1844 bytes i18n/fr_FR/LC_MESSAGES/superfecta.po | 6 +++--- i18n/pt_BR/LC_MESSAGES/superfecta.mo | Bin 10934 -> 10934 bytes i18n/pt_BR/LC_MESSAGES/superfecta.po | 6 +++--- i18n/superfecta.pot | 6 +++--- i18n/vi/LC_MESSAGES/superfecta.mo | Bin 20120 -> 20120 bytes i18n/vi/LC_MESSAGES/superfecta.po | 6 +++--- i18n/zh_CN/LC_MESSAGES/superfecta.mo | Bin 876 -> 876 bytes i18n/zh_CN/LC_MESSAGES/superfecta.po | 6 +++--- module.xml | 3 ++- 14 files changed, 23 insertions(+), 22 deletions(-) diff --git a/i18n/de_DE/LC_MESSAGES/superfecta.mo b/i18n/de_DE/LC_MESSAGES/superfecta.mo index db513d02274a3a4d459c6c82f228e170cb54b77e..852046c15818eff490403aaf8ace0d4a89c237b5 100644 GIT binary patch delta 27 icmZpWXpq>z%g$%1YhbKkXl!L-qHSPmyjhz4DGLBtzy@;w delta 27 icmZpWXpq>z%g$${YiOZhXli9-rfXnouvwb@DGLBtv<7nk diff --git a/i18n/de_DE/LC_MESSAGES/superfecta.po b/i18n/de_DE/LC_MESSAGES/superfecta.po index 03acfd47..bae67b3f 100644 --- a/i18n/de_DE/LC_MESSAGES/superfecta.po +++ b/i18n/de_DE/LC_MESSAGES/superfecta.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-02-18 15:26-0500\n" +"POT-Creation-Date: 2019-09-03 13:44+0530\n" "PO-Revision-Date: 2018-10-17 15:00+0000\n" "Last-Translator: Bastian Mertgen \n" "Language-Team: German \n" @@ -317,7 +317,7 @@ msgid "" "data sources." msgstr "" -#: Superfecta.class.php:728 +#: Superfecta.class.php:759 msgid "Reset" msgstr "Zurücksetzen" @@ -413,7 +413,7 @@ msgstr "" msgid "Starting scheme %s" msgstr "Starte Schema %s" -#: Superfecta.class.php:733 +#: Superfecta.class.php:764 msgid "Submit" msgstr "Absenden" diff --git a/i18n/es_ES/LC_MESSAGES/superfecta.mo b/i18n/es_ES/LC_MESSAGES/superfecta.mo index df56c87a6b4304141e6a3387be7378eb25fb51f1..447a52a2fb79698b81b53d556242d7bb71259663 100644 GIT binary patch delta 32 mcmaFZ&-k#PaYMMOprx(>5E&~N8e5r|Xd9RsZ_ZGyR0061&usK7uQV9U6WeGX} diff --git a/i18n/es_ES/LC_MESSAGES/superfecta.po b/i18n/es_ES/LC_MESSAGES/superfecta.po index a0a28287..b4604496 100644 --- a/i18n/es_ES/LC_MESSAGES/superfecta.po +++ b/i18n/es_ES/LC_MESSAGES/superfecta.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-16 15:01-0400\n" +"POT-Creation-Date: 2019-09-03 13:44+0530\n" "PO-Revision-Date: 2016-12-11 12:35+0200\n" "Last-Translator: Ernesto \n" "Language-Team: Spanish O?3WBJDf0C%7VqyPW_ delta 30 kcmdnOw}o$mDvO|nu7QcJp_ziAsg;2tkZrKpjO8B_0CzP9n*aa+ diff --git a/i18n/fr_FR/LC_MESSAGES/superfecta.po b/i18n/fr_FR/LC_MESSAGES/superfecta.po index e65a773f..c381d2e5 100644 --- a/i18n/fr_FR/LC_MESSAGES/superfecta.po +++ b/i18n/fr_FR/LC_MESSAGES/superfecta.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-16 15:01-0400\n" +"POT-Creation-Date: 2019-09-03 13:44+0530\n" "PO-Revision-Date: 2019-03-29 17:00+0000\n" "Last-Translator: jeremie cattan \n" "Language-Team: French \n" @@ -317,7 +317,7 @@ msgid "" "data sources." msgstr "" -#: Superfecta.class.php:728 +#: Superfecta.class.php:759 msgid "Reset" msgstr "Réinitialiser" @@ -413,7 +413,7 @@ msgstr "" msgid "Starting scheme %s" msgstr "" -#: Superfecta.class.php:733 +#: Superfecta.class.php:764 msgid "Submit" msgstr "Envoyer" diff --git a/i18n/pt_BR/LC_MESSAGES/superfecta.mo b/i18n/pt_BR/LC_MESSAGES/superfecta.mo index 2d46e75ba82ff9b8ea331807a8dee836af14b1aa..0980e8e99ca34df6632b59fb15e9060a98882c88 100644 GIT binary patch delta 30 kcmdlMx-E1=h`6Aot^p7kD;OGEnV4uBm>O?R6%P~!0F9>z9smFU delta 30 kcmdlMx-E1=h`6AIu7QcJp_ziAsg;2tkZrIzRXk7_0F68d6#xJL diff --git a/i18n/pt_BR/LC_MESSAGES/superfecta.po b/i18n/pt_BR/LC_MESSAGES/superfecta.po index 64eb77cd..038dab96 100644 --- a/i18n/pt_BR/LC_MESSAGES/superfecta.po +++ b/i18n/pt_BR/LC_MESSAGES/superfecta.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-16 15:01-0400\n" +"POT-Creation-Date: 2019-09-03 13:44+0530\n" "PO-Revision-Date: 2017-03-08 21:01+0200\n" "Last-Translator: Kingvoice \n" "Language-Team: Portuguese (Brazil) \n" "Language-Team: LANGUAGE \n" @@ -329,7 +329,7 @@ msgid "" "data sources." msgstr "" -#: Superfecta.class.php:728 +#: Superfecta.class.php:759 msgid "Reset" msgstr "" @@ -431,7 +431,7 @@ msgstr "" msgid "Starting scheme %s" msgstr "" -#: Superfecta.class.php:733 +#: Superfecta.class.php:764 msgid "Submit" msgstr "" diff --git a/i18n/vi/LC_MESSAGES/superfecta.mo b/i18n/vi/LC_MESSAGES/superfecta.mo index 24e1f144b474720d2762156aca833217aa2dbaa4..41b75a58b4d017b0b9c209dc179c496b3f424af4 100644 GIT binary patch delta 32 mcmbO+mvP2i#tq@Bf|j}lKxC|7Xl!L-qHSPmyg5VFKobC*8VHL3 delta 32 mcmbO+mvP2i#tq@Bf)=_4Cc1`Z3Wlau28KYk!R8EA15E&%uLyzw diff --git a/i18n/vi/LC_MESSAGES/superfecta.po b/i18n/vi/LC_MESSAGES/superfecta.po index ab1caba1..742801e1 100644 --- a/i18n/vi/LC_MESSAGES/superfecta.po +++ b/i18n/vi/LC_MESSAGES/superfecta.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-16 15:01-0400\n" +"POT-Creation-Date: 2019-09-03 13:44+0530\n" "PO-Revision-Date: 2017-08-03 10:42+0200\n" "Last-Translator: PETER \n" "Language-Team: Vietnamese ~I8RxmWSGBMFMFg4zMl5sI30Fo~V$N&HU delta 30 kcmaFE_J(c44n{!>T>}$cLo)?KQ!4{QAlqQ`Nyf#D0FlH9zW@LL diff --git a/i18n/zh_CN/LC_MESSAGES/superfecta.po b/i18n/zh_CN/LC_MESSAGES/superfecta.po index 4df37aeb..482cda51 100644 --- a/i18n/zh_CN/LC_MESSAGES/superfecta.po +++ b/i18n/zh_CN/LC_MESSAGES/superfecta.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: FreePBX 2.5 Chinese Translation\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-16 15:01-0400\n" +"POT-Creation-Date: 2019-09-03 13:44+0530\n" "PO-Revision-Date: 2018-09-22 10:00+0000\n" "Last-Translator: james zhu \n" "Language-Team: Chinese (Simplified) superfecta extended CID Superfecta - 14.0.21 + 14.0.22 setup Admin Sangoma Technologies Corporation @@ -12,6 +12,7 @@ Provides simultaneous use of, and complete control over multiple caller id data sources. + *14.0.22* freepbx-17661 *14.0.21* FREEPBX-20323 Update regexs for whocalledUK *14.0.20* FREEPBX-15770 fix name formatting for whocalled *14.0.19* FREEPBX-19037