Skip to content

Commit b7c068a

Browse files
author
Tatiana
committed
version 4.11.57.0
2 parents 6b84a18 + 71f3885 commit b7c068a

19 files changed

+104
-29
lines changed

Diff for: ‎http/html.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="stylesheet"
1212
type="text/css"
1313
href="/css/main.css?v=1f0a57c">
14-
<script src="/js/main.js?v=a1badf5"></script>
14+
<script src="/js/main.js?v=5280e03"></script>
1515

1616
</head>
1717
<body id="pk">

Diff for: ‎http/js/main.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎totum/common/Lang/DE.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ class DE implements LangInterface
435435
'This is not web user. He cannot be authorized by a token' => 'Dies ist kein Web-Benutzer. Er kann nicht durch ein Token autorisiert werden',
436436
'The OnlyOffice service table was successfully created. Repeat the operation.' => 'Die OnlyOffice-Dienstetabelle wurde erfolgreich erstellt. Wiederholen Sie den Vorgang.',
437437
'File key is not exists or is expired' => 'Der Dateischlüssel ist nicht vorhanden oder abgelaufen',
438-
'OnlyOfficeSaveTimeoutError' => 'Etwas ist schief gelaufen. Wenn es keine Änderungen gab, ist alles in Ordnung, schließen Sie einfach das Editorfenster. Wenn es Änderungen gab und es Excel ist - entfernen Sie den Fokus von der Zelle und versuchen Sie es erneut.',
438+
'OnlyOfficeSaveTimeoutError' => 'Nicht möglich zu speichern aufgrund fehlender Änderungen im Dokument. Wenn Sie eine xlsx oder eine andere Tabelle bearbeiten, drücken Sie bitte zuerst die Eingabetaste, um die Daten in der bearbeitbaren Zelle zu speichern, oder verschieben Sie den Fokus auf eine andere Zelle.',
439439
'Permission is denied for selected user' => 'Berechtigung wird für ausgewählten Benutzer verweigert',
440440
'New secret code was sent' => 'Neuer Geheimcode wurde gesendet',
441441
'You can\'t resend the secret yet.' => 'Sie können das Geheimnis noch nicht zurückschicken.',

