Добавляем поиск CallerId через https запрос

App/Controllers/ModulePhoneBookController.php

@@ -123,6 +123,7 @@ public function getNewRecordsAction(): void
         $parameters['columns'] = [
             'call_id',
             'number' => 'number_rep',
+            'created' => 'created',
             'DT_RowId' => 'id',
         ];
         $parameters['order'] = ['call_id desc'];
@@ -156,20 +157,18 @@ public function saveAction(): void
 
         $dataId = $this->request->getPost('id', ['string', 'trim']);
         $callId = $this->request->getPost('call_id', ['string', 'trim']);
-        $number = $this->request->getPost('number', ['alnum']);
-        $numberRep = $this->request->getPost('number_rep', ['string', 'trim'], $number);
+        $numberRep = $this->request->getPost('number_rep', ['string', 'trim']);
+        $number = PhoneBook::cleanPhoneNumber($numberRep, TRUE);
 
         if (empty($callId) || empty($number)) {
             return;
         }
 
         // If we are unable to change the primary field, delete the old record and recreate it
-        $oldId = null;
         $record = null;
         if (stripos($dataId, 'new') === false) {
             $record = PhoneBook::findFirstById($dataId);
             if ($record->number !== $number) {
-                $oldId = $record->id;
                 $record->delete();
                 $record = null;
             }
@@ -179,39 +178,17 @@ public function saveAction(): void
             $record = new PhoneBook();
         }
 
-        foreach ($record as $key => $value) {
-            switch ($key) {
-                case 'id':
-                    break;
-                case 'number':
-                    $record->number = $number;
-                    break;
-                case 'number_rep':
-                    $record->number_rep = $numberRep;
-                    break;
-                case 'call_id':
-                    $record->call_id = $callId;
-                    break;
-                case 'search_index':
-                    // Collect data for the search index
-                    $username = mb_strtolower($callId);
-                    // Combine all fields into a single string
-                    $record->search_index = $username . $number . $numberRep;
-                    break;
-                default:
-                    break;
-            }
-        }
+        $record->setPhonebookRecord($callId, $numberRep);
 
         if ($record->save() === false) {
             $errors = $record->getMessages();
             $this->flash->error(implode('<br>', $errors));
             $this->view->success = false;
-
+            $this->response->setStatusCode(500);
             return;
         }
 
-        $this->view->data = ['oldId' => $oldId, 'newId' => $record->id];
+        $this->view->data = ['oldId' => $dataId, 'newId' => $record->id];
         $this->view->success = true;
     }
 
@@ -249,9 +226,9 @@ public function deleteAllRecordsAction(): void
     }
 
     /**
-     * Toggle input mask feature.
+     * Save settings
      */
