Merge branch 'master' into fix/module-resources-path

luke- · web-flow · commit defba2ebc89e · 2025-08-28T13:12:11.000+02:00
diff --git a/.github/workflows/php-cs-fixer.yml b/.github/workflows/php-cs-fixer.yml
@@ -0,0 +1,7 @@
+name: PHP CS Fixer
+
+on: push
+
+jobs:
+  fixers:
+    uses: humhub/actions/.github/workflows/module-php-cs-fixer.yml@main
diff --git a/Events.php b/Events.php
@@ -17,7 +17,6 @@
  */
 class Events
 {
-
     public static function onFileHandlerCollection($event)
     {
         /* @var $collection FileHandlerCollection */
@@ -31,7 +30,7 @@ public static function onFileHandlerCollection($event)
         /* @var $module \humhub\modules\drawio\Module */
         $module = Yii::$app->getModule('drawio');
 
-        if ($collection->file === null)  {
+        if ($collection->file === null) {
             return;
         }
 
diff --git a/assets/Assets.php b/assets/Assets.php
@@ -32,6 +32,6 @@ class Assets extends AssetBundle
      * @inheritdoc
      */
     public $publishOptions = [
-        'forceCopy' => false
+        'forceCopy' => false,
     ];
 }
diff --git a/components/BaseFileController.php b/components/BaseFileController.php
@@ -8,11 +8,10 @@
 
 namespace humhub\modules\drawio\components;
 
+use humhub\components\Controller;
+use humhub\modules\file\models\File;
 use Yii;
 use yii\web\HttpException;
-use yii\helpers\Url;
-use humhub\modules\file\models\File;
-use humhub\components\Controller;
 
 /**
  * Description of BaseFileController
@@ -21,7 +20,6 @@
  */
 class BaseFileController extends Controller
 {
-
     /**
      * @var File
      */
diff --git a/config.php b/config.php
@@ -8,6 +8,5 @@
     'namespace' => 'humhub\modules\drawio',
     'events' => [
         [FileHandlerCollection::className(), FileHandlerCollection::EVENT_INIT, ['humhub\modules\drawio\Events', 'onFileHandlerCollection']],
-    ]
+    ],
 ];
-?>
diff --git a/controllers/AdminController.php b/controllers/AdminController.php
@@ -14,7 +14,6 @@
 
 class AdminController extends Controller
 {
-
     public function actionIndex()
     {
         $model = new ConfigureForm();
diff --git a/controllers/CreateController.php b/controllers/CreateController.php
@@ -15,7 +15,6 @@
 
 class CreateController extends \humhub\components\Controller
 {
-
     public function actionIndex()
     {
         $ext = 'drawio';
@@ -25,15 +24,15 @@ public function actionIndex()
             $file = $model->save();
             if ($file !== false) {
                 return $this->asJson([
-                            'success' => true,
-                            'file' => FileHelper::getFileInfos($file),
-                            'openUrl' => Url::to(['/drawio/open', 'guid' => $file->guid]),
-                            'openFlag' => (boolean) $model->openFlag
+                    'success' => true,
+                    'file' => FileHelper::getFileInfos($file),
+                    'openUrl' => Url::to(['/drawio/open', 'guid' => $file->guid]),
+                    'openFlag' => (bool) $model->openFlag,
                 ]);
             } else {
                 return $this->asJson([
-                            'success' => false,
-                            'output' => $this->renderAjax('index', ['model' => $model, 'ext' => $ext])
+                    'success' => false,
+                    'output' => $this->renderAjax('index', ['model' => $model, 'ext' => $ext]),
                 ]);
             }
         }
diff --git a/controllers/OpenController.php b/controllers/OpenController.php
@@ -13,11 +13,10 @@
 
 class OpenController extends BaseFileController
 {
-
     public function actionIndex()
     {
         return $this->renderAjax('index', [
-                    'file' => $this->file,
+            'file' => $this->file,
         ]);
     }
 
@@ -31,7 +30,7 @@ public function actionUpdate()
         $this->file->save();
 
         return [
-            'ok' => true
+            'ok' => true,
         ];
     }
 
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,9 +1,12 @@
 Changelog
 =========
 
-1.1.0 - Unreleased
-----------------------
+1.1.0 (August 28, 2025)
+-----------------------
+- Enh #18: Update Active Form for Bootstrap 5
 - Fix #17: Update module resources path
+- Enh #19: Use PHP CS Fixer
+- Enh #20: Migration to Bootstrap 5 for HumHub 1.18
 
 1.0.5 - April 4, 2024
 ----------------------
diff --git a/docs/README.md b/docs/README.md
@@ -6,4 +6,4 @@ Create charts in the easiest way imaginable. With our draw.io integration it has
 
 - Create, edit and share diagrams with the well renowned tool
 - Increase your productivity by collaboratively designing projects
-- Comment, discuss and show your appreciaten with a like
+- Comment, discuss and show your appreciation with a like
diff --git a/filehandler/CreateFileHandler.php b/filehandler/CreateFileHandler.php
@@ -19,7 +19,6 @@
  */
 class CreateFileHandler extends BaseFileHandler
 {
-
     /**
      * @inheritdoc
      */
@@ -30,7 +29,7 @@ public function getLinkAttributes()
             'data-action-url' => Url::to(['/drawio/create']),
             'data-action-click' => 'ui.modal.load',
             'data-modal-id' => 'drawio-modal',
-            'data-modal-close' => ''
+            'data-modal-close' => '',
         ];
     }
 
diff --git a/filehandler/EditFileHandler.php b/filehandler/EditFileHandler.php
@@ -20,7 +20,6 @@
  */
 class EditFileHandler extends BaseFileHandler
 {
-
     /**
      * @inheritdoc
      */
@@ -31,7 +30,7 @@ public function getLinkAttributes()
             'data-action-url' => Url::to(['/drawio/open', 'guid' => $this->file->guid]),
             'data-action-click' => 'ui.modal.load',
             'data-modal-id' => 'drawio-modal',
-            'data-modal-close' => ''
+            'data-modal-close' => '',
         ];
     }
 
diff --git a/messages/ar/base.php b/messages/ar/base.php
@@ -1,13 +1,12 @@
 <?php
-
-return [
-    'Could not find requested file!' => 'لم يتم ايجاد الملف المطلوب',
-    'Hostname' => '@Hostname@',
-    '<strong>Create</strong> draw.io diagram' => '',
-    '<strong>Draw.io </strong> module configuration' => '',
-    'Create draw.io document' => '',
-    'Edit using draw.io' => '',
-    'File write access denied!' => '',
-    'Open the new document in the next step' => '',
-    'e.g. :drawioDefaultServerUrl' => '',
-];
+return array (
+  '<strong>Create</strong> draw.io diagram' => '<strong>إنشاء</strong> مخطط draw.io',
+  '<strong>Draw.io </strong> module configuration' => 'إعداد موديول <strong>Draw.io </strong>',
+  'Could not find requested file!' => 'لم يتم ايجاد الملف المطلوب',
+  'Create draw.io document' => 'إنشاء مستند draw.io',
+  'Edit using draw.io' => 'تحرير باستخدام draw.io',
+  'File write access denied!' => 'تم رفض الوصول للكتابة على الملف!',
+  'Hostname' => 'اسم المضيف',
+  'Open the new document in the next step' => 'افتح المستند الجديد في الخطوة التالية',
+  'e.g. :drawioDefaultServerUrl' => 'مثال :drawioDefaultServerUrl',
+);
diff --git a/messages/es-419/base.php b/messages/es-419/base.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+    '<strong>Create</strong> draw.io diagram' => '',
+    '<strong>Draw.io </strong> module configuration' => '',
+    'Could not find requested file!' => '',
+    'Create draw.io document' => '',
+    'Edit using draw.io' => '',
+    'File write access denied!' => '',
+    'Hostname' => '',
+    'Open the new document in the next step' => '',
+    'e.g. :drawioDefaultServerUrl' => '',
+];
diff --git a/messages/sk/base.php b/messages/sk/base.php
@@ -1,12 +1,12 @@
 <?php
 return array (
-  '<strong>Create</strong> draw.io diagram' => '',
-  '<strong>Draw.io </strong> module configuration' => '',
+  '<strong>Create</strong> draw.io diagram' => '<strong>Vytvorte</strong> diagram draw.io',
+  '<strong>Draw.io </strong> module configuration' => 'Konfigurácia modulu <strong>Draw.io </strong>',
   'Could not find requested file!' => 'Požadovaný súbor sa nepodarilo nájsť!',
-  'Create draw.io document' => '',
-  'Edit using draw.io' => '',
-  'File write access denied!' => '',
+  'Create draw.io document' => 'Vytvorte dokument draw.io',
+  'Edit using draw.io' => 'Upravte pomocou draw.io',
+  'File write access denied!' => 'Prístup k zápisu do súboru bol odmietnutý!',
   'Hostname' => 'Hostname',
-  'Open the new document in the next step' => '',
-  'e.g. :drawioDefaultServerUrl' => '',
+  'Open the new document in the next step' => 'V ďalšom kroku otvorte nový dokument',
+  'e.g. :drawioDefaultServerUrl' => 'napr.:drawioDefaultServerUrl',
 );
diff --git a/models/ConfigureForm.php b/models/ConfigureForm.php
@@ -10,7 +10,6 @@
  */
 class ConfigureForm extends \yii\base\Model
 {
-
     public $serverUrl;
 
     /**
@@ -32,7 +31,7 @@ public function attributeLabels()
             'serverUrl' => Yii::t('DrawioModule.base', 'Hostname'),
         ];
     }
-    
+
     /**
      * @inheritdoc
      */
diff --git a/models/CreateDocument.php b/models/CreateDocument.php
@@ -20,7 +20,6 @@
  */
 class CreateDocument extends Model
 {
-
     public $fileName;
     public $openFlag = true;
 
@@ -35,7 +34,7 @@ public function rules()
     public function attributeLabels()
     {
         return [
-            'openFlag' => Yii::t('DrawioModule.base', 'Open the new document in the next step')
+            'openFlag' => Yii::t('DrawioModule.base', 'Open the new document in the next step'),
         ];
     }
 
diff --git a/module.json b/module.json
@@ -9,7 +9,7 @@
     ],
     "version": "1.1.0",
     "humhub": {
-        "minVersion": "1.17"
+        "minVersion": "1.18"
     },
     "homepage": "https://github.com/humhub-contrib/drawio",
     "authors": [
@@ -22,9 +22,9 @@
 
     ],
     "screenshots": [
-        "resources/screen1.PNG", 
-        "resources/screen2.PNG", 
-        "resources/screen3.PNG", 
+        "resources/screen1.PNG",
+        "resources/screen2.PNG",
+        "resources/screen3.PNG",
         "resources/screen4.PNG"
-    ]   
+    ]
 }