Diff for: ‎totum/common/Lang/EN.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class EN implements LangInterface
1818
'list-ubsubscribe-Blocked-from-sending' => 'This email is blocked from sending',
1919
'list-ubsubscribe-done' => 'Done',
2020
'list-ubsubscribe-wrong-link' => 'Wrong link',
21-
'OnlyOfficeSaveTimeoutError' => 'Something went wrong. If there were no changes - everything is correct, just close the editor window. If there were and it is excel - remove the focus from the cell and try again.',
21+
'OnlyOfficeSaveTimeoutError' => 'Unable to save due to lack of changes in the document. If you are editing a xlsx or another spreadsheet, please press Enter first to save the data in the editable cell or move focus to another cell.',
2222
);
2323
public function dateFormat(DateTime $date, $fStr): string
2424
{

Diff for: ‎totum/common/Lang/ES.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ class ES implements LangInterface
435435
'This is not web user. He cannot be authorized by a token' => 'No es un usuario web. No puede ser autorizado por un token',
436436
'The OnlyOffice service table was successfully created. Repeat the operation.' => 'La tabla de servicio OnlyOffice se ha creado correctamente. Repita la operación.',
437437
'File key is not exists or is expired' => 'La clave del fichero no existe o ha caducado',
438-
'OnlyOfficeSaveTimeoutError' => 'Algo ha ido mal. Si no hubo cambios - todo está correcto, simplemente cierre la ventana del editor. Si había y es excel - quitar el foco de la celda y vuelva a intentarlo.',
438+
'OnlyOfficeSaveTimeoutError' => 'No se puede guardar debido a la falta de cambios en el documento. Si está editando un archivo xlsx u otra hoja de cálculo, por favor, presione Enter primero para guardar los datos en la celda editable o mueva el enfoque a otra celda.',
439439
'Permission is denied for selected user' => 'Permiso denegado para el usuario seleccionado',
440440
'New secret code was sent' => 'Se envió un nuevo código secreto',
441441
'You can\'t resend the secret yet.' => 'Todavía no puedes reenviar el secreto.',

Diff for: ‎totum/common/Lang/RU.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ class RU implements LangInterface
437437
'This is not web user. He cannot be authorized by a token' => 'Это не веб-пользователь. Он не может быть авторизован по токену',
438438
'The OnlyOffice service table was successfully created. Repeat the operation.' => 'Таблица обслуживания OnlyOffice успешно создана. Повторите операцию.',
439439
'File key is not exists or is expired' => 'Ключ файла не существует или срок его действия истек',
440-
'OnlyOfficeSaveTimeoutError' => 'Что-то пошло не так. Если изменений не было - все правильно, просто закройте окно редактора. Если были и это excel - уберите фокус из ячейки и попробуйте еще раз.',
440+
'OnlyOfficeSaveTimeoutError' => 'Не получается сохранить из-за отсутствия изменений в документе. Если вы изменяете xlsx или другую таблицу — сначала нажмите enter для сохранения данных в изменяемой ячейке или переместите фокус в другую ячейку.',
441441
'Permission is denied for selected user' => 'Выбранный пользователь лишен права доступа',
442442
'New secret code was sent' => 'Отправлен новый секретный код',
443443
'You can\'t resend the secret yet.' => 'Повторная отправка секретного кода пока невозможна',

Diff for: ‎totum/common/Totum.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
*/
2828
class Totum
2929
{
30-
public const VERSION = '4.10.56.5';
30+
public const VERSION = '4.11.57.0';
3131

3232

3333
public const TABLE_CODE_PARAMS = ['row_format', 'table_format', 'on_duplicate', 'default_action'];

Diff for: ‎totum/common/calculates/CalculateAction.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ protected function funcLinkToPanel($params)
948948
$hash = $params['hash'];
949949
} elseif ($this->Table->getTableRow()['id'] === $tableRow['id']) {
950950
$hash = $this->Table->getTableRow()['sess_hash'];
951-
}else{
951+
} else {
952952
$this->__checkNotEmptyParams($params, ['hash']);
953953
}
954954
if (!empty($hash)) {
@@ -1104,13 +1104,13 @@ protected function funcLinkToDataText($params)
11041104

11051105
$width = $params['width'] ?? 600;
11061106

1107-
$htmlspecialchars = htmlspecialchars(is_array($params['text']) ?
1107+
$params['text'] = is_array($params['text']) ?
11081108
'OBJECT: ' . json_encode($params['text'], JSON_UNESCAPED_UNICODE) :
1109-
$params['text'] ?? '');
1109+
$params['text'] ?? '';
11101110

11111111
$this->Table->getTotum()->addToInterfaceDatas(
11121112
'text',
1113-
['title' => $title, 'width' => $width, 'height' => ($params['height'] ?? null), 'text' => $htmlspecialchars, 'close' => !!($params['close'] ?? false)],
1113+
['title' => $title, 'width' => $width, 'height' => ($params['height'] ?? null), 'htmlescaping' => true, 'text' => $params['text'], 'close' => !!($params['close'] ?? false)],
11141114
$params['refresh'] ?? false
11151115
);
11161116
}

Diff for: ‎totum/common/calculates/FuncServicesTrait.php

+12-2
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,21 @@ protected function funcServiceAskOpenai($params)
174174
}
175175
}
176176

177+
$arraysToJson = function ($params) {
178+
foreach ($params as &$param) {
179+
if (is_array($param)) {
180+
$param = json_encode($param, JSON_UNESCAPED_UNICODE);
181+
}
182+
}
183+
unset($param);
184+
return $params;
185+
};
186+
177187
if (!empty($datas['system'])) {
178-
$data['s'] = implode("\n\n", $datas['system']);
188+
$data['s'] = implode("\n\n", $arraysToJson($datas['system']));
179189
}
180190
if (!empty($datas['user'])) {
181-
$data['u'] = implode("\n\n", $datas['user']);
191+
$data['u'] = implode("\n\n", $arraysToJson($datas['user']));
182192
}
183193

184194
if (!empty($params['maxtokens'])) {

Diff for: ‎totum/fieldTypes/File.php

+12-7
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,18 @@ public static function isImage($name): bool|string
111111
return false;
112112
}
113113

