From 448edb8671400416a7702a99d1303a20a249014f Mon Sep 17 00:00:00 2001
From: bellord13 <elife.by@gmail.com>
Date: Fri, 5 Sep 2025 17:35:08 +0300
Subject: [PATCH] fix

---
 .module.json                                  |  2 +-
 .../main/submenu/settings/include/config.php  | 44 ++++++++++++++++---
 clone.php                                     | 22 +++++++---
 default_config.php                            | 14 ++++++
 lang/ru/install/index.php                     |  2 +-
 lib/App/App.php                               | 11 +++++
 lib/Handlers/Autoloader.php                   | 11 +++++
 lib/Interfaces/ITest.php                      |  8 ++++
 readme.md                                     |  3 ++
 src/.env.example                              |  1 +
 src/config.php.example                        |  4 ++
 11 files changed, 107 insertions(+), 15 deletions(-)
 create mode 100644 lib/Handlers/Autoloader.php
 create mode 100644 lib/Interfaces/ITest.php
 create mode 100644 readme.md
 create mode 100644 src/.env.example
 create mode 100644 src/config.php.example

diff --git a/.module.json b/.module.json
index 779049a..fb2614b 100644
--- a/.module.json
+++ b/.module.json
@@ -4,6 +4,6 @@
     "namespace": "Bx\\Nullable",
     "gitUrl": "https://bitbucket.org/bellord13/bx.null/",
     "version": "1.0.0",
-    "date": "2024-01-01 00:00:00",
+    "date": "2025-01-01 00:00:00",
     "deps": ["wt.core"]
 }
\ No newline at end of file
diff --git a/admin/main/submenu/settings/include/config.php b/admin/main/submenu/settings/include/config.php
index ce942b2..3cfe04b 100644
--- a/admin/main/submenu/settings/include/config.php
+++ b/admin/main/submenu/settings/include/config.php
@@ -9,9 +9,41 @@ $data['env'] = $app->env();
 
 
 ?>
