Merge branch 'develop' of github.com:mikopbx/Core into develop

README.md

@@ -41,7 +41,7 @@ The system has an easy and convenient web interface, call recording, conference
 ## Getting Started
 1. Download [latest released](https://github.com/mikopbx/Core/releases/latest) ISO file in assets section
 2. Create a new virtual machine (e.g. VMware Player)
-3. Select **Other Linux 4.x kernel 64-bit** on the virtual machine settings
+3. Select **Other Linux 6.6.1 kernel 64-bit** on the virtual machine settings
 4. Boot from ISO firmware and install MikoPBX on storage according to internal instructions.
 5. Continue set up your PBX system over a web interface with default credentials. Username: *admin*  password: *admin*
 
@@ -52,7 +52,7 @@ Or follow our wiki for [additional instructions](https://wiki.mikopbx.com/en:set
 * Easy to install and easy to setup.
 * Multilingual interface with community-supported translation service.
 * Wiki documentation with context helpers on the web interface.
-* Latest PJSIP stack and Asterisk LTS 16 release installed.
+* Latest PJSIP stack and Asterisk LTS 20 release installed.
 * Fail2Ban and iptables already included.
 * Modular architecture.
 * Plugins marketplace.
@@ -107,7 +107,7 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 
 ## License
 MikoPBX© - free phone system for small business
-Copyright © 2017-2021 Alexey Portnov and Nikolay Beketov
+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

sites/admin-cabinet/assets/js/src/GeneralSettings/general-settings-modify.js

@@ -418,14 +418,47 @@ const generalSettingsModify = {
      * @param {Object} response - The response from the server after the form is sent
      */
     cbAfterSendForm(response) {
+        $("#error-messages").remove();
         if (!response.success) {
             Form.$submitButton.removeClass('disabled');
+            generalSettingsModify.generateErrorMessageHtml(response);
         } else {
             $('.password-validate').remove();
         }
         generalSettingsModify.checkDeleteAllConditions();
     },
 
+    /**
+     * The function collects an information message about a data saving error
+     * @param response
+     */
+    generateErrorMessageHtml(response) {
+        if (response.messages && response.messages.error) {
+            const $div = $('<div>', { class: 'ui negative message', id: 'error-messages' });
+            const $header = $('<div>', { class: 'header' }).text(globalTranslate.gs_ErrorSaveSettings);
+            $div.append($header);
+            const $ul = $('<ul>', { class: 'list' });
+            const messagesSet = new Set();
+            response.messages.error.forEach(errorArray => {
+                errorArray.forEach(error => {
+                    let textContent ='';
+                    if(globalTranslate[error.message] === undefined){
+                        textContent = error.message;
+                    }else{
+                        textContent = globalTranslate[error.message];
+                    }
+                    if (messagesSet.has(textContent)) {
+                        return;
+                    }
+                    messagesSet.add(error.message);
+                    $ul.append($('<li>').text(textContent));
+                });
+            });
+            $div.append($ul);
+            $('#submitbutton').before($div);
+        }
+    },
+
     /**
      * Initialize the validation rules of the form
      */

sites/admin-cabinet/assets/js/src/OutOffWorkTime/out-of-work-time-modify.js

@@ -398,7 +398,7 @@ const outOfWorkTimeRecord = {
         }
 
         // Check all fields
-        if ($('#calType').parent().dropdown('get value') !== 'caldav'
+        if ($('#calType').parent().dropdown('get value') === 'none'
             && result.data.time_from === ''
             && result.data.time_to === ''
             && result.data.weekday_from === '-1'
@@ -427,12 +427,12 @@ const outOfWorkTimeRecord = {
         const serverOffset = parseInt(outOfWorkTimeRecord.$formObj.form('get value', 'serverOffset'));
         const offsetDiff = serverOffset + currentOffset;
 
-        if($('#calType').parent().dropdown('get value') === 'caldav'){
-            Form.validateRules.timefrom.rules = [];
-            Form.validateRules.timeto.rules = [];
-        } else {
+        if($('#calType').parent().dropdown('get value') === 'none'){
             Form.validateRules.timefrom.rules = outOfWorkTimeRecord.additionalTimeIntervalRules;
             Form.validateRules.timeto.rules = outOfWorkTimeRecord.additionalTimeIntervalRules;
+        } else {
+            Form.validateRules.timefrom.rules = [];
+            Form.validateRules.timeto.rules = [];
         }
 
         if (dateFrom) {

src/AdminCabinet/Controllers/OutOffWorkTimeController.php

@@ -196,7 +196,7 @@ public function modifyAction(string $id = ''): void
             if($providerData['registration_type'] === Sip::REG_TYPE_INBOUND || empty($providerData['host'])){
                 $providersId[$providerData['uniqid']] = $providerData['uniqid'];
             }else{
-                $providersId[$providerData['uniqid']] = SIPConf::getContextId($providerData['host'] . $providerData['port']);
+                $providersId[$providerData['uniqid']] = SIPConf::getContextId($providerData['host'] , $providerData['port']);
             }
         }
         unset($data);

src/Common/Messages/az.php

@@ -1279,4 +1279,7 @@
     'nw_NATInfo6OR' => 'YA',
     'nw_NATInfo2' => '1:1 NAT istifadə edilmirsə, marşrutlaşdırıcının parametrlərində aşağıdakı portları ictimai IP-dən PBX-in daxili IP ünvanına yönləndirin.',
     'nw_PublicSIPPort' => 'SIP port nömrəsi daxili %SIP_PORT% PBX-ə yönləndirildi',
+    'gs_ErrorSaveSettings' => 'Parametrləri yadda saxlama xətası',
+    'mo_ThisNumberNotUniqueForExtensionsModels' => 'Göstərilən artırma nömrəsi artıq istifadə olunur',
+    'fw_iaxDescription' => 'IAX - telefon qeydiyyatı və səs trafiki',
 ];

src/Common/Messages/cs.php

@@ -1280,4 +1280,7 @@
     'nw_NATInfo6OR' => 'NEBO',
     'nw_PublicSIPPort' => 'Číslo SIP portu přesměrováno na interní %SIP_PORT% PBX',
     'nw_PublicTLSPort' => 'Číslo portu SIP TLS přesměrováno na interní %TLS_PORT% PBX',
+    'gs_ErrorSaveSettings' => 'Při ukládání nastavení došlo k chybě',
+    'mo_ThisNumberNotUniqueForExtensionsModels' => 'Zadané číslo pobočky se již používá',
+    'fw_iaxDescription' => 'IAX - registrace telefonu a hlasový provoz',
 ];

src/Common/Messages/da.php

@@ -1280,4 +1280,7 @@
     'nw_NATInfo2' => 'Hvis 1:1 NAT ikke bruges, skal du omdirigere følgende porte fra den offentlige IP til den interne IP-adresse på PBX\'en i dine routerindstillinger.',
     'nw_NATInfo4' => '%RTP_PORT_FROM%-%RTP_PORT_TO% UDP',
     'nw_NATInfo5' => 'Hvis et eksternt værtsnavn er angivet, vil det blive brugt frem for den eksterne IP-adresse.',
+    'gs_ErrorSaveSettings' => 'Fejl under lagring af indstillinger',
+    'mo_ThisNumberNotUniqueForExtensionsModels' => 'Det angivne lokalnummer er allerede i brug',
+    'fw_iaxDescription' => 'IAX - telefonregistrering og taletrafik',
 ];

src/Common/Messages/de.php

@@ -1283,4 +1283,7 @@
     'nw_NATInfo1' => 'Wenn Ihr Netzwerk für die Unterstützung von 1:1-NAT konfiguriert ist (normalerweise die Standardeinstellung in Clouds), müssen Sie keine zusätzlichen Einstellungen an Ihrem Router vornehmen.',
     'nw_NATInfo2' => 'Wenn 1:1 NAT nicht verwendet wird, leiten Sie in Ihren Router-Einstellungen die folgenden Ports von der öffentlichen IP auf die interne IP-Adresse der TK-Anlage um.',
     'nw_PublicSIPPort' => 'SIP-Portnummer, die an die interne %SIP_PORT%-PBX weitergeleitet wird',
+    'gs_ErrorSaveSettings' => 'Fehler beim Speichern der Einstellungen',
+    'mo_ThisNumberNotUniqueForExtensionsModels' => 'Die angegebene Nebenstellennummer wird bereits verwendet',
+    'fw_iaxDescription' => 'IAX – Telefonregistrierung und Sprachverkehr',
 ];

src/Common/Messages/el.php

@@ -1280,4 +1280,7 @@
     'nw_NATInfo2' => 'Εάν δεν χρησιμοποιείται NAT 1:1, ανακατευθύνετε τις ακόλουθες θύρες από τη δημόσια IP στην εσωτερική διεύθυνση IP του PBX στις ρυθμίσεις του δρομολογητή σας.',
     'nw_PublicSIPPort' => 'Ο αριθμός θύρας SIP προωθείται στο εσωτερικό PBX %SIP_PORT%',
     'nw_PublicTLSPort' => 'Ο αριθμός θύρας SIP TLS προωθείται στο εσωτερικό PBX %TLS_PORT%',
+    'gs_ErrorSaveSettings' => 'Σφάλμα αποθήκευσης ρυθμίσεων',
+    'mo_ThisNumberNotUniqueForExtensionsModels' => 'Ο καθορισμένος αριθμός επέκτασης χρησιμοποιείται ήδη',
+    'fw_iaxDescription' => 'IAX - εγγραφή τηλεφώνου και φωνητική κίνηση',
 ];

src/Common/Messages/en.php

@@ -1283,4 +1283,7 @@
     'nw_NATInfo6OR' => 'OR',
     'nw_PublicSIPPort' => 'SIP port number forwarded to internal %SIP_PORT% PBX',
     'nw_PublicTLSPort' => 'SIP TLS port number forwarded to internal %TLS_PORT% PBX',
+    'gs_ErrorSaveSettings' => 'Error saving settings',
+    'mo_ThisNumberNotUniqueForExtensionsModels' => 'The specified extension number is already in use',
+    'fw_iaxDescription' => 'IAX - Phone Registration and Voice Traffic',
 ];

src/Common/Messages/es.php

@@ -1280,4 +1280,7 @@
     'nw_NATInfo3' => '%SIP_PORT% TCP/UDP y %TLS_PORT% TCP',
     'nw_NATInfo5' => 'Si se especifica un nombre de host externo, se utilizará con preferencia a la dirección IP externa.',
     'nw_PublicTLSPort' => 'Número de puerto SIP TLS reenviado al PBX interno %TLS_PORT%',
+    'gs_ErrorSaveSettings' => 'Error al guardar la configuración',
+    'mo_ThisNumberNotUniqueForExtensionsModels' => 'El número de extensión especificado ya está en uso',
+    'fw_iaxDescription' => 'IAX: registro telefónico y tráfico de voz',
 ];