Merge pull request #18 from mikopbx/develop

Develop

Author: jorikfon

.DS_Store

@@ -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.35"
+    secrets: inherit

.github/workflows/build.yml

@@ -1,3 +1,4 @@
 .idea
 /.idea/
-vendor/
+vendor/
+.DS_Store

.gitignore

@@ -49,7 +49,7 @@ public function indexAction(): void
             ->addJs('js/cache/'.$this->moduleUniqueID.'/module-ldap-sync-index.js', true);
 
         $servers = LdapServers::find();
-        $serversList = null;
+        $serversList = [];
         foreach ($servers as $server){
             $serversList[]=[
                 'id'=>$server->id,

App/Controllers/ModuleLdapSyncController.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * MikoPBX - free phone system for small business
  * Copyright © 2017-2023 Alexey Portnov and Nikolay Beketov
@@ -27,7 +28,6 @@
 use Phalcon\Forms\Element\Select;
 use Phalcon\Forms\Element\Text;
 
-
 class LdapConfigForm extends BaseForm
 {
     public function initialize($entity = null, $options = null): void
@@ -36,11 +36,7 @@ public function initialize($entity = null, $options = null): void
         $this->add(new Hidden('id'));
 
         // Autosync checkbox
-        $checkArr = [];
-        if ($entity->disabled === '0') {
-            $checkArr['checked'] = 'checked';
-        }
-        $this->add(new Check('autosync', $checkArr));
+        $this->addCheckBox('autosync', intval($entity->disabled) === 0);
 
         // ServerHost
         $this->add(new Text('serverName', [
@@ -50,7 +46,7 @@ public function initialize($entity = null, $options = null): void
         // ServerPort
         $this->add(new Text('serverPort', [
             'placeholder' => '389',
-            'value' =>$entity->serverPort ?? '389'
+            'value' => $entity->serverPort ?? '389'
         ]));
 
         // Use TLS dropdown
@@ -85,7 +81,9 @@ public function initialize($entity = null, $options = null): void
 //            'FreeIPA' => 'FreeIPA',
         ];
         $ldapType = new Select(
-            'ldapType', $types, [
+            'ldapType',
+            $types,
+            [
                 'using' => [
                     'id',
                     'name',
@@ -98,7 +96,7 @@ public function initialize($entity = null, $options = null): void
         $this->add($ldapType);
 
 
-        $attributes = json_decode($entity->attributes??'', true);
+        $attributes = json_decode($entity->attributes ?? '', true);
 
 
         // UserNameAttribute
@@ -149,11 +147,24 @@ public function initialize($entity = null, $options = null): void
         ]));
 
         // UpdateAttributes checkbox
-        $checkArr = [];
-        if ($entity->updateAttributes === '1') {
-            $checkArr['checked'] = 'checked';
-        }
-        $this->add(new Check('updateAttributes', $checkArr));
+        $this->addCheckBox('updateAttributes', intval($entity->updateAttributes) === 1);
+    }
 
+    /**
+     * Adds a checkbox to the form field with the given name.
+     * Can be deleted if the module depends on MikoPBX later than 2024.3.0
+     *
+     * @param string $fieldName The name of the form field.
+     * @param bool $checked Indicates whether the checkbox is checked by default.
+     * @param string $checkedValue The value assigned to the checkbox when it is checked.
+     * @return void
+     */
+    public function addCheckBox(string $fieldName, bool $checked, string $checkedValue = 'on'): void
+    {
+        $checkAr = ['value' => null];
+        if ($checked) {
+            $checkAr = ['checked' => $checkedValue,'value' => $checkedValue];
+        }
+        $this->add(new Check($fieldName, $checkAr));
     }
-}
+}

App/Forms/LdapConfigForm.php

@@ -1,4 +1,4 @@
-{{ form('module-ldap-sync/module-ldap-sync/save', 'role': 'form', 'class': 'ui large info form','id':'module-ldap-sync-form') }}
+<form method="post" autocomplete="off" action="module-ldap-sync/module-ldap-sync/save" role="form" class="ui large info form" id="module-ldap-sync-form">
 
 {{ ldapForm.render('id') }}
 
@@ -20,7 +20,7 @@
     </div>
 
 {{ partial("partials/submitbutton",['indexurl':'module-ldap-sync/module-ldap-sync/index']) }}
-{{ endform() }}
+</form>
 
 <script type="text/javascript">
     var module_ldap_hiddenAttributes = '{{ hiddenAttributes }}';

App/Views/ModuleLdapSync/modify.volt

@@ -32,7 +32,7 @@ class LdapSyncConf extends ConfigClass
     /**
      * Receive information about mikopbx main database changes
      *
-     * @param $data
+     * @param mixed $data
      */
     public function modelsEventChangeData($data): void
     {

Lib/LdapSyncConf.php

@@ -20,7 +20,6 @@
 
 namespace Modules\ModuleLdapSync\Lib;
 
-use Modules\ModuleLdapSync\Models\ADUsers;
 use Modules\ModuleLdapSync\Models\Conflicts;
 use Phalcon\Di\Injectable;
 

Lib/LdapSyncConflicts.php

@@ -22,6 +22,7 @@
 use LdapRecord\Container;
 use MikoPBX\Common\Handlers\CriticalErrorsHandler;
 use MikoPBX\Common\Providers\ManagedCacheProvider;
+use Phalcon\Di\Injectable;
 
 
 include_once __DIR__.'/../vendor/autoload.php';
@@ -30,7 +31,7 @@
  * Class LdapSyncConnector
  * Handles synchronization and interaction with LDAP server.
  */
-class LdapSyncConnector extends \Phalcon\Di\Injectable
+class LdapSyncConnector extends Injectable
 {
     /**
      * The name or ip of the LDAP server.
@@ -251,15 +252,15 @@ public function getUsersList(): AnswerStructure
                 }
 
                 uksort($record, function($a, $b){
-                    return $a>$this->userAttributes[Constants::USER_NAME_ATTR];
+                    return strcmp($a, $this->userAttributes[Constants::USER_NAME_ATTR]);
                 });
                 if (!empty($record)){
                     $listOfAvailableUsers[] = $record;
                 }
             }
             // Sort the array based on the name value
             usort($listOfAvailableUsers, function($a, $b){
-                return $a[$this->userAttributes[Constants::USER_NAME_ATTR]] > $b[$this->userAttributes[Constants::USER_NAME_ATTR]];
+                return strcmp($a[$this->userAttributes[Constants::USER_NAME_ATTR]] , $b[$this->userAttributes[Constants::USER_NAME_ATTR]]);
             });
 
             $res->data = $listOfAvailableUsers;

Lib/LdapSyncConnector.php

@@ -28,7 +28,6 @@
 use Modules\ModuleLdapSync\Lib\Workers\WorkerLdapSync;
 use Modules\ModuleLdapSync\Models\ADUsers;
 use Modules\ModuleLdapSync\Models\LdapServers;
-use Phalcon\Di;
 use Phalcon\Di\Injectable;
 
 /**
@@ -170,7 +169,7 @@ public static function updateUserData(array $ldapCredentials, array $userFromLda
             $previousSyncUser->disabled = ($userDataFromLdap[Constants::USER_DISABLED] ?? false) ? '1' : '0';
 
             // Do not create disabled users
-            if ($userDataFromLdap[Constants::USER_DISABLED] === true && $userDataFromMikoPBX === []) {
+            if ($previousSyncUser->disabled === '1' && $userDataFromMikoPBX === []) {
                 $response = new AnswerStructure();
                 $response->data[Constants::USER_SYNC_RESULT] = Constants::SYNC_RESULT_SKIPPED;
                 $response->success = true;
@@ -344,7 +343,8 @@ public static function getUserOnMikoPBX(string $userId): array
             ],
         ];
         // Build and execute the query to fetch user information.
-        $result = Di::getDefault()->get('modelsManager')->createBuilder($parameters)
+        $di=MikoPBXVersion::getDefaultDi();
+        $result = $di->get('modelsManager')->createBuilder($parameters)
             ->getQuery()
             ->getSingleResult();
 
@@ -375,7 +375,7 @@ public static function createUpdateUser(array $userDataFromLdap, string $current
         }
 
         // Get user data from the API
-        $di = Di::getDefault();
+        $di=MikoPBXVersion::getDefaultDi();
         $restAnswer = $di->get(PBXCoreRESTClientProvider::SERVICE_NAME, [
             '/pbxcore/api/extensions/getRecord',
             PBXCoreRESTClientProvider::HTTP_METHOD_GET,
@@ -428,7 +428,7 @@ public static function createUpdateUser(array $userDataFromLdap, string $current
         }
 
         // Check if provided email is available
-        $email = $userDataFromLdap[Constants::USER_EMAIL_ATTR];
+        $email = $userDataFromLdap[Constants::USER_EMAIL_ATTR]??null;
         if (!empty($email) && $email !== $dataStructure->user_email) {
             $restAnswer = $di->get(PBXCoreRESTClientProvider::SERVICE_NAME, [
                 '/pbxcore/api/users/available',
@@ -525,7 +525,8 @@ public static function findUserInMikoPBX(array $userDataFromLdap, string $curren
         $parameters['conditions'] = '(' . substr($parameters['conditions'], 3) . ') AND Extensions.type="' . Extensions::TYPE_SIP . '"';
         $userDataFromMikoPBX = null;
         if (!empty($parameters['bind'])) {
-            $userDataFromMikoPBX = Di::getDefault()->get('modelsManager')->createBuilder($parameters)
+            $di=MikoPBXVersion::getDefaultDi();
+            $userDataFromMikoPBX = $di->get('modelsManager')->createBuilder($parameters)
                 ->getQuery()
                 ->getSingleResult();
         }
@@ -629,4 +630,5 @@ public static function postDataToLdapCredentials(array $postData): array
         ];
     }
 
+
 }