diff --git a/views/admin/index.php b/views/admin/index.php
@@ -1,7 +1,8 @@
 <?php
 
-use yii\bootstrap\ActiveForm;
+use humhub\widgets\form\ActiveForm;
 use yii\helpers\Html;
+
 ?>
 
 <div class="panel panel-default">
@@ -11,11 +12,11 @@
     <div class="panel-body">
 
         <?php $form = ActiveForm::begin(['id' => 'configure-form']); ?>
-        <div class="form-group">
+        <div class="mb-3">
             <?= $form->field($model, 'serverUrl'); ?>
         </div>
 
-        <div class="form-group">
+        <div class="mb-3">
             <?= Html::submitButton('Save', ['class' => 'btn btn-primary', 'data-ui-loader' => '']) ?>
         </div>
 
diff --git a/views/create/index.php b/views/create/index.php
@@ -1,28 +1,18 @@
 <?php
 
-use humhub\modules\drawio\Module;
-use yii\helpers\Url;
-use humhub\widgets\ActiveForm;
-use humhub\libs\Html;
+use humhub\helpers\Html;
+use humhub\modules\drawio\assets\Assets;
+use humhub\widgets\modal\Modal;
 
-\humhub\modules\drawio\assets\Assets::register($this);
-
-$modal = \humhub\widgets\ModalDialog::begin([
-            'header' => Yii::t('DrawioModule.base', '<strong>Create</strong> draw.io diagram')
-        ])
+Assets::register($this);
 ?>
 
