Develop

.github/workflows/build.yml

@@ -0,0 +1,15 @@
+name: Build and Publish
+
+on:
+  push:
+    branches:
+      - master
+      - develop
+  workflow_dispatch:
+
+jobs:
+  build:
+    uses: mikopbx/.github-workflows/.github/workflows/extension-publish.yml@master
+    with:
+      initial_version: "1.80"
+    secrets: inherit

App/Controllers/AccessGroupCDRFilterController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * MikoPBX - free phone system for small business
  * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov
@@ -22,6 +23,7 @@
 use MikoPBX\Common\Models\Extensions;
 use MikoPBX\Common\Models\Users;
 use Modules\ModuleUsersUI\Models\AccessGroupCDRFilter;
+
 use function MikoPBX\Common\Config\appPath;
 
 class AccessGroupCDRFilterController extends ModuleUsersUIBaseController
@@ -99,13 +101,13 @@ public function getTheListOfUsersForCDRFilter(string $group_id): array
                         $extensionTable[$extension->userid]['mobile'] = '';
                     }
 
-                    $extensionTable[$extension->userid]['avatar'] = $this->url->get().'assets/img/unknownPerson.jpg';
+                    $extensionTable[$extension->userid]['avatar'] = $this->url->get() . 'assets/img/unknownPerson.jpg';
                     if ($extension->avatar) {
                         $filename = md5($extension->avatar);
                         $imgCacheDir = appPath('sites/admin-cabinet/assets/img/cache');
                         $imgFile = "{$imgCacheDir}/{$filename}.jpg";
                         if (file_exists($imgFile)) {
-                            $extensionTable[$extension->userid]['avatar'] = $this->url->get()."assets/img/cache/{$filename}.jpg";
+                            $extensionTable[$extension->userid]['avatar'] = $this->url->get() . "assets/img/cache/{$filename}.jpg";
                         }
                     }
                     break;
@@ -153,4 +155,4 @@ public function saveCdrFilter(string $accessGroupId, array $cdrFilterUsers): boo
         }
         return true;
     }
-}
+}

App/Controllers/AccessGroupsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * MikoPBX - free phone system for small business
  * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov
@@ -18,6 +19,7 @@
  */
 
 namespace Modules\ModuleUsersUI\App\Controllers;
+
 use MikoPBX\AdminCabinet\Providers\AssetProvider;
 use Modules\ModuleUsersUI\App\Forms\AccessGroupForm;
 use Modules\ModuleUsersUI\Lib\Constants;
@@ -43,7 +45,7 @@ public function modifyAction(string $id = null): void
         $footerCollection
             ->addJs('js/pbx/main/form.js', true)
             ->addJs('js/vendor/datatable/dataTables.semanticui.js', true)
-            ->addJs('js/cache/'.$this->moduleUniqueID.'/module-users-ui-modify-ag.js', true);
+            ->addJs('js/cache/' . $this->moduleUniqueID . '/module-users-ui-modify-ag.js', true);
 
         $record = AccessGroups::findFirstById($id);
         if ($record === null) {
@@ -52,13 +54,13 @@ public function modifyAction(string $id = null): void
             $record->name = '';
             $record->description = '';
         } else {
-            $this->view->members = $this->getTheListOfUsersForDisplayInTheFilter($record->id??'');
+            $this->view->members = $this->getTheListOfUsersForDisplayInTheFilter($record->id ?? '');
             $cdrFilterController = new AccessGroupCDRFilterController();
             $this->view->cdrFilterMembers = $cdrFilterController->getTheListOfUsersForCDRFilter($record->id);
         }
         $groupRightsController = new AccessGroupsRightsController();
-        $groupRights = $groupRightsController->getGroupRights($record->id??'');
-        $this->view->form = new AccessGroupForm($record,['groupRights'=>$groupRights]);
+        $groupRights = $groupRightsController->getGroupRights($record->id ?? '');
+        $this->view->form = new AccessGroupForm($record, ['groupRights' => $groupRights]);
         $this->view->represent = $record->getRepresent();
         $this->view->id = $id;
         $this->view->groupRights = $groupRights;
