Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion App/Controllers/AccessGroupsRightsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ private function getAvailableRESTControllersActions(): array
if (in_array($annotation->getName(), $possibleHTTPMethods)) {
$actionName = $annotation->getArgument(0);
// Remove always allowed or always disallowed actions
if (!empty($actionName) and !in_array($actionName, $excludedActions[$controllerName])) {
if (!empty($actionName) and !in_array($actionName, $excludedActions[$controllerName]??[])) {
$actions[$actionName] = false;
}
}
Expand Down
8 changes: 7 additions & 1 deletion Lib/ACL/CoreACL.php
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ public static function getLinkedControllerActions(): array
RestEndpoints::API_CDR => [
RestEndpoints::ACTION_CDR_API_PLAYBACK_V2,
RestEndpoints::ACTION_CDR_PLAYBACK,
RestEndpoints::ACTION_CDR_API_GET_RECORD_FILE_V2
RestEndpoints::ACTION_CDR_API_GET_RECORD_FILE_V2,
RestEndpoints::ACTION_CDR_API_GET_LATEST_RECORD_DATE
]
]
],
Expand Down Expand Up @@ -254,6 +255,11 @@ public static function getAlwaysAllowed(): array{
RestEndpoints::ACTION_LIC_SEND_PBX_METRICS
],
RestEndpoints::API_NCHAN => '*',

RestEndpoints::API_USER_PAGE_TRACKER => [
RestEndpoints::ACTION_USER_PAGE_TRACKER_PAGE_VIEW,
RestEndpoints::ACTION_USER_PAGE_TRACKER_PAGE_LEAVE
]
];
}

Expand Down
6 changes: 6 additions & 0 deletions Lib/EndpointConstants.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class EndpointConstants
const API_SYSINFO = '/pbxcore/api/sysinfo';
const API_STORAGE = '/pbxcore/api/storage';
const API_ADVICE = '/pbxcore/api/advice';
const API_USER_PAGE_TRACKER = '/pbxcore/api/user-page-tracker';
const API_SOME_ENDPOINT = '/pbxcore/api/someendpoint';

// CDR (Call Detail Records) API Actions
Expand All @@ -50,6 +51,7 @@ class EndpointConstants
const ACTION_CDR_PLAYBACK = '/playback';
const ACTION_CDR_API_PLAYBACK_V2 = '/v2/playback';
const ACTION_CDR_API_GET_RECORD_FILE_V2 = '/v2/getRecordFile';
const ACTION_CDR_API_GET_LATEST_RECORD_DATE = '/getLatestRecordDate';

// SIP API Actions
const ACTION_SIP_API_GET_PEER = '/getSipPeer';
Expand Down Expand Up @@ -94,6 +96,10 @@ class EndpointConstants
const ACTION_SOUND_GET_PATH_BY_ID = 'getPathById';
const ACTION_SOUND_GET_FILES = 'getSoundFiles';

// User Page Tracker API Actions
const ACTION_USER_PAGE_TRACKER_PAGE_VIEW = '/pageView';
const ACTION_USER_PAGE_TRACKER_PAGE_LEAVE = '/pageLeave';

// Generic Actions
const ACTION_API_DELETE_RECORD = '/deleteRecord';
const ACTION_API_GET_REGISTRY = '/getRegistry';
Expand Down
1 change: 0 additions & 1 deletion Lib/UsersUILdapAuth.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
use LdapRecord\Container;
use MikoPBX\Common\Handlers\CriticalErrorsHandler;
use MikoPBX\Common\Providers\LoggerAuthProvider;
use Modules\ModuleLdapSync\Lib\AnswerStructure;
use Phalcon\Di\Injectable;