-    public function toggleDisableInputMaskAction(): void
+    public function saveSettingsAction(): void
     {
         if (!$this->request->isPost()) {
             return;
@@ -262,10 +239,19 @@ public function toggleDisableInputMaskAction(): void
             $settings = new Settings();
         }
 
-        $settings->disableInputMask = $this->request->getPost('disableInputMask') === 'true' ? '1' : '0';
+        if ($this->request->hasPost('disableInputMask')) {
+            $settings->disableInputMask = $this->request->getPost('disableInputMask') === 'true' ? '1' : '0';
+        }
+
+        if ($this->request->hasPost('phoneBookApiUrl')) {
+            $settings->phoneBookApiUrl = empty($this->request->getPost('phoneBookApiUrl')) ? NULL : $this->request->getPost('phoneBookApiUrl', 'trim');
+            $settings->phoneBookLifeTime = empty($this->request->getPost('phoneBookLifeTime')) ? 0 : $this->request->getPost('phoneBookLifeTime', 'int!');
+        }
+
         if (!$settings->save()) {
             $this->flash->error(implode('<br>', $settings->getMessages()));
             $this->view->success = false;
+            $this->response->setStatusCode(500);
             return;
         }
         $this->view->success = true;

App/Forms/ModuleConfigForm.php

@@ -21,6 +21,8 @@
 namespace Modules\ModulePhoneBook\App\Forms;
 
 use MikoPBX\AdminCabinet\Forms\BaseForm;
+use Phalcon\Forms\Element\Text;
+use Phalcon\Forms\Element\Numeric;
 use Phalcon\Forms\Element\Check;
 use Phalcon\Forms\Element\File;
 
@@ -31,6 +33,20 @@ public function initialize($entity = null, $options = null): void
         // DisableInputMask
         $this->addCheckBox('disableInputMask', intval($entity->disableInputMask) === 1);
 
+        // phoneBookApiUrl Text field
+        $this->add(
+            new Text('phoneBookApiUrl', [
+                'placeholder' => 'https://',
+            ])
+        );
+
+        // phoneBookLifeTime Text field
+        $this->add(
+            new Numeric('phoneBookLifeTime', [
+                'min' => 0
+            ])
+        );
+
         // Excel file
         $excelFile = new File('excelFile');
         $this->add($excelFile);
@@ -49,7 +65,7 @@ public function addCheckBox(string $fieldName, bool $checked, string $checkedVal
     {
         $checkAr = ['value' => null];
         if ($checked) {
-            $checkAr = ['checked' => $checkedValue,'value' => $checkedValue];
+            $checkAr = ['checked' => $checkedValue, 'value' => $checkedValue];
         }
         $this->add(new Check($fieldName, $checkAr));
     }

App/Views/ModulePhoneBook/Tabs/phonebookTab.volt

@@ -8,7 +8,7 @@
         <div class="ui nine wide column">
             <div class="ui search right action left icon fluid input" id="search-extensions-input">
                 <i class="search link icon" id="search-icon"></i>
-                <input type="search" id="global-search" name="global-search" placeholder="{{ t._('ex_EnterSearchPhrase') }}"
+                <input type="search" id="global-search" name="global-search" placeholder="{{ t._('module_phnbk_Search') }}"
                        aria-controls="KeysTable" class="prompt">
                 <div class="results"></div>
                 <div class="ui basic floating search dropdown button" id="page-length-select">
@@ -36,4 +36,4 @@
     </tr>
     </thead>
     <tbody>
-</table>
+</table>

App/Views/ModulePhoneBook/Tabs/settingsTab.volt

@@ -24,6 +24,21 @@
                 <label for="disableInputMask">{{ t._('module_phnbk_disableInputMask') }}</label>
             </div>
         </div>
+        <div class="ui segment">
+            <div class="wide field">
+                <label for="phoneBookApiUrl">{{ t._('module_phnbk_ApiUrl') }}</label>
+                {{ form.render('phoneBookApiUrl') }}
+                <div>{{ t._('module_phnbk_ApiUrlDescription', {'repesent': '%number%'}) }}</div>
+            </div>
+            <div class="wide field">
+                <label for="phoneBookLifeTime">{{ t._('module_phnbk_СacheLifetime') }}</label>
+                {{ form.render('phoneBookLifeTime') }}
+                <div>{{ t._('module_phnbk_СacheLifetimeDescription') }}</div>
+            </div>
+            <div class="field">
+                <div class="ui labeled icon positive button" id="btn-save-settings-api"><i class="save icon"></i>{{ t._('module_phnbk_SaveBtn') }}</div>
+            </div>
+        </div>
     </div>
     <div class="field">
         <div class="ui labeled icon basic button" id="delete-all-records"><i class="red trash icon"></i>{{ t._('module_phnbk_DeleteAllRecords') }}</div>

Lib/MikoPBXVersion.php

@@ -99,4 +99,17 @@ public static function getLoggerClass(): string
             return  \Phalcon\Logger::class;
         }
     }
+
+    /**
+     * Return validator Callback class for the current version of PBX
+     * @return class-string<\Phalcon\Filter\Validation\Validator\Callback>|class-string<\Phalcon\Validation\Validator\Callback>
+     */
+    public static function getValidatorCallbackClass(): string
+    {
+        if (self::isPhalcon5Version()) {
+            return  \Phalcon\Filter\Validation\Validator\Callback::class;
+        } else {
+            return  \Phalcon\Validation\Validator\Callback::class;
+        }
+    }
 }

Lib/PhoneBookAgi.php

@@ -23,6 +23,7 @@
 use MikoPBX\Core\Asterisk\AGI;
 use MikoPBX\Core\System\Util;
 use Modules\ModulePhoneBook\Models\PhoneBook;