-<?php $form = ActiveForm::begin(); ?>
+<?php $form = Modal::beginFormDialog([
+    'title' => Yii::t('DrawioModule.base', '<strong>Create</strong> draw.io diagram'),
+    'footer' => Html::submitButton('Save', ['data-action-click' => 'drawio.createSubmit', 'data-ui-loader' => '', 'class' => 'btn btn-primary']),
+]) ?>
 
-<div class="modal-body">
-    <?= $form->field($model, 'fileName', ['template' => '{label}<div class="input-group">{input}<div class="input-group-addon">' . $ext . '</div></div>{hint}{error}']); ?>
+    <?= $form->field($model, 'fileName', ['template' => '{label}<div class="input-group">{input}<div class="input-group-text">' . $ext . '</div></div>{hint}{error}']); ?>
     <?= $form->field($model, 'openFlag')->checkbox(); ?>
-</div>
-
-<div class="modal-footer">
-    <?= Html::submitButton('Save', ['data-action-click' => 'drawio.createSubmit', 'data-ui-loader' => '', 'class' => 'btn btn-primary']); ?>
-</div>
-
-<?php ActiveForm::end(); ?>
 
-<?php \humhub\widgets\ModalDialog::end(); ?>
+<?php Modal::endFormDialog()?>
diff --git a/views/open/index.php b/views/open/index.php
diff --git a/widgets/EditorWidget.php b/widgets/EditorWidget.php
diff --git a/widgets/views/editor.php b/widgets/views/editor.php

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@`
`17`	`17`	`*/`
`18`	`18`	`class Events`
`19`	`19`	`{`
`20`		`-`
`21`	`20`	`public static function onFileHandlerCollection($event)`
`22`	`21`	`{`
`23`	`22`	`/* @var $collection FileHandlerCollection */`
`@@ -31,7 +30,7 @@ public static function onFileHandlerCollection($event)`
`31`	`30`	`/* @var $module \humhub\modules\drawio\Module */`
`32`	`31`	`$module = Yii::$app->getModule('drawio');`
`33`	`32`
`34`		`- if ($collection->file === null) {`
	`33`	`+ if ($collection->file === null) {`
`35`	`34`	`return;`
`36`	`35`	`}`
`37`	`36`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ class Assets extends AssetBundle`
`32`	`32`	`* @inheritdoc`
`33`	`33`	`*/`
`34`	`34`	`public $publishOptions = [`
`35`		`- 'forceCopy' => false`
	`35`	`+ 'forceCopy' => false,`
`36`	`36`	`];`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@`
`14`	`14`
`15`	`15`	`class AdminController extends Controller`
`16`	`16`	`{`
`17`		`-`
`18`	`17`	`public function actionIndex()`
`19`	`18`	`{`
`20`	`19`	`$model = new ConfigureForm();`
Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,10 @@`
`13`	`13`
`14`	`14`	`class OpenController extends BaseFileController`
`15`	`15`	`{`
`16`		`-`
`17`	`16`	`public function actionIndex()`
`18`	`17`	`{`
`19`	`18`	`return $this->renderAjax('index', [`
`20`		`- 'file' => $this->file,`
	`19`	`+ 'file' => $this->file,`
`21`	`20`	`]);`
`22`	`21`	`}`
`23`	`22`
`@@ -31,7 +30,7 @@ public function actionUpdate()`
`31`	`30`	`$this->file->save();`
`32`	`31`
`33`	`32`	`return [`
`34`		`- 'ok' => true`
	`33`	`+ 'ok' => true,`
`35`	`34`	`];`
`36`	`35`	`}`
`37`	`36`