114-
protected static function getThumb($tmpFileName, $ext): \GdImage|bool
114+
protected static function getThumb($tmpFileName, $ext, Conf $Config): \GdImage|bool
115115
{
116116
if ($ext === 'png') {
117-
$source = imagecreatefrompng($tmpFileName);
117+
$source = @imagecreatefrompng($tmpFileName);
118118
} else {
119-
$source = imagecreatefromjpeg($tmpFileName);
119+
$source = @imagecreatefromjpeg($tmpFileName);
120120
}
121+
122+
if (!$source) {
123+
throw new criticalErrorException($Config->getLangObj()->translate('Wrong format file'));
124+
}
125+
121126
// получение нового размера
122127
list($width, $height) = getimagesize($tmpFileName);
123128

@@ -156,11 +161,11 @@ protected static function getThumb($tmpFileName, $ext): \GdImage|bool
156161
return $thumb;
157162
}
158163

159-
protected static function checkAndCreateThumb($tmpFileName, $name)
164+
protected static function checkAndCreateThumb($tmpFileName, $name, Conf $Config)
160165
{
161166
if ($ext = static::isImage($name)) {
162167
$thumbName = static::getTmpThumbName($tmpFileName);
163-
$thumb = static::getThumb($tmpFileName, $ext);
168+
$thumb = static::getThumb($tmpFileName, $ext, $Config);
164169
imagejpeg($thumb, $thumbName, 100);
165170
}
166171
}
@@ -180,7 +185,7 @@ public static function fileUpload($userId, Conf $Config)
180185
}
181186

182187
if (copy($_FILES['file']['tmp_name'], $tmpFileName)) {
183-
static::checkAndCreateThumb($tmpFileName, $_FILES['file']['name']);
188+
static::checkAndCreateThumb($tmpFileName, $_FILES['file']['name'], $Config);
184189
return ['fname' => preg_replace('`^.*/([^/]+)$`', '$1', $tmpFileName)];
185190
}
186191
}
@@ -294,7 +299,7 @@ protected function checkValByType(&$val, $row, $isCheck = false)
294299
$file['size'] = filesize($ftmpname);
295300
$file['tmpfile'] = preg_replace('`^.*/([^/]+)$`', '$1', $ftmpname);
296301

297-
static::checkAndCreateThumb($ftmpname, $file['name']);
302+
static::checkAndCreateThumb($ftmpname, $file['name'], $this->table->getTotum()->getConfig());
298303
};
299304

300305
/*Добавление через filestring и filestringbase64 */

Diff for: ‎totum/moduls/install/de.json

