Merge branch 'doryphore-dev' into groups

YesWiki · Dec 10, 2024 · 575b863 · 575b863
2 parents 63e6ec4 + 4a5d0e8
commit 575b863
Show file tree

Hide file tree

Showing 133 changed files with 29,334 additions and 5,061 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/docs/actions/lang/actionsbuilder_it.inc.php b/docs/actions/lang/actionsbuilder_it.inc.php
@@ -222,7 +222,7 @@
     'AB_attach_class_displaylink_default' => 'In questa scheda',
     'AB_attach_class_displaylink_new-window' => 'In una nuova scheda',
     'AB_attach_class_displaylink_modalbox' => 'in una finestra',
-    'AB_attach_class_position_label' => 'Posizione',
+    'AB_attach_class_position_label' => 'Titolo',
     'AB_attach_class_position_none' => 'Testo qui sotto',
     'AB_attach_class_position_left' => 'Sinistra',
     'AB_attach_class_position_center' => 'Centro',
@@ -327,7 +327,7 @@
     'AB_advanced_action_progressbar_val_label' => 'Valore',
     'AB_advanced_action_progressbar_val_hint' => '(tra 0 e 100)',
     'AB_advanced_action_tocjs_label' => 'Crea un riassunto della pagina',
-    'AB_advanced_action_tocjs_position_label' => 'Posizione',
+    'AB_advanced_action_tocjs_position_label' => 'Titolo',
     'AB_advanced_action_tocjs_position_right_option' => 'Destra',
     'AB_advanced_action_tocjs_position_left_option' => 'Sinistra',
     'AB_advanced_action_tocjs_size_label' => 'Larghezza',
@@ -393,7 +393,7 @@
     'AB_buttons_action_button_modal_hint' => 'Funziona a una pagina di questo wiki',
     'AB_buttons_action_button_modal_modalbox' => 'Quando cliccato',
     'AB_buttons_action_button_modal_modalbox_hover' => 'Overflight',
-    'AB_buttons_action_button_pull_label' => 'Posizione',
+    'AB_buttons_action_button_pull_label' => 'Titolo',
     'AB_buttons_action_button_pull_right' => 'Destra',
     'AB_buttons_action_button_pull_block' => 'Tutta la larghezza',
     'AB_buttons_action_button_new_window_label' => 'Aprire in una nuova finestra',
@@ -418,7 +418,7 @@
     'AB_MYFAVORITES_TEMPLATE_LINKS' => 'Collegamenti',
     'AB_MYFAVORITES_TEMPLATE_LINKS_WITH_TITLES' => 'Link con titoli',
     'AB_MYFAVORITES_TEMPLATE_TILES' => 'Vignettes',
-    'AB_MYFAVORITES_TEMPLATE_TABLE' => 'Tabella',
+    'AB_MYFAVORITES_TEMPLATE_TABLE' => 'Gestione dei file',
     // syndication
     'AB_syndication_main_label' => 'Unionion / RSS feed',
     'AB_syndication_action_label' => 'Unione',

diff --git a/docs/actions/lang/actionsbuilder_pt.inc.php b/docs/actions/lang/actionsbuilder_pt.inc.php
@@ -548,13 +548,13 @@
     'AB_bazartrombi_label' => 'Trombinoscópio',
     'AB_bazartrombi_description' => 'Os cartões estarão na forma de Trombinoscope.',
     'AB_bazarmaterialcard_label' => 'Cartão de material',
-    'AB_bazarmaterialcard_nbcol_label' => 'Número de colunas',
+    'AB_bazarmaterialcard_nbcol_label' => 'Um campo bf_image é necessário.',
     'AB_bazarmaterialcard_type_label' => 'Exibição sem efeito',
     'AB_bazarmaterialcard_bf_baseline_label' => 'Campo para a legenda',
     'AB_bazardamier_label' => 'Damier',
     'AB_bazardamier_description' => 'Exibe as folhas na forma de um amortecedor parametrável',
     'AB_bazardamier_hint' => 'A bf_debut, bf_fin, bf_lieu, bf_image, bf_lien, bf_fichier, bf_bouton são usados',
-    'AB_bazardamier_nbcol_label' => 'Número de colunas',
+    'AB_bazardamier_nbcol_label' => 'Um campo bf_image é necessário.',
     'AB_bazardamier_couleur_label' => 'Cor de damier',
     'AB_bazardamier_correpondance_hint' => 'Este modelo é altamente personalizável',
     'AB_bazartimeline_label' => 'Linha de tempo',
@@ -690,7 +690,7 @@
     'AB_bazarcarto_spider_hint' => 'Definir um grupo de pontos ao clicar',
     'AB_bazarcarto_barregestion_label' => 'Barra de gerenciamento de folhas',
     'AB_bazaragenda_label' => 'Agenda',
-    'AB_bazaragenda_nbcol_label' => 'Número de colunas',
+    'AB_bazaragenda_nbcol_label' => 'Um campo bf_image é necessário.',
     'AB_bazarliste_displayfields_title' => 'Seleção de campos para incluir',
     'AB_bazarliste_displayfields_title_label' => 'Área de título',
     'AB_bazarliste_displayfields_subtitle_label' => 'Área de subtítulo',

diff --git a/docs/actions/lang/actionsbuilder_ru.inc.php b/docs/actions/lang/actionsbuilder_ru.inc.php
@@ -195,7 +195,7 @@
     'AB_bazarblog_hint' => 'A bf_image field is possible',
     'AB_bazarblog_header_label' => 'Показать заголовок',
     'AB_bazarblog_show_author_label' => 'Отобразить автора, автора',