-    <table cellpadding="5" border="1" style="border-collapse: collapse; width: 100%">
-<?php
-foreach ($data as $key => $value) {
-    ?><tr><td><?= $key ?></td><td><?= $value ?></td></tr><?php
-}
-?></table><?php
\ No newline at end of file
+<table cellpadding="5" border="1" style="border-collapse: collapse; width: 100%">
+    <?php
+    foreach ($data as $key => $value) {
+        ?><tr><td><?= $key ?></td><td><?= $value ?></td></tr><?php
+    }
+    ?></table>
+<br><?php
+
+?><table cellpadding="5" border="1" style="border-collapse: collapse; width: 100%">
+    <tr>
+        <?php
+        $initPhpSrc = getLocalPath('php_interface/init.php', BX_PERSONAL_ROOT);
+        $src = $app->module()->getSrc();
+        $html = "<div style=\"font-family: monospace; font-size: 0.9em; white-space: pre; color: grey;\">if(file_exists(\$_SERVER['DOCUMENT_ROOT'] . '$src/init.php'))
+    include_once \$_SERVER['DOCUMENT_ROOT'] . '$src/init.php';</div>";
+        ?>
+        <td>
+            <?=$this->getCheckTemplate($app->isIncludeFileToInitPhp())?>
+        </td>
+        <td>
+            Модуль подключен в init.php
+        </td>
+        <td width="50%">
+            <?php
+            if($initPhpSrc){
+                ?><a target="_blank" href="/bitrix/admin/fileman_file_edit.php?path=<?=urlencode($initPhpSrc)?>&full_src=Y">
+                <?=$initPhpSrc?>
+                </a><?php
+            } else {
+                ?>init.php отсутствует<?php
+            }
+            ?>
+            <br>
+            <?=$html?>
+        </td>
+    </tr>
+</table>
+<br>
\ No newline at end of file
diff --git a/clone.php b/clone.php
index 47ab37a..40d7d59 100644
--- a/clone.php
+++ b/clone.php
@@ -73,15 +73,22 @@ function _fix(ModuleEntity $newEntity, ModuleEntity $nullableEntity){
             $new_file = $orig_file;
             $cr = 0;
             $new_file = str_replace($nullableEntity->getLangPrefix(), $newEntity->getLangPrefix(), $new_file, $cr);
-            $new_file = str_replace($nullableEntity->fields()->id, $newEntity->fields()->id, $new_file, $cr);
-            $new_file = str_replace($nullableEntity->fields()->prefix, $newEntity->fields()->prefix, $new_file, $cr);
+            $new_file = str_replace($nullableEntity->getId(), $newEntity->getId(), $new_file, $cr);
+            $new_file = str_replace($nullableEntity->getPrefix(), $newEntity->getPrefix(), $new_file, $cr);
             $new_file = str_replace($nullableEntity->getNamespace(), $newEntity->getNamespace(), $new_file, $cr);
 
-            $lastModuleName = collect(explode('.', $newEntity->fields()->id))->last();
-            $lastNullableModuleName = collect(explode('.', $nullableEntity->fields()->id))->last();
+            $new_file = str_replace(
+                ucfirst($nullableEntity->getProductCode()) . ': ' . ucfirst($nullableEntity->getProductCode()),
+                ucfirst($newEntity->getProductCode()) . ': ' . ucfirst($newEntity->getProductCode()),
+                $new_file,
+                $cr
+            );
+
+            $new_file = str_replace(ucfirst($nullableEntity->getProductCode()), ucfirst($newEntity->getProductCode()), $new_file, $cr);
+            $new_file = str_replace(ucfirst($nullableEntity->getCompanyCode()), ucfirst($newEntity->getCompanyCode()), $new_file, $cr);
+            $new_file = str_replace($nullableEntity->getProductCode(), $newEntity->getProductCode(), $new_file, $cr);
+            $new_file = str_replace($nullableEntity->getCompanyCode(), $newEntity->getCompanyCode(), $new_file, $cr);
 
-            $new_file = str_replace(ucfirst($lastNullableModuleName), ucfirst($lastModuleName), $new_file, $cr);
-            $new_file = str_replace(strtolower($lastNullableModuleName), strtolower($lastModuleName), $new_file, $cr);
 
 
             echo $cr . ' ' .$path . PHP_EOL;
@@ -98,8 +105,9 @@ echo $newEntity->getId() . PHP_EOL;
 
 copy_folder_safe($nullableEntity->getPath(), $newEntity->getPath(), true, true, [
     '.git',
-    'clone.php',
     '.module.json',
+    'clone.php',
+    'readme.md',
 ], function ($d1, &$d2) use ($nullableEntity, $newEntity){
     $lastModuleName = collect(explode('.', $newEntity->fields()->id))->last();
     $lastNullableModuleName = collect(explode('.', $nullableEntity->fields()->id))->last();
diff --git a/default_config.php b/default_config.php
index f1251c3..6f75382 100644
--- a/default_config.php
+++ b/default_config.php
@@ -4,4 +4,18 @@ return [
     'MainAbstractFactory' => [
         'Bx\Nullable\Factory\NullableFactory' => ['cache' => ['hit'], 'is_collection_query' => true],
     ],
+    'events' => [
+        'main:OnPageStart' => [
+            ['Bx\Nullable\Handlers\Autoloader', 'onPageStart'],
+        ],
+        'main:OnProlog' => [
+            ['Bx\Nullable\Handlers\Autoloader', 'onProlog'],
+        ],
+        'main:OnEpilog' => [
+            ['Bx\Nullable\Handlers\Autoloader', 'onEpilog'],
+        ],
+        'main:OnBeforeProlog' => [
+            ['Bx\Nullable\Handlers\Autoloader', 'onBeforeProlog'],
+        ],
+    ],
 ];
\ No newline at end of file
diff --git a/lang/ru/install/index.php b/lang/ru/install/index.php
index ef05d02..81595cd 100644
--- a/lang/ru/install/index.php
+++ b/lang/ru/install/index.php
@@ -1,4 +1,4 @@
-<?
+<?php
 $MESS ['bx_nullable_partner_name'] = 'CoreLion';
 $MESS ['bx_nullable_partner_uri'] = 'https://corelion.ru/';
 $MESS ['bx_nullable_module_name'] = 'Bx: Nullable';
diff --git a/lib/App/App.php b/lib/App/App.php
index 100a7f2..b7c8ef6 100644
--- a/lib/App/App.php
+++ b/lib/App/App.php
@@ -11,6 +11,8 @@ use Bx\Nullable\Facade\FactoryFacade;
 
 class App extends \Wt\Core\App\App
 {
+    protected $includeFileToInitPhp;
+
     /**
      * @param string $factoryName
      * @return FactoryFacade | DefaultFactoryFacade
@@ -37,4 +39,13 @@ class App extends \Wt\Core\App\App
     {
         return parent::defines();
     }
+
+    public function isIncludeFileToInitPhp($value = null)
+    {
+        if(is_null($value)){
+            return $this->includeFileToInitPhp;
+        }
+        $this->includeFileToInitPhp = $value;
+        return $this;
+    }
 }
\ No newline at end of file
diff --git a/lib/Handlers/Autoloader.php b/lib/Handlers/Autoloader.php
new file mode 100644
index 0000000..8c229a6
--- /dev/null
+++ b/lib/Handlers/Autoloader.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Bx\Nullable\Handlers;
+
+class Autoloader
+{
+    public static function onPageStart(){}
+    public static function onBeforeProlog(){}
+    public static function onProlog(){}
+    public static function onEpilog(){}
+}
\ No newline at end of file
diff --git a/lib/Interfaces/ITest.php b/lib/Interfaces/ITest.php
new file mode 100644
index 0000000..ba78834
--- /dev/null
+++ b/lib/Interfaces/ITest.php
@@ -0,0 +1,8 @@
+<?php
+
+namespace Bx\Nullable\Interfaces;
+
+class ITest
+{
+
+}
\ No newline at end of file
diff --git a/readme.md b/readme.md
new file mode 100644
index 0000000..c360687
--- /dev/null
+++ b/readme.md
@@ -0,0 +1,3 @@
+1) создаем папку с модулем
+2) копируем и конфигурируем файл .module.json
+3) запускаем php -f clone.php ./path_to_new_module
\ No newline at end of file
diff --git a/src/.env.example b/src/.env.example
new file mode 100644
index 0000000..c2c027f
--- /dev/null
+++ b/src/.env.example
@@ -0,0 +1 @@
+local
\ No newline at end of file
diff --git a/src/config.php.example b/src/config.php.example
new file mode 100644
index 0000000..bee73cf
--- /dev/null
+++ b/src/config.php.example
@@ -0,0 +1,4 @@
+<?php
+return [
+
+];