+15-1
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"{{CHANGE}}": "ÄNDERN",
9494
"{{CHECK_SERVICE_SERVER}}": "PRÜFEN",
9595
"{{CHECK}}": "PRÜFEN",
96+
"{{CLEAR_PROFILE}}": "PROFILDATEN LÖSCHEN",
9697
"{{CONFIGURE_THE_FORM}}": "DAS FORMULAR KONFIGURIEREN",
9798
"{{CORE_Fields_settings_of_the_Tables_Fields}}": "CORE: Einstellung der Tabellenkompositionsfelder",
9899
"{{CORE_Table_and_fields_data_from_the_Tables}}": "CORE: Daten aus der Liste der Tabellen auflisten und zusammenstellen",
@@ -121,6 +122,7 @@
121122
"{{Change_fields_list}}": "Ändern Sie die Feldliste",
122123
"{{Change_in_export}}": "Änderung",
123124
"{{Change_in_logs}}": "Änderung",
125+
"{{Change_lang}}": "Systemsprache ändern",
124126
"{{Change_password}}": "Passwort ändern",
125127
"{{Change_time}}": "Zeit der Veränderung",
126128
"{{Changing_field_name}}": "Ändern des Namens eines Feldes",
@@ -134,6 +136,7 @@
134136
"{{Changing_the_list_of_uploaded_data_of_system_tables}}": "Ändern der Liste der herunterladbaren Systemtabellendaten",
135137
"{{Changing_tree_links}}": "Ändern",
136138
"{{Changing_your_email}}": "Ändern Sie Ihre E-Mail",
139+
"{{Changing_your_lang}}": "Sprache für Benutzer wählen",
137140
"{{Changing_your_password}}": "Ändern Sie Ihr Passwort",
138141
"{{Chart_in_p}}": "Diagramm",
139142
"{{Chart_settings}}": "Diagramme Einstellungen",
@@ -144,6 +147,7 @@
144147
"{{Checkbox_in_p}}": "Ankreuzfeld",
145148
"{{Checking_performance_of_the_application_list_of_existing_indexes}}": "Funktionsprüfung der Suche und Liste der aktuellen Indizes",
146149
"{{Check}}": "Prüfen",
150+
"{{Clear_profile}}": "Profildaten löschen",
147151
"{{Click_here_to_disable_the_admin_interface}}": "Klicken Sie hier, um die Verwaltungsoberfläche zu deaktivieren",
148152
"{{Close_the_window_after_execution}}": "Schließen Sie das Fenster nach Fertigstellung",
149153
"{{Code_format}}": "Format des Codes",
@@ -525,7 +529,7 @@
525529
"{{Notification_adding}}": "Hinzufügen einer Benachrichtigung",
526530
"{{Notification_codes}}": "Meldungscodes",
527531
"{{Notification_limit}}": "Grenze für die Benachrichtigung",
528-
"{{Notifications}}": "Notifikationen",
532+
"{{Notifications}}": "Benachrichtigungen",
529533
"{{Nov}}": "Nov.",
530534
"{{Number_in_p}}": "Nummer",
531535
"{{Number_of_times_execution}}": "Anzahl der Durchführungen",
@@ -575,6 +579,7 @@
575579
"{{PD_Save}}": "Speichern Sie",
576580
"{{PD_upload}}": "Herunterladen",
577581
"{{PRESS_ME}}": "KLICK MICH",
582+
"{{PROFILE_GET_DATA}}": "DATEN ABRUFEN",
578583
"{{PRO_Versioned_in_p}}": "PRO Dateiversionen",
579584
"{{PRO_auth_live_time}}": "PRO Auth Gültigkeitsdauer",
580585
"{{PRO_auth_message}}": "PRO Auth Nachrichtencode",
@@ -621,9 +626,15 @@
621626
"{{Print_whole_text}}": "Den gesamten Text drucken",
622627
"{{Priority_of_additions}}": "Priorität der Ladung",
623628
"{{Priority}}": "Priorität",
629+
"{{Pro_langs}}": "PRO Superlang",
624630
"{{Pro_olny_office}}": "PRO Only Office",
631+
"{{Pro_profiling}}": "PRO Profiling",
625632
"{{Processed}}": "Verarbeitet",
626633
"{{Process}}": "Verarbeitet",
634+
"{{Profile_deleting_text}}": "Alle Profildaten für den gesamten Zeitraum werden gelöscht.",
635+
"{{Profile_get_data}}": "Daten abrufen",
636+
"{{Profiling_folder}}": "Profiling",
637+
"{{Profiling_table}}": "Profiling",
627638
"{{Quick_form_main_section_title}}": "Einfache Abschnittsüberschrift für Schnellformulare",
628639
"{{Read-only_tables}}": "Schreibgeschützte Tabellen",
629640
"{{Recalculate_the_rows_to_be_sure_that_the_sort_is_actual}}": "Berechnen Sie die Zeilen neu, um sicherzustellen, dass die Sorte relevant ist.",
@@ -783,6 +794,8 @@
783794
"{{Styles}}": "Styles",
784795
"{{Sudo}}": "Sudo",
785796
"{{Sun}}": "So",
797+
"{{Superlang_table}}": "Superlang",
798+
"{{Superlanlg_folder}}": "Superlang",
786799
"{{System_credentials}}": "Zugangsdaten im System",
787800
"{{System_in_logs}}": "System",
788801
"{{System_tables}}": "System-Tabellen",
@@ -908,6 +921,7 @@
908921
"{{Username_in_databases}}": "Benutzername",
909922
"{{Users_auth_type}}": "Art der Autorisierung",
910923
"{{Users_extparams}}": "Zusätzliche Parameter",
924+
"{{Users_langs}}": "Langs",
911925
"{{Users_online}}": "Benutzer online",
912926
"{{Users}}": "Benutzer",
913927
"{{User}}": "Benutzer",

Diff for: ‎totum/moduls/install/en.json