include_once __DIR__ . '/../vendor/autoload.php';
Expand Down
2 changes: 1 addition & 1 deletion Messages/de.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License along with this program.
* If not, see <https://www.gnu.org/licenses/>.
*/
'repModuleUsersUI' => 'Systemzugriffskontrolle %repesent%',
'repModuleUsersUI' => 'Systemzugriffskontrolle - %repesent%',
'mo_ModuleModuleUsersUI' => 'Systemzugriffskontrolle ',
'BreadcrumbModuleUsersUI' => 'Systemzugriffskontrolle ',
'SubHeaderModuleUsersUI' => 'Erstellung von Zugriffsgruppen, Einschränkung von Rechten, Domänenautorisierung',
Expand Down
2 changes: 1 addition & 1 deletion Messages/fi.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
* You should have received a copy of the GNU General Public License along with this program.
* If not, see <https://www.gnu.org/licenses/>.
*/
'repModuleUsersUI' => 'Järjestelmän kulunvalvonta - %repesent%',
'repModuleUsersUI' => 'Järjestelmän käyttöoikeuksien hallinta - %repesent%',
'mo_ModuleModuleUsersUI' => 'Järjestelmän kulunvalvonta ',
'BreadcrumbModuleUsersUI' => 'Järjestelmän kulunvalvonta ',
'SubHeaderModuleUsersUI' => 'Käyttöoikeusryhmien luominen, oikeuksien rajoittaminen, verkkotunnuksen valtuutus',
Expand Down
8 changes: 4 additions & 4 deletions Messages/hu.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
* You should have received a copy of the GNU General Public License along with this program.
* If not, see <https://www.gnu.org/licenses/>.
*/
'repModuleUsersUI' => 'Rendszer hozzáférés-vezérlés - %repesent%',
'mo_ModuleModuleUsersUI' => 'Rendszer hozzáférés-szabályozás ',
'BreadcrumbModuleUsersUI' => 'Rendszer hozzáférés-szabályozás ',
'SubHeaderModuleUsersUI' => 'Hozzáférési csoportok létrehozása, jogok korlátozása, domain jogosultság',
'repModuleUsersUI' => 'Rendszerhozzáférés-vezérlés - %repesent%',
'mo_ModuleModuleUsersUI' => 'Rendszerhozzáférés kezelése ',
'BreadcrumbModuleUsersUI' => 'Rendszerhozzáférés kezelése ',
'SubHeaderModuleUsersUI' => 'Hozzáférési csoportok létrehozása, jogok korlátozása, domain engedélyezése',
'BreadcrumbAccessGroups' => 'Hozzáférési csoport beállítása',
'SubHeaderAccessGroups' => 'Az interfész elemek és a REST API jogainak részletes konfigurálása',
'module_usersui_GeneralSettings' => 'Alapvető csoportbeállítások',
Expand Down
2 changes: 1 addition & 1 deletion Messages/ro.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License along with this program.
* If not, see <https://www.gnu.org/licenses/>.
*/
'repModuleUsersUI' => 'Control acces la sistem - %repesent%',
'repModuleUsersUI' => 'Controlul accesului la sistem - %repesent%',
'mo_ModuleModuleUsersUI' => 'Control acces la sistem ',
'BreadcrumbModuleUsersUI' => 'Control acces la sistem ',
'SubHeaderModuleUsersUI' => 'Crearea de grupuri de acces, restrângerea drepturilor, autorizarea domeniului',
Expand Down
22 changes: 11 additions & 11 deletions Messages/tr.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
* If not, see <https://www.gnu.org/licenses/>.
*/
'repModuleUsersUI' => 'Sistem Erişim Kontrolü - %repesent%',
'mo_ModuleModuleUsersUI' => 'Sistem erişim kontrolü ',
'BreadcrumbModuleUsersUI' => 'Sistem erişim kontrolü ',
'SubHeaderModuleUsersUI' => 'Erişim gruplarının oluşturulması, hakların kısıtlanması, alan adı yetkilendirmesi',
'mo_ModuleModuleUsersUI' => 'Sistem Erişimini Yönetme ',
'BreadcrumbModuleUsersUI' => 'Sistem Erişimini Yönetme ',
'SubHeaderModuleUsersUI' => 'Erişim grupları oluşturma, hakları kısıtlama, etki alanı yetkilendirme',
'BreadcrumbAccessGroups' => 'Bir erişim grubu kurma',
'SubHeaderAccessGroups' => 'Arayüz öğeleri ve REST API için hakların ayrıntılı ayarı',
'module_usersui_GeneralSettings' => 'Temel grup ayarları',
'module_usersui_UsersFilter' => 'Grup kullanıcılarına erişme',
'module_usersui_GroupRights' => 'Ayar izinleri',
'module_usersui_UsersFilter' => 'Erişim Grubu Kullanıcıları',
'module_usersui_GroupRights' => 'Hakların kurulması',
'module_usersui_GroupCDRFilter' => 'Konuşma geçmişi kısıtlamaları',
'module_usersui_ValidateNameIsEmpty' => 'Grup adını kontrol edin, boş',
'module_usersuiConnected' => 'Modül bağlı',
'module_usersuiDisconnected' => 'Modül devre dışı',
'module_usersuiUpdateStatus' => 'Durum güncelleme',
'module_usersui_ValidateServerNameIsEmpty' => 'Etki alanı denetleyicisi adresi doldurulmadı',
'module_usersui_ValidateServerPortIsEmpty' => 'Etki alanı denetleyici bağlantı noktası doldurulmamış',
'module_usersui_ValidateAdministrativeLoginIsEmpty' => 'Etki alanı kullanıcısı için oturum açma bilgileri doldurulmadı',
'module_usersuiConnected' => 'Modül bağlandı',
'module_usersuiDisconnected' => 'Modül devre dışı bırakıldı',
'module_usersuiUpdateStatus' => 'Durum güncellemesi',
'module_usersui_ValidateServerNameIsEmpty' => 'Etki alanı denetleyicisi adresi doldurulmamış',
'module_usersui_ValidateServerPortIsEmpty' => 'Etki alanı denetleyicisi bağlantı noktası doldurulmadı',
'module_usersui_ValidateAdministrativeLoginIsEmpty' => 'Alan adı kullanıcı girişi doldurulmadı',
'module_usersui_ValidateAdministrativePasswordIsEmpty' => 'Etki alanı kullanıcısı için parola doldurulmadı',
'module_usersui_ValidateBaseDNIsEmpty' => 'Etki alanı kökü doldurulmadı',
'module_usersui_ValidateUserIdAttributeIsEmpty' => 'Etki alanındaki kullanıcı adına sahip öznitelik doldurulmamış',
Expand Down