+use Modules\ModulePhoneBook\Models\Settings;
 use Phalcon\Di\Injectable;
 
 /**
@@ -48,15 +49,24 @@ public static function setCallerID(string $type): void
             } else {
                 $number = $agi->request['agi_extension'];
             }
-
+            $number_orig = $number;
             // Normalize the phone number to match the expected format (last 9 digits)
-            $number = '1' . substr($number, -9);
+            $number = PhoneBook::cleanPhoneNumber($number, TRUE);
 
             // Find the corresponding phonebook entry by the number
             $result = PhoneBook::findFirstByNumber($number);
 
+            $settings = Settings::findFirst();
+            $lifeTime = $settings->phoneBookLifeTime ?? 0;
+
+            if ($result === NULL || empty($result->call_id) || ($lifeTime > 0 && $result->created > 0 && $result->created + $lifeTime < time())) {
+                // The record was not found - we are searching through the API
+                $searcher = new PhoneBookFind();
+                $result = $searcher->findApiByNumber($number_orig, $result);
+            }
+
             // If a matching record is found and the call_id is not empty, set the appropriate caller ID
-            if ($result !== null && !empty($result->call_id)) {
+            if ($result !== NULL && !empty($result->call_id)) {
                 if ($type === 'in') {
                     $agi->set_variable('CALLERID(name)', $result->call_id);
                 } else {
@@ -68,4 +78,4 @@ public static function setCallerID(string $type): void
             Util::sysLogMsg('PhoneBookAGI', $e->getMessage(), LOG_ERR);
         }
     }
-}
+}

Lib/PhoneBookFind.php

@@ -0,0 +1,131 @@
+<?php
+
+/*
+ * MikoPBX - free phone system for small business
+ * Copyright © 2017-2024 Alexey Portnov and Nikolay Beketov
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program.
+ * If not, see <https://www.gnu.org/licenses/>.
+ */
+
+namespace Modules\ModulePhoneBook\Lib;
+
+use GuzzleHttp\Client;
+use GuzzleHttp\Exception\ClientException;
+use GuzzleHttp\Exception\GuzzleException;
+use MikoPBX\Core\System\Util;
+use Modules\ModulePhoneBook\Models\PhoneBook;
+use Modules\ModulePhoneBook\Models\Settings;
+use Phalcon\Di\Injectable;
+
+include_once __DIR__ . '/../vendor/autoload.php';
+
+/**
+ * Class PhoneBookFind
+ *
+ */
+class PhoneBookFind extends Injectable
+{
+    /**
+     * Find CallerID from API
+     *
+     * @param string $number_search
+     * @param PhoneBook|null $oldPhoneBook
+     * @return PhoneBook|null
+     */
+    public function findApiByNumber(string $number_search, ?PhoneBook $oldPhoneBook = NULL): ?PhoneBook
+    {
+        // Normalize the phone number to match the expected format (last 9 digits)
+        $number = PhoneBook::cleanPhoneNumber($number_search, TRUE);
+
+        if (empty($number)) {
+            return NULL;
+        }
+
+        $settings = Settings::findFirst();
+        $url = !empty($settings->phoneBookApiUrl) ? str_replace(
+            '%number%',
+            $number,
+            $settings->phoneBookApiUrl
+        ) : NULL;
+
+        if (empty($url)) {
+            return NULL;
+        }
+
+        $callerID = $this->getRequest($url);
+
+        // Logging
+        Util::sysLogMsg(
+            'PhoneBookAGI',
+            "Find CallerID from API: $number => " . (empty($callerID) ? 'NOT FOUND' : $callerID)
+        );
+
+        if ($callerID !== NULL) {
+            // Saving the number in the phonebook
+            $record = $oldPhoneBook !== NULL && $oldPhoneBook->number === $number ? $oldPhoneBook : PhoneBook::findFirstByNumber(
+                $number
+            );
+
+            if ($record == NULL) {
+                $record = new PhoneBook();
+            }
+
+            $record->setPhonebookRecord(
+                $callerID,
+                $record->cleanPhoneNumber($number_search),
+                time()
+            );
+
+            if (!$record->save()) {
+                // Log the error message if an exception occurs
+                Util::sysLogMsg('PhoneBookAGI', implode(' | ', $record->getMessages()), LOG_ERR);
+            } else {
+                return $record;
+            }
+        }
+
+        return NULL;
+    }
+
+    /**
+     * Get the $url content with CURL
+     *
+     * @param string $url
+     * @return string|null
+     */
+    private function getRequest(string $url): ?string
+    {
+        $callerId = NULL;
+        try {
+            $client = new Client([
+                'timeout' => 3,
+                'connect_timeout' => 2
+            ]);
+            $response = $client->get($url);
+            $status = $response->getStatusCode();
+            if ($status === 200) {
+                $callerId = trim($response->getBody()->getContents());
+                $callerId = trim(strip_tags(str_replace('"', "'", $callerId)));
+            }
+        } catch (ClientException $e) {
+            // ClientException only catches status code between 400x-499
+            //Util::sysLogMsg('PhoneBookAGI', $e->getMessage(), LOG_ERR);
+        } catch (GuzzleException $e) {
+            // Log the error message if an exception occurs
+            Util::sysLogMsg('PhoneBookAGI', $e->getMessage(), LOG_ERR);
+        }
+
+        return !empty($callerId) ? $callerId : NULL;
+    }
+}