@@ -72,7 +74,7 @@ public function modifyAction(string $id = null): void
     public function saveAction(): void
     {
         if (!$this->request->isPost()) {
-           return;
+            return;
         }
         $data = $this->request->getPost();
 
@@ -82,17 +84,17 @@ public function saveAction(): void
         if (array_key_exists('id', $data)) {
             $accessGroupEntity = AccessGroups::findFirstById($data['id']);
         }
-        if ($accessGroupEntity===null) {
-            $accessGroupEntity=new AccessGroups();
+        if ($accessGroupEntity === null) {
+            $accessGroupEntity = new AccessGroups();
             $accessGroupEntity->id = $data['id'];
         }
-        if (empty($data['cdrFilterMode'])){
+        if (empty($data['cdrFilterMode'])) {
             $accessGroupEntity->cdrFilterMode = Constants::CDR_FILTER_DISABLED;
         } else {
             $accessGroupEntity->cdrFilterMode = $data['cdrFilterMode'];
         }
 
-        if (empty($data['homePage'])){
+        if (empty($data['homePage'])) {
             $accessGroupEntity->homePage = $this->url->get('session/end');
         } else {
             $accessGroupEntity->homePage = $data['homePage'];
@@ -103,7 +105,7 @@ public function saveAction(): void
         $accessGroupEntity->fullAccess = $data['fullAccess'];
 
         // Save the access group object
-        if ($this->saveEntity($accessGroupEntity)===false){
+        if ($this->saveEntity($accessGroupEntity) === false) {
             // If there are validation errors, display them and return false
             $this->db->rollback();
             return;
@@ -112,26 +114,26 @@ public function saveAction(): void
         // Save access group rights
         $accessGroupController = new AccessGroupsRightsController();
         // Parse access group rights from the posted JSON string
-        $accessGroupRightsFromPost = json_decode($data['access_group_rights'], true)??[];
-        if ($accessGroupController->saveAccessGroupRights($accessGroupEntity->id, $accessGroupRightsFromPost)===false){
+        $accessGroupRightsFromPost = json_decode($data['access_group_rights'], true) ?? [];
+        if ($accessGroupController->saveAccessGroupRights($accessGroupEntity->id, $accessGroupRightsFromPost) === false) {
             $this->db->rollback();
             return;
         }
 
         // Save users credentials
         $usersCredentialsController = new UsersCredentialsController();
         // Parse group members from the posted JSON string
-        $membersOfTheGroup = json_decode($data['members'], true)??[];
-        if ($usersCredentialsController->saveUsersCredentials($accessGroupEntity->id, $membersOfTheGroup)===false){
+        $membersOfTheGroup = json_decode($data['members'], true) ?? [];
+        if ($usersCredentialsController->saveUsersCredentials($accessGroupEntity->id, $membersOfTheGroup) === false) {
             $this->db->rollback();
             return;
         }
 
         // Save CDR filter
         $cdrFilterController = new AccessGroupCDRFilterController();
         // Parse cdr filter from the posted JSON string
-        $cdrFilterUsers = json_decode($data['cdrFilter'], true)??[];
-        if ($cdrFilterController->saveCdrFilter($accessGroupEntity->id, $cdrFilterUsers)===false){
+        $cdrFilterUsers = json_decode($data['cdrFilter'], true) ?? [];
+        if ($cdrFilterController->saveCdrFilter($accessGroupEntity->id, $cdrFilterUsers) === false) {
             $this->db->rollback();
             return;
         }
@@ -144,7 +146,6 @@ public function saveAction(): void
         if (empty($data['id'])) {
             $this->view->reload = "module-users-u-i/access-groups/modify/{$accessGroupEntity->id}";
         }
-
     }
 
     /**
@@ -165,5 +166,4 @@ public function deleteAction(string $groupId): void
 
         $this->forward('module-users-u-i/module-users-u-i/index');
     }
-
-}
+}

App/Controllers/AccessGroupsRightsController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * MikoPBX - free phone system for small business
  * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov
@@ -23,13 +24,14 @@
 use MikoPBX\Common\Providers\PBXConfModulesProvider;
 use MikoPBX\Modules\Config\RestAPIConfigInterface;
 use Modules\ModuleUsersUI\Lib\Constants;
+use Modules\ModuleUsersUI\Lib\MikoPBXVersion;
 use Modules\ModuleUsersUI\Lib\UsersUIACL;
 use Modules\ModuleUsersUI\Models\AccessGroupsRights;
 use Phalcon\Annotations\Reader;
 use Phalcon\Annotations\Reflection;
-use Phalcon\Text;
 use ReflectionClass;
 use Throwable;
+
 use function MikoPBX\Common\Config\appPath;
 
 class AccessGroupsRightsController extends ModuleUsersUIBaseController
@@ -92,7 +94,6 @@ private function getAvailableUIControllersActions(): array
         [$excludedControllers, $excludedActions] = $this->getExclusionsActionsControllers();
 
         foreach ($controllerFiles as $file) {
-
             $className = pathinfo($file)['filename'];
             $controllerClass = 'MikoPBX\AdminCabinet\Controllers\\' . $className;
 
@@ -105,7 +106,6 @@ private function getAvailableUIControllersActions(): array
             if (count($publicMethods) > 0) {
                 $controllers[Constants::ADMIN_CABINET]['APP'][$controllerClass] = $publicMethods;
             }
-
         }
         // Sort the controllers array by translated controller name
         uksort($controllers[Constants::ADMIN_CABINET]['APP'], function ($a, $b) {
@@ -137,11 +137,11 @@ private function getExclusionsActionsControllers(): array
         $arrayOfExclusions = [];
 
         // Get the list of linked controllers and actions which we hide from settings
-        foreach (UsersUIACL::getLinkedControllerActions() as $controllerClass=> $actions) {
+        foreach (UsersUIACL::getLinkedControllerActions() as $controllerClass => $actions) {
             // Iterate through the main controllers actions
-            foreach ($actions as $action=>$linkedControllers) {
+            foreach ($actions as $action => $linkedControllers) {
                 // Iterate through the linked controllers actions
-                foreach ($linkedControllers as $linkedController=>$linkedActions) {
+                foreach ($linkedControllers as $linkedController => $linkedActions) {
                     if (array_key_exists($linkedController, $arrayOfExclusions)) {
                         $arrayOfExclusions[$linkedController] = array_merge($arrayOfExclusions[$linkedController], $linkedActions);
                         $arrayOfExclusions[$linkedController] = array_unique($arrayOfExclusions[$linkedController]);
@@ -155,11 +155,13 @@ private function getExclusionsActionsControllers(): array
         $arrayOfExclusions = array_merge_recursive(UsersUIACL::getAlwaysAllowed(), UsersUIACL::getAlwaysDenied(), $arrayOfExclusions);
         // Iterate through the always allowed and disallowed controllers and actions
         foreach ($arrayOfExclusions as $controllerClass => $actions) {
-            if ($actions === '*'
-                || (is_array($actions) && in_array('*', $actions))) {
+            if (
+                $actions === '*'
+                || (is_array($actions) && in_array('*', $actions))
+            ) {
                 // Add the controller with all actions to the excluded from settings array
                 $excludedControllers[] = $controllerClass;
-            } elseif (is_array($actions)){
+            } elseif (is_array($actions)) {
                 // Add the controller with defined actions to the excluded from settings array
                 $excludedActions[$controllerClass] = $actions;
             }
@@ -197,7 +199,7 @@ private function getControllersActions(string $controllerClass, array $excludedA
                 // Remove "Action" from the action name
                 $actionName = substr($actionName, 0, -6);
                 // Remove always allowed or always disallowed actions
-                if (!in_array($actionName, $excludedActions[$controllerClass])) {
+                if (!in_array($actionName, $excludedActions[$controllerClass] ?? [])) {
                     $publicMethods[$actionName] = false;
                 }
             }
@@ -224,7 +226,6 @@ private function getAvailableRESTControllersActions(): array
         [$excludedControllers, $excludedActions] = $this->getExclusionsActionsControllers();
 
         foreach ($controllerFiles as $file) {
-
             $className = pathinfo($file)['filename'];
             $subClassName = basename(pathinfo($file)['dirname']);
             $controllerClass = 'MikoPBX\PBXCoreREST\Controllers\\' . $subClassName . '\\' . $className;
@@ -328,8 +329,8 @@ private function getAvailableRESTActionsInModules(): array
 
                 // Create a reflection of the controller class
                 $reflection = new Reflection($parsedClass);
-
-                $controllerName = '/pbxcore/api/modules/' . Text::uncamelize($configObject->moduleUniqueId, '-');
+                $textClass = MikoPBXVersion::getTextClass();
+                $controllerName = '/pbxcore/api/modules/' . $textClass::uncamelize($configObject->moduleUniqueId, '-');
 
                 // Get the actions of the controller if they are defined in the method description
                 $actions = [];
@@ -402,7 +403,6 @@ private function getAvailableRESTActionsInModules(): array
                     $currentContext = array_merge($currentContext ?? [], $actions);
                 }
             }
-
         }
         return $controllers;
     }
@@ -424,7 +424,8 @@ public function fillAllowed(array $combined, array $allowedRights): array
                     foreach ($actions as $actionName => $value) {
                         foreach ($allowedRights as $allowedRight) {
                             $allowedActions = json_decode($allowedRight['actions'], true);
-                            if ($allowedRight['module_id'] === $moduleId
+                            if (
+                                $allowedRight['module_id'] === $moduleId
                                 && $allowedRight['controller'] === $controllerClass
                                 && in_array($actionName, $allowedActions)
                             ) {
@@ -472,9 +473,7 @@ public function saveAccessGroupRights(string $accessGroupId, array $accessGroupR
                     // If there are validation errors, display them and return false
                     return false;
                 }
-
             }
-
         }
         return true;
     }

App/Controllers/LdapConfigController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * MikoPBX - free phone system for small business
  * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov
@@ -28,7 +29,6 @@
 
 class LdapConfigController extends ModuleUsersUIBaseController
 {
-
     /**
      * Save LDAP configuration.
      *
@@ -54,8 +54,10 @@ public function saveAction(): void
                 case 'id':
                     break;
                 case 'administrativePassword':
-                    if (isset($data['administrativePasswordHidden'])
-                        && $data['administrativePasswordHidden'] !== Constants::HIDDEN_PASSWORD) {
+                    if (
+                        isset($data['administrativePasswordHidden'])
+                        && $data['administrativePasswordHidden'] !== Constants::HIDDEN_PASSWORD
+                    ) {
                         $ldapConfig->$name = $data['administrativePasswordHidden'];
                     }
                     break;
@@ -78,7 +80,7 @@ public function saveAction(): void
      * @return void
      * @throws Exception
      */
-    public function searchLdapUserAction(string $pattern=''): void
+    public function searchLdapUserAction(string $pattern = ''): void
     {
         /** @var Redis $redis */
         $redis = $this->di->getShared(ManagedCacheProvider::SERVICE_NAME);
@@ -96,12 +98,14 @@ public function searchLdapUserAction(string $pattern=''): void
         }
         $pattern = urldecode($pattern);
         $usersForDropDown = [];
-        foreach ($availableUsers as $user){
-            if (    stripos($user['name'], $pattern)!==false
-                || stripos($user['login'], $pattern)!==false){
-                $usersForDropDown[]=[
-                    'title'=>$user['login'],
-                    'description'=>$user['name'],
+        foreach ($availableUsers as $user) {
+            if (
+                mb_stripos($user['name'], $pattern) !== false
+                || mb_stripos($user['login'], $pattern) !== false
+            ) {
+                $usersForDropDown[] = [
+                    'title' => $user['login'],
+                    'description' => $user['name'],
                 ];
             }
         }
@@ -169,15 +173,17 @@ private function prepareLdapCredentialsArrayFromPost(array $postData): array
     {
         // Admin password can be stored in DB on the time, on this way it has only xxxxxx value.
         // It can be empty as well, if some password manager tried to fill it.
-        if (empty($postData['administrativePasswordHidden'])
-            || $postData['administrativePasswordHidden'] === Constants::HIDDEN_PASSWORD) {
+        if (
+            empty($postData['administrativePasswordHidden'])
+            || $postData['administrativePasswordHidden'] === Constants::HIDDEN_PASSWORD
+        ) {
             $ldapConfig = LdapConfig::findFirst();
-            $postData['administrativePassword'] = $ldapConfig->administrativePassword??'';
+            $postData['administrativePassword'] = $ldapConfig->administrativePassword ?? '';
         } else {
             $postData['administrativePassword'] = $postData['administrativePasswordHidden'];
         }
 
-       return [
+        return [
             'serverName' => $postData['serverName'],
             'serverPort' => $postData['serverPort'],
             'baseDN' => $postData['baseDN'],
@@ -190,4 +196,4 @@ private function prepareLdapCredentialsArrayFromPost(array $postData): array
            'ldapType' => $postData['ldapType'],
         ];
     }
-}
+}