version 4.10.54.4

Tatiana · Tatiana · commit 69edc28700ef · 2023-06-08T17:00:31.000+03:00
diff --git a/http/css/main.css b/http/css/main.css
diff --git a/http/html.html b/http/html.html
@@ -10,8 +10,8 @@
 
     <link rel="stylesheet"
           type="text/css"
-          href="/css/main.css?v=610d87a">
-    <script src="/js/main.js?v=3a9a2b6"></script>
+          href="/css/main.css?v=f037941">
+    <script src="/js/main.js?v=dbcc612"></script>
 
     </head>
 <body id="pk">
diff --git a/http/js/i18n/de.js b/http/js/i18n/de.js
diff --git a/http/js/i18n/es.js b/http/js/i18n/es.js
diff --git a/http/js/i18n/ru.js b/http/js/i18n/ru.js
diff --git a/http/js/main.js b/http/js/main.js
diff --git a/totum/common/Lang/DE.php b/totum/common/Lang/DE.php
@@ -422,6 +422,10 @@ class DE implements LangInterface
   'Field [[%s]] is required.' => 'Das Feld [[%s]] st obligatorisch.',
   'Creator warnings' => 'Notificaciones al Administrador',
   'BFL-log is on' => 'Protokollierung von Fehlern und externen Zugriffen aktiviert',