+14
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"{{CHANGE}}": "CHANGE",
9494
"{{CHECK_SERVICE_SERVER}}": "CHECK",
9595
"{{CHECK}}": "CHECK",
96+
"{{CLEAR_PROFILE}}": "CLEAR PROFILE",
9697
"{{CONFIGURE_THE_FORM}}": "CONFIGURE THE FORM",
9798
"{{CORE_Fields_settings_of_the_Tables_Fields}}": "CORE: Fields settings of the Tables Fields",
9899
"{{CORE_Table_and_fields_data_from_the_Tables}}": "CORE: Table and fields data from the Tables",
@@ -121,6 +122,7 @@
121122
"{{Change_fields_list}}": "Change fields list",
122123
"{{Change_in_export}}": "Change",
123124
"{{Change_in_logs}}": "Change",
125+
"{{Change_lang}}": "Change system language",
124126
"{{Change_password}}": "Change password",
125127
"{{Change_time}}": "Change time",
126128
"{{Changing_field_name}}": "Changing field name",
@@ -134,6 +136,7 @@
134136
"{{Changing_the_list_of_uploaded_data_of_system_tables}}": "Changing the list of uploaded data of system tables",
135137
"{{Changing_tree_links}}": "Changing tree links",
136138
"{{Changing_your_email}}": "Changing your email",
139+
"{{Changing_your_lang}}": "Choose language for user",
137140
"{{Changing_your_password}}": "Changing your password",
138141
"{{Chart_in_p}}": "Chart",
139142
"{{Chart_settings}}": "Chart settings",
@@ -144,6 +147,7 @@
144147
"{{Checkbox_in_p}}": "Checkbox",
145148
"{{Checking_performance_of_the_application_list_of_existing_indexes}}": "Checking performance of the application and show list of existing indexes",
146149
"{{Check}}": "Check",
150+
"{{Clear_profile}}": "Clear profile data",
147151
"{{Click_here_to_disable_the_admin_interface}}": "Click here to disable the admin interface",
148152
"{{Close_the_window_after_execution}}": "Close the window after execution",
149153
"{{Code_format}}": "Code format",
@@ -575,6 +579,7 @@
575579
"{{PD_Save}}": "Save",
576580
"{{PD_upload}}": "Upload",
577581
"{{PRESS_ME}}": "PRESS ME",
582+
"{{PROFILE_GET_DATA}}": "GET DATA",
578583
"{{PRO_Versioned_in_p}}": "PRO File versions",
579584
"{{PRO_auth_live_time}}": "PRO Auth live time",
580585
"{{PRO_auth_message}}": "PRO Auth message code",
@@ -621,9 +626,15 @@
621626
"{{Print_whole_text}}": "Print whole text",
622627
"{{Priority_of_additions}}": "Priority of additions",
623628
"{{Priority}}": "Priority",
629+
"{{Pro_langs}}": "PRO Superlang",
624630
"{{Pro_olny_office}}": "PRO Only Office",
631+
"{{Pro_profiling}}": "PRO Profiling",
625632
"{{Processed}}": "Processed",
626633
"{{Process}}": "Process",
634+
"{{Profile_deleting_text}}": "All profiling data for the entire time will be deleted",
635+
"{{Profile_get_data}}": "Get data",
636+
"{{Profiling_folder}}": "Profiling",
637+
"{{Profiling_table}}": "Profiling",
627638
"{{Quick_form_main_section_title}}": "Quick form main section title",
628639
"{{Read-only_tables}}": "Read-only tables",
629640
"{{Recalculate_the_rows_to_be_sure_that_the_sort_is_actual}}": "Recalculate the rows to be sure that the sort is actual.",
@@ -783,6 +794,8 @@
783794
"{{Styles}}": "Styles",
784795
"{{Sudo}}": "Sudo",
785796
"{{Sun}}": "Sun",
797+
"{{Superlang_table}}": "Superlang",
798+
"{{Superlanlg_folder}}": "Superlang",
786799
"{{System_credentials}}": "System credentials",
787800
"{{System_in_logs}}": "System",
788801
"{{System_tables}}": "System tables",
@@ -908,6 +921,7 @@
908921
"{{Username_in_databases}}": "Username",
909922
"{{Users_auth_type}}": "Users auth type",
910923
"{{Users_extparams}}": "Extparams",
924+
"{{Users_langs}}": "Langs",
911925
"{{Users_online}}": "Users online",
912926
"{{Users}}": "Users",
913927
"{{User}}": "User",

0 commit comments

Comments
 (0)