-    'AB_bazarblog_show_date_label' => 'Дата создания',
+    'AB_bazarblog_show_date_label' => 'только с геолокацией',
     'AB_bazarblog_date_creation_fiche_label' => 'Дата публикации',
     // bazargogocarto
     'AB_bazargogocarto_label' => 'Картография 2 - GoGocarto',
@@ -221,7 +221,7 @@
     'AB_attach_size_original' => 'Original size',
     'AB_attach_width_label' => 'Ширина',
     'AB_attach_height_label' => 'Высота',
-    'AB_attach_class_label' => 'Уровень',
+    'AB_attach_class_label' => 'Требуется поле bf_image',
     'AB_attach_class_displaylink_label' => 'Тип открытия соединения, случай за пределами',
     'AB_attach_class_displaylink_default' => 'в текущей вкладке',
     'AB_attach_class_displaylink_new-window' => 'в новой вкладке',
@@ -377,7 +377,7 @@
     'AB_buttons_action_button_link_hint' => 'Если веб-ссылка, не забывайте "https://www.p',
     'AB_buttons_action_button_title_label' => 'Текст опубликован на лету',
     'AB_buttons_action_button_icon_label' => 'Икона',
-    'AB_buttons_action_button_class_label' => 'Уровень',
+    'AB_buttons_action_button_class_label' => 'Требуется поле bf_image',
     'AB_buttons_action_button_color_label' => 'Цвет',
     'AB_buttons_action_button_color_default' => 'По умолчанию',
     'AB_buttons_action_button_color_primary' => 'Начальные',

diff --git a/includes/ComposerScriptsHelper.php b/includes/ComposerScriptsHelper.php
@@ -72,7 +72,7 @@ private static function extractPdfJsDistFileUrl(array $data): array
             foreach ($data['assets'] as $asset) {
                 if (!empty($asset['name']) && is_string($asset['name'])
                     && !empty($asset['browser_download_url']) && is_string($asset['browser_download_url'])
-                    && preg_match("/^pdfjs-(\d+)\.(\d+)\.(\d+)-dist\.zip$/i", $asset['name'], $match)) {
+                    && preg_match("/^pdfjs-(\d+)\.(\d+)\.(\d+)-legacy-dist\.zip$/i", $asset['name'], $match)) {
                     return [
                         'fileName' => $asset['name'],
                         'url' => $asset['browser_download_url'],
@@ -142,7 +142,7 @@ private static function updatePdfJsDist(array $params)
                                         echo "!! Zip not downloaded : $zipContent\n";
                                     }
                                 } else {
-                                    echo "erro while putting zip into $tmpFileName\n";
+                                    echo "erro while putting zip into $tmpFilename\n";
                                 }
                             } else {
                                 echo "Not possible to create a tempfile !\n";

diff --git a/includes/services/UserManager.php b/includes/services/UserManager.php
@@ -39,7 +39,6 @@ class UserManager implements UserProviderInterface, PasswordUpgraderInterface
 
     private $getOneByNameCacheResults;
 
-    private const PW_SALT = 'FBcA';
     public const KEY_VOCABULARY = 'http://outils-reseaux.org/_vocabulary/key';
 
     public function __construct(
@@ -212,17 +211,19 @@ public function create($wikiNameOrUser, string $email = '', string $plainPasswor
     protected function generateUserLink($user)
     {
         // Generate the password recovery key
-        $key = md5($user['name'] . '_' . $user['email'] . random_int(0, 10000) . date('Y-m-d H:i:s') . self::PW_SALT);
+        $passwordHasher = $this->passwordHasherFactory->getPasswordHasher($user);
+        $plainKey = $user['name'] . '_' . $user['email'] . random_bytes(16) . date('Y-m-d H:i:s');
+        $hashedKey = $passwordHasher->hash($plainKey);
         $tripleStore = $this->wiki->services->get(TripleStore::class);
         // Erase the previous triples in the trible table
         $tripleStore->delete($user['name'], self::KEY_VOCABULARY, null, '', '');
         // Store the (name, vocabulary, key) triple in triples table
-        $tripleStore->create($user['name'], self::KEY_VOCABULARY, $key, '', '');
+        $tripleStore->create($user['name'], self::KEY_VOCABULARY, $hashedKey, '', '');
 
         // Generate the recovery email
         $this->userlink = $this->wiki->Href('', 'MotDePassePerdu', [
             'a' => 'recover',
-            'email' => $key,
+            'email' => $hashedKey,
             'u' => base64_encode($user['name']),
         ], false);
     }
@@ -269,6 +270,9 @@ public function getUserLink(): string
      */
     public function getLastUserLink(User $user): string
     {
+        $passwordHasher = $this->passwordHasherFactory->getPasswordHasher($user);
+        $plainKey = $user['name'] . '_' . $user['email'] . random_bytes(16) . date('Y-m-d H:i:s');
+        $hashedKey = $passwordHasher->hash($plainKey);
         $tripleStore = $this->wiki->services->get(TripleStore::class);
         $key = $tripleStore->getOne($user['name'], self::KEY_VOCABULARY, '', '');
         if ($key != null) {

diff --git a/javascripts/vendor/extract-files-from-node-modules.sh b/javascripts/vendor/extract-files-from-node-modules.sh
@@ -134,4 +134,4 @@ cp -f node_modules/ace-builds/src-min-noconflict/ext-searchbox.js tools/aceditor
 mkdir -p javascripts/vendor/iframe-resizer && \
   cp -f node_modules/iframe-resizer/js/iframeResizer.min.js javascripts/vendor/iframe-resizer && \
   cp -f node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js javascripts/vendor/iframe-resizer && \
-  cp -f node_modules/iframe-resizer/LICENSE javascripts/vendor/iframe-resizer
+  cp -f node_modules/iframe-resizer/LICENSE javascripts/vendor/iframe-resizer