+  'list-ubsubscribe-link-text' => 'Abmeldung',
+  'list-ubsubscribe-Blocked-from-sending' => 'Diese Email ist für den Versand gesperrt',
+  'list-ubsubscribe-done' => 'Es ist getan',
+  'list-ubsubscribe-wrong-link' => 'Falscher Link',
 );
 	/**
      * Возвращает сумму прописью
diff --git a/totum/common/Lang/EN.php b/totum/common/Lang/EN.php
@@ -14,6 +14,10 @@ class EN implements LangInterface
   'Version adding error - file for version not found' => 'Version adding error — file for version not found',
   'Creator warnings' => 'Notifications to the Administrator',
   'BFL-log is on' => 'Log of errors and external accesses enabled',
+  'list-ubsubscribe-link-text' => 'Unsubscribe',
+  'list-ubsubscribe-Blocked-from-sending' => 'This email is blocked from sending',
+  'list-ubsubscribe-done' => 'Done',
+  'list-ubsubscribe-wrong-link' => 'Wrong link',
 );
 	public function dateFormat(DateTime $date, $fStr): string
     {
diff --git a/totum/common/Lang/ES.php b/totum/common/Lang/ES.php
@@ -422,6 +422,10 @@ class ES implements LangInterface
   'Field [[%s]] is required.' => 'Campo [[%s]] es obligatorio.',
   'Creator warnings' => 'Benachrichtigungen an den Administrator',
   'BFL-log is on' => 'Registro de errores y accesos externos activado',
+  'list-ubsubscribe-link-text' => 'Unsubscribe',
+  'list-ubsubscribe-Blocked-from-sending' => 'Este correo electrónico está bloqueado para el envío',
+  'list-ubsubscribe-done' => 'Está hecho',
+  'list-ubsubscribe-wrong-link' => 'Enlace incorrecto',
 );
 	public function dateFormat(DateTime $date, $fStr): string
     {
diff --git a/totum/common/Lang/RU.php b/totum/common/Lang/RU.php
@@ -424,6 +424,10 @@ class RU implements LangInterface
   'Field [[%s]] is required.' => 'Поле [[%s]]  обязательно для заполнения.',
   'Creator warnings' => 'Нотификации Администратору',
   'BFL-log is on' => 'Включен журнал ошибок и внешних обращений',
+  'list-ubsubscribe-link-text' => 'Отписаться',
+  'list-ubsubscribe-Blocked-from-sending' => 'Отправка на данный email заблокирована',
+  'list-ubsubscribe-done' => 'Готово',
+  'list-ubsubscribe-wrong-link' => 'Неверная ссылка',
 );
 	/**
      * Возвращает сумму прописью
diff --git a/totum/common/Totum.php b/totum/common/Totum.php
@@ -27,7 +27,7 @@
  */
 class Totum
 {
-    public const VERSION = '4.10.54.3';
+    public const VERSION = '4.10.54.4';
 
 
     public const TABLE_CODE_PARAMS = ['row_format', 'table_format', 'on_duplicate', 'default_action'];
diff --git a/totum/moduls/Table/Actions.php b/totum/moduls/Table/Actions.php
@@ -78,10 +78,10 @@ public function __construct(ServerRequestInterface $Request, string $modulePath,
 
     protected function chechPostData($post)
     {
-        foreach (['onPage', 'pageCount'] as $param){
+        foreach (['onPage', 'pageCount'] as $param) {
             if (key_exists($param, $post) && $post[$param]) {
-                if(!ctype_digit($post[$param])){
-                    throw new errorException('Front error message with parametr '.$param);
+                if (!ctype_digit($post[$param])) {
+                    throw new errorException('Front error message with parametr ' . $param);
                 }
             }
         }
@@ -104,6 +104,11 @@ function reuser()
         return ['ok' => 1];
     }
 
+    public function getSchemaFormats()
+    {
+        return ['formats' => ['date' => $this->Totum->getConfig()->getSettings('dates_format') ?? 'd.m.Y'] + $this->Totum->getConfig()->getSettings('numbers_format') ?? []];
+    }
+
     public
     function seachUserTables()
     {
diff --git a/totum/moduls/Table/ReadTableActions.php b/totum/moduls/Table/ReadTableActions.php
@@ -2185,9 +2185,11 @@ protected function getTableClientChangedData($data, $force = false, $onlyFields
                 );
 
 
-                if (($this->post['onPage'] ?? false) && (count($pageIds) + count($changedIds['added'])) > (int)$this->post['onPage']) {
-                    $displaceOffset = $this->post['onPage'] - (count($pageIds) + count($changedIds['added']));
-                    $displaced = array_slice($pageIds, $displaceOffset);
+                $excess = 100;
+
+                if (($this->post['onPage'] ?? false) && (count($pageIds) + count($changedIds['added'])) > (int)$this->post['onPage'] + $excess) {
+                    $displaceOffset = $this->post['onPage'] + $excess - (count($pageIds) + count($changedIds['added']));
+                    $displaced = array_slice($pageIds, 0, -1 * $displaceOffset);
                 }
 
                 array_push($pageIds, ...array_keys($changedIds['added']));
diff --git a/totum/moduls/install/de.json b/totum/moduls/install/de.json
@@ -26,6 +26,8 @@
     "{{Add_calculation_tables}}": "Berechnungstabellen hinzufügen",
     "{{Add_change}}": "Hinzufügen\/Ändern",
     "{{Add_form}}": "Formular hinzufügen",
+    "{{Add_header}}": "Kopfzeile 'list-unsubscribe' hinzufügen",
+    "{{Add_link_in_body}}": "Link im Text hinzufügen",
     "{{Add_quick_form}}": "Formular hinzufügen",
     "{{Add_tables_by_name}}": "Tabellen nach Namen hinzufügen",
     "{{Add_tables_by_title}}": "Tabellen nach Titel hinzufügen",
@@ -375,6 +377,10 @@
     "{{LDAP_only_for_at_type_of_login}}": "Nur für @ Protokollierungsart",
     "{{LDAP_settings}}": "LDAP-Einstellungen",
     "{{LDAP}}": "LDAP",
+    "{{LU_blocked_email}}": "Blockierte E-Mail",
+    "{{LU_date}}": "Datum",
+    "{{LU_enable}}": "Aktivieren Sie",
+    "{{LU_title}}": "E-Mail-Titel",
     "{{Label_for_the_All_option_ALL}}": "Bezeichnung für die Option Alle (*ALL*)",
     "{{Label_for_the_Empty_option}}": "Name für die Option Leer ()",
     "{{Label_for_the_Nothing_in_p}}": "Name für die Option Nichts (*NONE*)",
@@ -434,6 +440,7 @@
     "{{Link}}": "Link",
     "{{List_of_export_id}}": "Liste der entladenen Id's",
     "{{List_of_values_in_p}}": "Liste von Werten",
+    "{{List_unsubscribe}}": "List unsubscribe",
     "{{Logging_of_external_calls_and_errors}}": "Protokollierung externer Anrufe und Fehler",
     "{{Login_page}}": "Anmeldeseite:",
     "{{Login}}": "Benutzername",
@@ -947,5 +954,6 @@
     "{{ttm__search_catalog}}": "MeiliSearch Verzeichnisse",
     "{{ttm__search_settings}}": "MeiliSearch Einstellungen",
     "{{ttm__tmp_change_tree_links}}": "ttm__tmp_change_tree_links",
-    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp"
+    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp",
+    "{{ttm_list_unsubscribe}}": "List unsubscribe"
 }
diff --git a/totum/moduls/install/en.json b/totum/moduls/install/en.json
@@ -26,6 +26,8 @@
     "{{Add_calculation_tables}}": "Add calculation tables",
     "{{Add_change}}": "Add\/change",
     "{{Add_form}}": "Add form",
+    "{{Add_header}}": "Add header 'list-unsubscribe'",
+    "{{Add_link_in_body}}": "Add link in body",
     "{{Add_quick_form}}": "Add form",
     "{{Add_tables_by_name}}": "Add tables by name",
     "{{Add_tables_by_title}}": "Add tables by title",
@@ -375,6 +377,10 @@
     "{{LDAP_only_for_at_type_of_login}}": "Only for «at» type of login",
     "{{LDAP_settings}}": "LDAP settings",
     "{{LDAP}}": "LDAP",
+    "{{LU_blocked_email}}": "Blocked email",
+    "{{LU_date}}": "Date",
+    "{{LU_enable}}": "Enable",
+    "{{LU_title}}": "Email title",
     "{{Label_for_the_All_option_ALL}}": "Label for the All option (*ALL*)",
     "{{Label_for_the_Empty_option}}": "Label for the Empty option ()",
     "{{Label_for_the_Nothing_in_p}}": "Label for the Nothing (*NONE*) option",
@@ -434,6 +440,7 @@
     "{{Link}}": "Link",
     "{{List_of_export_id}}": "List of export id",
     "{{List_of_values_in_p}}": "List of values",
+    "{{List_unsubscribe}}": "List unsubscribe",
     "{{Logging_of_external_calls_and_errors}}": "Logging of external calls and errors",
     "{{Login_page}}": "Login page:",
     "{{Login}}": "Login",
@@ -947,5 +954,6 @@
     "{{ttm__search_catalog}}": "MeiliSearch  catalogs",
     "{{ttm__search_settings}}": "MeiliSearch settings",
     "{{ttm__tmp_change_tree_links}}": "ttm__tmp_change_tree_links",
-    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp"
+    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp",
+    "{{ttm_list_unsubscribe}}": "List unsubscribe"
 }
diff --git a/totum/moduls/install/es.json b/totum/moduls/install/es.json
@@ -26,6 +26,8 @@
     "{{Add_calculation_tables}}": "Agregar tablas de cálculo",
     "{{Add_change}}": "Agregar\/Cambiar",
     "{{Add_form}}": "Agregar formulario",
+    "{{Add_header}}": "Añadir cabecera 'list-unsubscribe'",
+    "{{Add_link_in_body}}": "Añadir enlace en cuerpo",
     "{{Add_quick_form}}": "Agregar formulario rápido",
     "{{Add_tables_by_name}}": "Agregar tablas por nombre",
     "{{Add_tables_by_title}}": "Agregar tablas por título",
@@ -375,6 +377,10 @@
     "{{LDAP_only_for_at_type_of_login}}": "Solo para el tipo de inicio de sesión @",
     "{{LDAP_settings}}": "Configuración LDAP",
     "{{LDAP}}": "LDAP",
+    "{{LU_blocked_email}}": "Email bloqueado",
+    "{{LU_date}}": "Fecha",
+    "{{LU_enable}}": "Activar",
+    "{{LU_title}}": "Título del e-mail",
     "{{Label_for_the_All_option_ALL}}": "Etiqueta para la opción Todo (*ALL*)",
     "{{Label_for_the_Empty_option}}": "Etiqueta para la opción Vacío ()",
     "{{Label_for_the_Nothing_in_p}}": "Etiqueta para la opción Nada (*NONE*)",
@@ -434,6 +440,7 @@
     "{{Link}}": "Enlace",
     "{{List_of_export_id}}": "Lista de ids para exportar",
     "{{List_of_values_in_p}}": "Lista de valores",
+    "{{List_unsubscribe}}": "List unsubscribe",
     "{{Logging_of_external_calls_and_errors}}": "Registro de llamadas externas y errores",
     "{{Login_page}}": "Página de inicio de sesión:",
     "{{Login}}": "Inicio de sesión",
@@ -947,5 +954,6 @@
     "{{ttm__search_catalog}}": "Catálogos de búsqueda MeiliSearch",
     "{{ttm__search_settings}}": "Configuración de búsqueda MeiliSearch",
     "{{ttm__tmp_change_tree_links}}": "ttm__tmp_change_tree_links",
-    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp"
+    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp",
+    "{{ttm_list_unsubscribe}}": "List unsubscribe"
 }
diff --git a/totum/moduls/install/ru.json b/totum/moduls/install/ru.json
@@ -26,6 +26,8 @@
     "{{Add_calculation_tables}}": "Добавить расчетные таблицы",
     "{{Add_change}}": "Добавлять\/Изменять",
     "{{Add_form}}": "Добавить форму",
+    "{{Add_header}}": "Добавить заголовок 'list-unsubscribe'",
+    "{{Add_link_in_body}}": "Добавить ссылку в письмо",
     "{{Add_quick_form}}": "Добавить форму",
     "{{Add_tables_by_name}}": "Добавить таблицы по name",
     "{{Add_tables_by_title}}": "Добавить таблицы по title",
@@ -375,6 +377,10 @@
     "{{LDAP_only_for_at_type_of_login}}": "Только для @ типа логирования",
     "{{LDAP_settings}}": "Настройки LDAP",
     "{{LDAP}}": "LDAP",
+    "{{LU_blocked_email}}": "Блокированный адрес",
+    "{{LU_date}}": "Дата",
+    "{{LU_enable}}": "Включить",
+    "{{LU_title}}": "Заголовок письма",
     "{{Label_for_the_All_option_ALL}}": "Название для опции Все (*ALL*)",
     "{{Label_for_the_Empty_option}}": "Название для опции Пустое ()",
     "{{Label_for_the_Nothing_in_p}}": "Название для опции Ничего (*NONE*)",
@@ -434,6 +440,7 @@
     "{{Link}}": "Ссылка",
     "{{List_of_export_id}}": "Список выгружаемых id",
     "{{List_of_values_in_p}}": "Список значений",
+    "{{List_unsubscribe}}": "List unsubscribe",
     "{{Logging_of_external_calls_and_errors}}": "Логирование внешних обращений и ошибок",
     "{{Login_page}}": "Страница входа:",
     "{{Login}}": "Логин",
@@ -947,5 +954,6 @@
     "{{ttm__search_catalog}}": "Каталоги MeiliSearch",
     "{{ttm__search_settings}}": "Настройки MeiliSearch",
     "{{ttm__tmp_change_tree_links}}": "ttm__tmp_change_tree_links",
-    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp"
+    "{{ttm_form_params_tmp}}": "ttm_form_params_tmp",
+    "{{ttm_list_unsubscribe}}": "List unsubscribe"
 }
diff --git a/totum/moduls/install/start.json.gz.ttm b/totum/moduls/install/start.json.gz.ttm
diff --git a/totum/templates/html.html b/totum/templates/html.html
@@ -10,8 +10,8 @@
 
     <link rel="stylesheet"
           type="text/css"
-          href="/css/main.css?v=610d87a">
-    <script src="/js/main.js?v=3a9a2b6"></script>
+          href="/css/main.css?v=f037941">
+    <script src="/js/main.js?v=dbcc612"></script>
 
     </head>
 <body id="pk">
diff --git a/totum/templates/page_template.php b/totum/templates/page_template.php
@@ -7,7 +7,7 @@
     <script src="/js/libs.js?v=c27fdf7"></script>
     <link rel="stylesheet"
           type="text/css"
-          href="/css/main.css?v=610d87a">
+          href="/css/main.css?v=f037941">
 
     <?php
     if ($isCreatorView ?? null) { ?>
@@ -18,8 +18,8 @@
         <?php
     } ?>
 
-    <script src="/js/main.js?v=3a9a2b6"></script>
-    <script src="/js/i18n/<?= $this->Config->getLang() ?>.js?1"></script>
+    <script src="/js/main.js?v=dbcc612"></script>
+    <script src="/js/i18n/<?= $this->Config->getLang() ?>.js?2"></script>
     <script>App.lang = App.langs["<?= $this->Config->getLang() ?>"]</script>
 
 
diff --git a/totum/templates/page_template_simple.php b/totum/templates/page_template_simple.php
@@ -7,9 +7,9 @@
     <script src="/js/libs.js?v=c27fdf7"></script>
     <link rel="stylesheet"
           type="text/css"
-          href="/css/main.css?v=610d87a">
-    <script src="/js/main.js?v=3a9a2b6"></script>
-    <script src="/js/i18n/<?= $this->Config->getLang() ?>.js?1"></script>
+          href="/css/main.css?v=f037941">
+    <script src="/js/main.js?v=dbcc612"></script>
+    <script src="/js/i18n/<?= $this->Config->getLang() ?>.js?2"></script>
     <script>App.lang = App.langs["<?= $this->Config->getLang() ?>"]</script>
 
     <link rel="shortcut icon" type="image/png" href="/fls/6_favicon.png"/>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*/`
`28`	`28`	`class Totum`
`29`	`29`	`{`
`30`		`- public const VERSION = '4.10.54.3';`
	`30`	`+ public const VERSION = '4.10.54.4';`
`31`	`31`
`32`	`32`
`33`	`33`	`public const TABLE_CODE_PARAMS = ['row_format', 'table_format', 'on_duplicate', 'default_action'];`
Original file line number	Diff line number	Diff line change
`@@ -78,10 +78,10 @@ public function __construct(ServerRequestInterface $Request, string $modulePath,`
`78`	`78`
`79`	`79`	`protected function chechPostData($post)`
`80`	`80`	`{`
`81`		`- foreach (['onPage', 'pageCount'] as $param){`
	`81`	`+ foreach (['onPage', 'pageCount'] as $param) {`
`82`	`82`	`if (key_exists($param, $post) && $post[$param]) {`
`83`		`- if(!ctype_digit($post[$param])){`
`84`		`- throw new errorException('Front error message with parametr '.$param);`
	`83`	`+ if (!ctype_digit($post[$param])) {`
	`84`	`+ throw new errorException('Front error message with parametr ' . $param);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
`@@ -104,6 +104,11 @@ function reuser()`
`104`	`104`	`return ['ok' => 1];`
`105`	`105`	`}`
`106`	`106`
	`107`	`+ public function getSchemaFormats()`
	`108`	`+ {`
	`109`	`+ return ['formats' => ['date' => $this->Totum->getConfig()->getSettings('dates_format') ?? 'd.m.Y'] + $this->Totum->getConfig()->getSettings('numbers_format') ?? []];`
	`110`	`+ }`
	`111`	`+`
`107`	`112`	`public`
`108`	`113`	`function seachUserTables()`
`109`	`114`	`{`