Changeset 3070758

Timestamp:

04/15/2024 12:36:01 PM (23 months ago)

Author:

onlyoffice

Message:

dev v2.0.0

Location:

onlyoffice/trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• admin/class-onlyoffice-plugin-admin.php (modified) (3 diffs)
• admin/css/onlyoffice-wordpress-admin.css (modified) (1 diff)
• admin/css/settings.css (added)
• admin/js/onlyoffice-admin-media.js (deleted)
• admin/js/settings.js (added)
• assets-onlyoffice (added)
• assets-onlyoffice/js (added)
• assets-onlyoffice/js/formatsUtils.js (added)
• composer.json (deleted)
• controllers/class-onlyoffice-plugin-frontend-controller.php (modified) (6 diffs)
• controllers/css (added)
• controllers/css/frontend-controller.css (added)
• controllers/images (added)
• controllers/images/error.svg (added)
• controllers/images/onlyoffice.svg (added)
• controllers/js (added)
• controllers/js/frontend-controller.js (added)
• editor.php (added)
• includes/class-onlyoffice-plugin-activator.php (modified) (2 diffs)
• includes/class-onlyoffice-plugin-deactivator.php (modified) (1 diff)
• includes/class-onlyoffice-plugin-i18n.php (modified) (1 diff)
• includes/class-onlyoffice-plugin-loader.php (modified) (1 diff)
• includes/class-onlyoffice-plugin.php (modified) (6 diffs)
• includes/files/class-onlyoffice-plugin-files-list-table.php (modified) (10 diffs)
• includes/files/class-onlyoffice-plugin-files.php (modified) (3 diffs)
• includes/files/js (added)
• includes/files/js/onlyoffice-files-list-table.js (added)
• includes/managers/class-onlyoffice-plugin-callback-manager.php (modified) (1 diff)
• includes/managers/class-onlyoffice-plugin-config-manager.php (modified) (4 diffs)
• includes/managers/class-onlyoffice-plugin-document-manager.php (modified) (9 diffs)
• includes/managers/class-onlyoffice-plugin-jwt-manager.php (modified) (2 diffs)
• includes/managers/class-onlyoffice-plugin-url-manager.php (modified) (5 diffs)
• includes/settings/class-onlyoffice-plugin-settings.php (modified) (10 diffs)
• languages/onlyoffice-plugin-de_DE-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-de_DE-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-de_DE-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-de_DE.mo (modified) (previous)
• languages/onlyoffice-plugin-de_DE.po (modified) (4 diffs)
• languages/onlyoffice-plugin-en-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-en-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-en-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-en.mo (modified) (previous)
• languages/onlyoffice-plugin-en.po (modified) (4 diffs)
• languages/onlyoffice-plugin-es_ES-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-es_ES-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-es_ES-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-es_ES.mo (modified) (previous)
• languages/onlyoffice-plugin-es_ES.po (modified) (4 diffs)
• languages/onlyoffice-plugin-fr_FR-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-fr_FR-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-fr_FR-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-fr_FR.mo (modified) (previous)
• languages/onlyoffice-plugin-fr_FR.po (modified) (4 diffs)
• languages/onlyoffice-plugin-it_IT-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-it_IT-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-it_IT-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-it_IT.mo (modified) (previous)
• languages/onlyoffice-plugin-it_IT.po (modified) (4 diffs)
• languages/onlyoffice-plugin-ja-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-ja-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-ja-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-ja.mo (modified) (previous)
• languages/onlyoffice-plugin-ja.po (modified) (4 diffs)
• languages/onlyoffice-plugin-ru_RU-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-ru_RU-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-ru_RU-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-ru_RU.mo (modified) (previous)
• languages/onlyoffice-plugin-ru_RU.po (modified) (4 diffs)
• languages/onlyoffice-plugin-zh_CN-18579bef1e63739970bd79e6dcc6ee92.json (added)
• languages/onlyoffice-plugin-zh_CN-4d9e7e5bfeb560d3581c5fa0f4136bc5.json (added)
• languages/onlyoffice-plugin-zh_CN-c6d39b7cfad17364ba238197448a913b.json (added)
• languages/onlyoffice-plugin-zh_CN.mo (modified) (previous)
• languages/onlyoffice-plugin-zh_CN.po (modified) (4 diffs)
• languages/onlyoffice-plugin.pot (modified) (4 diffs)
• licenses/3rd-Party.license (modified) (1 diff)
• onlyoffice-tinymce/onlyoffice-tinymce.js (modified) (1 diff)
• onlyoffice-tinymce/onlyoffice-tinymce.php (modified) (1 diff)
• onlyoffice-wordpress-block/block.json (modified) (2 diffs)
• onlyoffice-wordpress-block/build/index.asset.php (modified) (1 diff)
• onlyoffice-wordpress-block/build/index.css (added)
• onlyoffice-wordpress-block/build/index.js (modified) (1 diff)
• onlyoffice-wordpress-block/package-lock.json (deleted)
• onlyoffice-wordpress-block/package.json (deleted)
• onlyoffice-wordpress-block/src/edit.js (modified) (7 diffs)
• onlyoffice-wordpress-block/src/index.js (modified) (3 diffs)
• onlyoffice-wordpress-block/src/logos.js (added)
• onlyoffice-wordpress-block/src/save.js (modified) (2 diffs)
• onlyoffice-wordpress-block/src/styles.css (added)
• onlyoffice-wordpress.php (modified) (7 diffs)
• public/assets/document-formats/CHANGELOG.md (modified) (1 diff)
• public/assets/document-formats/onlyoffice-docs-formats.json (modified) (5 diffs)
• public/class-onlyoffice-plugin-public.php (modified) (3 diffs)
• public/images/blank.svg (added)
• public/views/class-onlyoffice-plugin-callback.php (modified) (3 diffs)
• public/views/class-onlyoffice-plugin-download.php (modified) (3 diffs)
• public/views/class-onlyoffice-plugin-editor.php (deleted)
• readme.txt (modified) (4 diffs)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/autoload_real.php (modified) (2 diffs)
• vendor/composer/autoload_static.php (modified) (2 diffs)
• vendor/composer/installed.json (modified) (3 diffs)
• vendor/composer/installed.php (modified) (3 diffs)
• vendor/firebase/php-jwt/CHANGELOG.md (modified) (1 diff)
• vendor/firebase/php-jwt/src/JWT.php (modified) (1 diff)

onlyoffice/trunk/CHANGELOG.md

@@ -1 +1 @@
 # Change Log
+
+## 2.0.0
+## Added
+- multisite support
+- stub for onlyoffice-wordpress-block that displays error information if the document server is not accessible or the file is not found 
+- settings for onlyoffice block (width, height, align, show open in onlyoffice button)
+- button copy link to editor, in the table with files
+- ability to insert a link to the editor on the page
+- access for an anonymous user, open the document for viewing in the editor if the document is attached to a public post
+- filling pdf
+
+## Changed
+- editor url
+- displaying the onlyoffice-wordpress-block component in the Gutenberg editor
+- remove filling for oform
+- supported formats updated
 
 ## 1.1.0

onlyoffice/trunk/admin/class-onlyoffice-plugin-admin.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -42 +42 @@
 
     /**
-     * The ID of this plugin.
-     *
-     * @since    1.0.0
-     * @access   private
-     * @var      string    $plugin_name    The ID of this plugin.
-     */
-    private $plugin_name;
-
-    /**
-     * The version of this plugin.
-     *
-     * @since    1.0.0
-     * @access   private
-     * @var      string    $version    The current version of this plugin.
-     */
-    private $version;
-
-    /**
-     * Initialize the class and set its properties.
-     *
-     * @since    1.0.0
-     * @param      string $plugin_name       The name of this plugin.
-     * @param      string $version    The version of this plugin.
-     */
-    public function __construct( $plugin_name, $version ) {
-        $this->plugin_name = $plugin_name;
-        $this->version     = $version;
-    }
-
-    /**
      * Register the stylesheets for the admin area.
      *
@@ -86 +56 @@
     public function enqueue_scripts() {
         wp_enqueue_script(
-            $this->plugin_name . '-media-script',
-            plugin_dir_url( __FILE__ ) . 'js/onlyoffice-admin-media.js',
-            array( 'jquery' ),
-            $this->version,
+            ONLYOFFICE_PLUGIN_NAME . '-formats-utils',
+            ONLYOFFICE_PLUGIN_URL . 'assets-onlyoffice/js/formatsUtils.js',
+            array(),
+            ONLYOFFICE_PLUGIN_VERSION,
             true
         );
 
         wp_localize_script(
-            $this->plugin_name . '-media-script',
-            'oo_media',
+            ONLYOFFICE_PLUGIN_NAME . '-formats-utils',
+            'ONLYOFFICE',
             array(
-                'formats'   => Onlyoffice_Plugin_Document_Manager::get_viewable_extensions(),
+                'formats'   => Onlyoffice_Plugin_Document_Manager::get_onlyoffice_formats(),
                 'mimeTypes' => get_allowed_mime_types(),
             )

onlyoffice/trunk/admin/css/onlyoffice-wordpress-admin.css

@@ -4 +4 @@
 
 .wp-list-table .column-format {
-    width: 15%;
+    width: 18%;
 }
 
 .wp-list-table .column-date {
-    width: 15%;
+    width: 18%;
 }
 
 .wp-list-table .column-size {
-    width: 15%;
+    width: 12%;
 }
+
+.wp-list-table .column-link {
+    width: 12%;
+}
+
+.onlyoffice-editor-link.button-link.has-icon:hover {
+    svg {
+        fill: #0096dd;
+    }
+}
+
+.onlyoffice_files .copy-to-clipboard-container .success {
+    position: absolute;
+    transform: translate(-36%, -115%);
+    background: #000;
+    color: #fff;
+    border-radius: 5px;
+    margin: 0;
+    padding: 2px 5px;
+}

onlyoffice/trunk/controllers/class-onlyoffice-plugin-frontend-controller.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -52 +52 @@
             __DIR__ . '/../onlyoffice-wordpress-block',
             array(
-                'description'     => __( 'Add ONLYOFFICE editor on page', 'onlyoffice-plugin' ),
+                'description'     => __( 'Add ONLYOFFICE Docs editor on page', 'onlyoffice-plugin' ),
                 'render_callback' => array( $this, 'onlyoffice_block_render_callback' ),
             ),
@@ -58 +58 @@
 
         if ( function_exists( 'wp_set_script_translations' ) ) {
-            wp_set_script_translations( 'onlyoffice-plugin', 'onlyoffice-plugin' );
+            wp_set_script_translations(
+                'onlyoffice-wordpress-onlyoffice-editor-script',
+                'onlyoffice-plugin',
+                plugin_dir_path( ONLYOFFICE_PLUGIN_FILE ) . 'languages/'
+            );
         }
     }
@@ -87 +91 @@
 
         $defaults_atts = array(
-            'id'       => '',
-            'fileName' => '',
+            'id'             => '',
+            'fileName'       => '',
+            'documentView'   => 'embedded',
+            'inNewTab'       => true,
+            'align'          => '',
+            'width'          => '100%',
+            'height'         => '500px',
+            'showOpenButton' => 'true',
+            'openButtonText' => __( 'Open in ONLYOFFICE', 'onlyoffice-plugin' ),
         );
 
         $atts = shortcode_atts( $defaults_atts, $attr, 'onlyoffice' );
 
+        if ( empty( $atts['width'] ) ) {
+            $atts['width'] = $defaults_atts['width'];
+        }
+
+        if ( empty( $atts['height'] ) ) {
+            $atts['height'] = $defaults_atts['height'];
+        }
+
+        wp_enqueue_style(
+            'wp-block-onlyoffice-wordpress-styles',
+            ONLYOFFICE_PLUGIN_URL . 'onlyoffice-wordpress-block/src/styles.css',
+            array(),
+            ONLYOFFICE_PLUGIN_VERSION
+        );
+
+        if ( 'link' === $atts['documentView'] ) {
+            return $this->render_link( $atts, $instance );
+        }
+
+        return $this->render_embedded( $atts, $instance );
+    }
+
+    /**
+     * ONLYOFFICE Embedded Template.
+     *
+     * @param array $atts List of attributes that where included in the Shortcode.
+     * @param int   $instance Element number on page.
+     * @return string Link Template.
+     */
+    private function render_embedded( $atts, $instance ) {
         add_action(
             'wp_enqueue_scripts',
@@ -98 +139 @@
                 $api_js_url = Onlyoffice_Plugin_Url_Manager::get_api_js_url();
                 wp_enqueue_script( 'onlyoffice_editor_api', $api_js_url, array(), ONLYOFFICE_PLUGIN_VERSION, false );
+                wp_enqueue_script(
+                    'wp-block-onlyoffice-wordpress-js',
+                    ONLYOFFICE_PLUGIN_URL . 'controllers/js/frontend-controller.js',
+                    array( 'wp-util', 'wp-i18n' ),
+                    ONLYOFFICE_PLUGIN_VERSION,
+                    false
+                );
+                wp_enqueue_style(
+                    'wp-block-onlyoffice-wordpress-css',
+                    ONLYOFFICE_PLUGIN_URL . 'controllers/css/frontend-controller.css',
+                    array(),
+                    ONLYOFFICE_PLUGIN_VERSION
+                );
+
+                if ( function_exists( 'wp_set_script_translations' ) ) {
+                    wp_set_script_translations(
+                        'wp-block-onlyoffice-wordpress-js',
+                        'onlyoffice-plugin',
+                        plugin_dir_path( ONLYOFFICE_PLUGIN_FILE ) . 'languages/'
+                    );
+                }
             }
         );
@@ -118 +180 @@
         $config = Onlyoffice_Plugin_Config_Manager::get_config( $attachment_id, $type, $mode, $perm_edit, $callback, null, true );
 
-        $output  = '<div style="height: 650px; maxWidth: inherit, padding: 20px">';
-        $output .= '<div id="editorOnlyoffice-' . $instance . '"></div>';
-        $output .= '<script type="text/javascript">new DocsAPI.DocEditor("editorOnlyoffice-' . $instance . '", ' . wp_json_encode( $config ) . '); </script>';
+        $align = ! empty( $atts['align'] ) ? 'align' . $atts['align'] : '';
+        $size  = ! empty( $atts['width'] ) && ! ( 'full' === $atts['align'] ) ? 'width: ' . $atts['width'] . ';' : '';
+        $size .= ! empty( $atts['height'] ) ? 'height: ' . $atts['height'] . ';' : '';
+
+        $output  = '<div class="wp-block-onlyoffice-wordpress-onlyoffice ' . $align . ' size-full" style="' . $size . '">';
+        $output .= '<div id="editorOnlyoffice-' . $instance . '" data-config="' . htmlspecialchars( wp_json_encode( $config ), ENT_QUOTES, 'UTF-8' ) . '" data-instance="' . $instance . '" class="wp-block-onlyoffice-wordpress-onlyoffice__target" ></div>';
         $output .= '</div>';
 
         return apply_filters( 'wp_onlyoffice_shortcode', $output, $atts );
     }
+
+    /**
+     * ONLYOFFICE Link Template.
+     *
+     * @param array $atts List of attributes that where included in the Shortcode.
+     * @param int   $instance Element number on page.
+     * @return string Link Template.
+     */
+    private function render_link( $atts, $instance ) {
+        $target = true === $atts['inNewTab'] ? 'target="_blank"' : '';
+        $align  = ! empty( $atts['align'] ) ? 'align' . $atts['align'] : '';
+
+        $output  = '<div class="wp-block-onlyoffice-wordpress-onlyoffice ' . $align . '">';
+        $output .= '<a id="linkToOnlyofficeEditor-' . $instance . '" href="' . Onlyoffice_Plugin_Url_Manager::get_editor_url( $atts['id'] ) . '" ' . $target . '>' . $atts['fileName'] . '</a>';
+
+        if ( $atts['showOpenButton'] ) {
+            $output .= '<a href="' . Onlyoffice_Plugin_Url_Manager::get_editor_url( $atts['id'] ) . '" ' . $target . ' class="wp-block-onlyoffice-wordpress__button wp-element-button">' . $atts['openButtonText'] . '</a>';
+        }
+
+        $output .= '</div>';
+
+        return apply_filters( 'wp_onlyoffice_shortcode', $output, $atts );
+    }
+
+    /**
+     *  ONLYOFFICE error template.
+     *
+     * @return void
+     */
+    public function onlyoffice_error_template() {
+        ?>
+        <script type="text/html" id="tmpl-onlyoffice-error">
+            <div class="onlyoffice-error" >
+                <div class="onlyoffice-error-body">
+                    <div class="onlyoffice-error-table js">
+                        <div>
+                            <img src="<?php echo esc_url( ONLYOFFICE_PLUGIN_URL . 'controllers/images/onlyoffice.svg' ); ?>" style="width: 50%" />
+                        </div>
+                        <div style="padding: 16px;">
+                            <img src="<?php echo esc_url( ONLYOFFICE_PLUGIN_URL . 'controllers/images/error.svg' ); ?>" style="width: 100%"/>
+                        </div>
+                        <div>{{{data.email}}}</div>
+                    </div>
+                </div>
+            </div>
+        </script>
+        <?php
+    }
 }

onlyoffice/trunk/includes/class-onlyoffice-plugin-activator.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -46 +46 @@
      */
     public static function activate() {
-        if ( empty( get_option( 'onlyoffice-plugin-uuid' ) ) ) {
-            add_option( 'onlyoffice-plugin-uuid', wp_generate_uuid4() );
+        if ( empty( get_site_option( 'onlyoffice-plugin-uuid' ) ) ) {
+            update_site_option( 'onlyoffice-plugin-uuid', wp_generate_uuid4() );
         }
-        if ( empty( get_option( 'onlyoffice-plugin-bytes' ) ) ) {
+        if ( empty( get_site_option( 'onlyoffice-plugin-bytes' ) ) ) {
             $ivlen = openssl_cipher_iv_length( 'aes-256-ctr' );
             $iv    = openssl_random_pseudo_bytes( $ivlen );
-            add_option( 'onlyoffice-plugin-bytes', bin2hex( $iv ) );
+            update_site_option( 'onlyoffice-plugin-bytes', bin2hex( $iv ) );
         }
 
-        if ( empty( get_option( 'onlyoffice-formats' ) ) ) {
-            $formats = array();
-
-            $path_to_formats_json = plugin_dir_path( __DIR__ ) . '/public/assets/document-formats/onlyoffice-docs-formats.json';
-
-            if ( file_exists( $path_to_formats_json ) === true ) {
-                $formats = json_decode( file_get_contents( $path_to_formats_json ), true );
-                add_option( 'onlyoffice-formats', $formats );
-            }
-        }
+        Onlyoffice_Plugin_Document_Manager::init();
     }
 }

onlyoffice/trunk/includes/class-onlyoffice-plugin-deactivator.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or

onlyoffice/trunk/includes/class-onlyoffice-plugin-i18n.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or

onlyoffice/trunk/includes/class-onlyoffice-plugin-loader.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or

onlyoffice/trunk/includes/class-onlyoffice-plugin.php

@@ -15 +15 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -86 +86 @@
     public function __construct() {
         $this->version     = ONLYOFFICE_PLUGIN_VERSION;
-        $this->plugin_name = 'onlyoffice-plugin';
+        $this->plugin_name = ONLYOFFICE_PLUGIN_NAME;
 
         $this->load_dependencies();
@@ -151 +151 @@
      */
     private function define_admin_hooks() {
-        $plugin_admin = new Onlyoffice_Plugin_Admin( $this->get_plugin_name(), $this->get_version() );
+        $plugin_admin = new Onlyoffice_Plugin_Admin();
 
         $this->loader->add_action( 'admin_enqueue_scripts', $plugin_admin, 'enqueue_styles' );
@@ -165 +165 @@
      */
     private function define_public_hooks() {
-        $plugin_public = new Onlyoffice_Plugin_Public( $this->get_plugin_name(), $this->get_version() );
+        $plugin_public = new Onlyoffice_Plugin_Public();
 
         $this->loader->add_action( 'wp_enqueue_scripts', $plugin_public, 'enqueue_styles' );
@@ -185 +185 @@
         $plugin_settings = new Onlyoffice_Plugin_Settings();
         $this->loader->add_action( 'admin_menu', $plugin_settings, 'init_menu' );
+        $this->loader->add_action( 'network_admin_menu', $plugin_settings, 'init_menu' );
         $this->loader->add_action( 'admin_init', $plugin_settings, 'init' );
 
@@ -190 +191 @@
         $this->loader->add_action( 'init', $plugin_frontend_controller, 'init_shortcodes' );
         $this->loader->add_action( 'init', $plugin_frontend_controller, 'onlyoffice_custom_block' );
+        $this->loader->add_action( 'wp_footer', $plugin_frontend_controller, 'onlyoffice_error_template', 30 );
     }
 

onlyoffice/trunk/includes/files/class-onlyoffice-plugin-files-list-table.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -62 +62 @@
         add_action(
             'admin_enqueue_scripts',
-            function ( $hook ) {
+            function () {
+                wp_enqueue_script(
+                    ONLYOFFICE_PLUGIN_NAME . '-media-script',
+                    plugin_dir_url( __FILE__ ) . 'js/onlyoffice-files-list-table.js',
+                    array( 'jquery', 'clipboard', 'wp-a11y' ),
+                    ONLYOFFICE_PLUGIN_FILE,
+                    true
+                );
+
                 wp_enqueue_style( 'onlyoffice_files_table', ONLYOFFICE_PLUGIN_URL . 'admin/css/onlyoffice-wordpress-admin.css', array(), ONLYOFFICE_PLUGIN_VERSION );
             }
@@ -81 +89 @@
      */
     public function no_items() {
-        esc_html_e( 'No files found for editing or viewing in ONLYOFFICE.', 'onlyoffice-plugin' );
+        esc_html_e( 'No files found for editing or viewing in ONLYOFFICE Docs editor.', 'onlyoffice-plugin' );
     }
     /**
@@ -97 +105 @@
             case 'date':
             case 'size':
+            case 'link':
                 return $item[ $column_name ];
             default:
@@ -116 +125 @@
             'date'   => array( 'date', false ),
             'size'   => array( 'size', false ),
+            'link'   => array( 'link', false ),
         );
     }
@@ -132 +142 @@
             'date'   => __( 'Date' ),
             'size'   => __( 'Size' ),
+            'link'   => __( 'Link' ),
         );
         return $columns;
@@ -190 +201 @@
                 continue;
             }
-            if ( Onlyoffice_Plugin_Document_Manager::is_editable( $filename ) || Onlyoffice_Plugin_Document_Manager::is_viewable( $filename ) ) {
+            if ( ( Onlyoffice_Plugin_Document_Manager::is_editable( $filename )
+                        || Onlyoffice_Plugin_Document_Manager::is_viewable( $filename ) )
+                    && Onlyoffice_Plugin_Document_Manager::can_user_view_attachment( $attachment->ID ) ) {
                 array_push(
                     $attachments,
@@ -197 +210 @@
                         'title'  => pathinfo( $attached_file, PATHINFO_FILENAME ),
                         'format' => strtoupper( pathinfo( $attached_file, PATHINFO_EXTENSION ) ),
+                        'date'   => $attachment->post_modified,
                         'size'   => size_format( filesize( $attached_file ) ),
+                        'link'   => Onlyoffice_Plugin_Url_Manager::get_editor_url( $attachment->ID ),
                     )
                 );
@@ -244 +259 @@
         $title    = wp_basename( $attached );
 
-        $wp_nonce   = wp_create_nonce( 'wp_rest' );
-        $editor_url = add_query_arg( '_wpnonce', $wp_nonce, Onlyoffice_Plugin_Url_Manager::get_editor_url( $item['id'] ) );
+        $editor_url = Onlyoffice_Plugin_Url_Manager::get_editor_url( $item['id'] );
 
         ?>
@@ -280 +294 @@
 
     /**
+     * Handles the post link column output.
+     *
+     * @since 1.0.0
+     * @param array $item The item.
+     */
+    public function column_link( $item ) {
+        $file = get_post( $item['id'] );
+        ?>
+        <span class="copy-to-clipboard-container">
+            <button type="button" data-clipboard-text="<?php echo esc_url( Onlyoffice_Plugin_Url_Manager::get_editor_url( $item['id'] ) ); ?>" class="onlyoffice-editor-link button-link has-icon" title="<?php esc_attr_e( 'Copy URL' ); ?>" aria-label="<?php esc_attr_e( 'Link' ); ?>">
+                <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M15.6 7.2H14v1.5h1.6c2 0 3.7 1.7 3.7 3.7s-1.7 3.7-3.7 3.7H14v1.5h1.6c2.8 0 5.2-2.3 5.2-5.2 0-2.9-2.3-5.2-5.2-5.2zM4.7 12.4c0-2 1.7-3.7 3.7-3.7H10V7.2H8.4c-2.9 0-5.2 2.3-5.2 5.2 0 2.9 2.3 5.2 5.2 5.2H10v-1.5H8.4c-2 0-3.7-1.7-3.7-3.7zm4.6.9h5.3v-1.5H9.3v1.5z"></path></svg>
+            </button>
+            <span class="success hidden" aria-hidden="true"><?php esc_html_e( 'Copied!' ); ?>
+        </span>
+        <?php
+    }
+
+    /**
      * Displays the search box.
      *

onlyoffice/trunk/includes/files/class-onlyoffice-plugin-files.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -51 +51 @@
         if ( $can_upload_files ) {
             add_menu_page(
-                __( 'ONLYOFFICE', 'onlyoffice-plugin' ),
-                'ONLYOFFICE',
+                __( 'ONLYOFFICE Docs', 'onlyoffice-plugin' ),
+                'ONLYOFFICE Docs',
                 'upload_files',
                 'onlyoffice-files',
                 array( $this, 'files_page' ),
-                'data:image/svg+xml;base64,' . base64_encode( $logo_svg )
+                'data:image/svg+xml;base64,' . base64_encode( $logo_svg ) // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
             );
 
             $hook = add_submenu_page(
                 'onlyoffice-files',
-                'ONLYOFFICE',
+                'ONLYOFFICE Docs',
                 __( 'Files', 'onlyoffice-plugin' ),
                 'upload_files',
@@ -103 +103 @@
         <div class="wrap">
             <h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
-            <p><?php esc_html_e( 'Files that can be edited and opened in ONLYOFFICE will be displayed here', 'onlyoffice-plugin' ); ?></p>
+            <p><?php esc_html_e( 'Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here.', 'onlyoffice-plugin' ); ?></p>
             <form method="get">
                 <?php $onlyoffice_plugin_files_list_table->search_box( __( 'Search' ), 'onlyoffice_file' ); ?>

onlyoffice/trunk/includes/managers/class-onlyoffice-plugin-callback-manager.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or

onlyoffice/trunk/includes/managers/class-onlyoffice-plugin-config-manager.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -51 +51 @@
      */
     public static function get_config( $attachment_id, $type, $mode, $perm_edit, $callback_url, $go_back_url, $unic_key ) {
-        $post     = get_post( $attachment_id );
-        $user     = wp_get_current_user();
-        $author   = get_user_by( 'id', $post->post_author )->display_name;
-        $filepath = get_attached_file( $attachment_id );
-        $filename = wp_basename( $filepath );
-        $filetype = strtolower( pathinfo( $filepath, PATHINFO_EXTENSION ) );
-        $file_url = Onlyoffice_Plugin_Url_Manager::get_download_url( $attachment_id );
-        $lang     = get_user_locale( $user->ID );
+        $post = get_post( $attachment_id );
+
+        if ( ! $post ) {
+            return null;
+        }
+
+        $user      = wp_get_current_user();
+        $author    = get_user_by( 'id', $post->post_author )->display_name;
+        $filepath  = get_attached_file( $attachment_id );
+        $filename  = wp_basename( $filepath );
+        $filetype  = strtolower( pathinfo( $filepath, PATHINFO_EXTENSION ) );
+        $file_url  = Onlyoffice_Plugin_Url_Manager::get_download_url( $attachment_id );
+        $lang      = get_user_locale( $user->ID );
+        $perm_fill = false;
+
+        if ( Onlyoffice_Plugin_Document_Manager::is_fillable( $filename ) ) {
+            $perm_fill = true;
+            $perm_edit = false;
+        }
 
         $config = array(
@@ -67 +78 @@
                 'url'         => $file_url,
                 'fileType'    => $filetype,
-                'key'         => base64_encode( $post->post_modified ) . $attachment_id,
+                'key'         => base64_encode( $post->post_modified ) . $attachment_id, // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
                 'info'        => array(
                     'owner'    => $author,
@@ -73 +84 @@
                 ),
                 'permissions' => array(
-                    'download' => true,
-                    'edit'     => $perm_edit,
+                    'download'  => true,
+                    'edit'      => $perm_edit,
+                    'fillForms' => $perm_fill,
                 ),
             ),

onlyoffice/trunk/includes/managers/class-onlyoffice-plugin-document-manager.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -51 +51 @@
 
     /**
+     * Init Onlyoffice_Plugin_Document_Manager.
+     */
+    public static function init() {
+        $path_to_formats_json = plugin_dir_path( ONLYOFFICE_PLUGIN_FILE ) . '/public/assets/document-formats/onlyoffice-docs-formats.json';
+
+        if ( file_exists( $path_to_formats_json ) === true ) {
+            $formats = wp_json_file_decode( $path_to_formats_json );
+            update_site_option( 'onlyoffice-formats', $formats );
+            update_site_option( 'onlyoffice-formats-version', ONLYOFFICE_PLUGIN_VERSION );
+        }
+    }
+
+    /**
      * Returns the type of the document (word, cell, slide).
      *
@@ -62 +75 @@
 
         foreach ( $formats as $format ) {
-            if ( $format['name'] === $ext ) {
-                return $format['type'];
+            if ( $format->name === $ext ) {
+                return $format->type;
             }
         }
@@ -82 +95 @@
 
         foreach ( $formats as $format ) {
-            if ( $format['name'] === $ext ) {
-                return in_array( 'edit', $format['actions'], true );
+            if ( $format->name === $ext ) {
+                return in_array( 'edit', $format->actions, true );
             }
         }
@@ -102 +115 @@
 
         foreach ( $formats as $format ) {
-            if ( $format['name'] === $ext ) {
-                return in_array( 'fill', $format['actions'], true );
+            if ( $format->name === $ext ) {
+                return in_array( 'fill', $format->actions, true );
             }
         }
@@ -122 +135 @@
 
         foreach ( $formats as $format ) {
-            if ( $format['name'] === $ext ) {
-                return in_array( 'view', $format['actions'], true );
+            if ( $format->name === $ext ) {
+                return in_array( 'view', $format->actions, true );
             }
         }
@@ -138 +151 @@
 
         foreach ( $formats as $format ) {
-            if ( in_array( 'view', $format['actions'], true ) ) {
-                array_push( $extensions, $format['name'] );
+            if ( in_array( 'view', $format->actions, true ) ) {
+                array_push( $extensions, $format->name );
             }
         }
@@ -147 +160 @@
 
     /**
+     * Returns true if user can view attachment.
+     *
+     * @param string $attachment_id The attachment id.
+     * @return bool
+     */
+    public static function can_user_view_attachment( $attachment_id ) {
+        $attachment = get_post( $attachment_id );
+
+        if ( ! $attachment || 'attachment' !== $attachment->post_type ) {
+            return false;
+        }
+
+        return current_user_can( 'read_post', $attachment_id );
+    }
+
+    /**
+     * Returns true if anonymous user can view attachment.
+     *
+     * @param string $attachment_id The attachment id.
+     * @return bool
+     */
+    public static function can_anonymous_user_view_attachment( $attachment_id ) {
+        $attachment = get_post( $attachment_id );
+
+        if ( ! $attachment || 'attachment' !== $attachment->post_type ) {
+            return false;
+        }
+
+        $is_public = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+
+        if ( ! $is_public ) {
+            return false;
+        }
+
+        $parent_post_id = $attachment->post_parent;
+        $parent_post    = get_post( $parent_post_id );
+
+        if ( ! $parent_post ) {
+            return false;
+        }
+
+        if ( 'publish' !== $parent_post->post_status ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
      * Returns true if user can edit attachment.
      *
-     * @param string $attachment_id The request.
-     * @return bool
-     */
-    public static function has_edit_capability( $attachment_id ) {
-        $has_edit_cap = false;
-        foreach ( self::EDIT_CAPS as $capability ) {
-            $has_edit_cap = $has_edit_cap || current_user_can( $capability, $attachment_id );
-        }
-        return $has_edit_cap;
+     * @param string $attachment_id The attachment id.
+     * @return bool
+     */
+    public static function can_user_edit_attachment( $attachment_id ) {
+        $attachment = get_post( $attachment_id );
+
+        if ( ! $attachment ) {
+            return false;
+        }
+
+        return current_user_can( 'edit_post', $attachment_id );
     }
 
@@ -177 +241 @@
 
     /**
-     * Return option onlyoffice-formats.
+     * Return supported ONLYOFFICE formats.
      */
     public static function get_onlyoffice_formats() {
-        $formats = get_option( 'onlyoffice-formats' );
+        $onlyoffice_formats_version = get_site_option( 'onlyoffice-formats-version' );
+        if ( empty( $onlyoffice_formats_version ) || ONLYOFFICE_PLUGIN_VERSION !== $onlyoffice_formats_version ) {
+            self::init();
+        }
+
+        $formats = get_site_option( 'onlyoffice-formats' );
         if ( ! empty( $formats ) ) {
             return $formats;

onlyoffice/trunk/includes/managers/class-onlyoffice-plugin-jwt-manager.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -80 +80 @@
      */
     public static function jwt_decode( $token, $secret ) {
-        return JWT::decode( $token, new Key( $secret, 'HS256' ) );
+        $jwt_reflection_class = new ReflectionClass( '\Firebase\JWT\JWT' );
+        $methods              = $jwt_reflection_class->getMethods();
+
+        $filtered_methods = array_filter(
+            $methods,
+            function ( $method ) {
+                return strpos( $method->getName(), 'getKey' ) === 0;
+            }
+        );
+
+        if ( empty( $filtered_methods ) ) {
+            $allowed_algs = array( 'HS256' );
+            return JWT::decode( $token, $secret, $allowed_algs );
+        } else {
+            return JWT::decode( $token, new Key( $secret, 'HS256' ) );
+        }
     }
 }

onlyoffice/trunk/includes/managers/class-onlyoffice-plugin-url-manager.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -40 +40 @@
     private const PATH_CALLBACK_PUBLIC_FORMS = '/onlyoffice/oo.callback-public-forms/';
     private const PATH_DOWNLOAD              = '/onlyoffice/oo.getfile/';
-    private const PATH_EDITOR                = '/onlyoffice/oo.editor/';
     private const PATH_API_JS                = 'web-apps/apps/api/documents/api.js';
 
@@ -108 +107 @@
      */
     public static function get_editor_url( $attachment_id ) {
-        $hidden_id = self::encode_openssl_data( $attachment_id );
-
-        return get_rest_url( null, self::PATH_EDITOR . $hidden_id );
+        return ONLYOFFICE_PLUGIN_URL . 'editor.php?attachment_id=' . $attachment_id;
     }
 
@@ -121 +118 @@
      */
     private static function encode_openssl_data( $data ) {
-        $passphrase = get_option( 'onlyoffice-plugin-uuid' );
-        $iv         = hex2bin( get_option( 'onlyoffice-plugin-bytes' ) );
+        $passphrase = get_site_option( 'onlyoffice-plugin-uuid' );
+        $iv         = hex2bin( get_site_option( 'onlyoffice-plugin-bytes' ) );
 
         $encrypt = openssl_encrypt( $data, 'aes-256-ctr', $passphrase, $options = 0, $iv );
@@ -136 +133 @@
      */
     public static function decode_openssl_data( $data ) {
-        $passphrase = get_option( 'onlyoffice-plugin-uuid' );
-        $iv         = hex2bin( get_option( 'onlyoffice-plugin-bytes' ) );
+        $passphrase = get_site_option( 'onlyoffice-plugin-uuid' );
+        $iv         = hex2bin( get_site_option( 'onlyoffice-plugin-bytes' ) );
 
         $data = urldecode( str_replace( ',', '%', $data ) );

onlyoffice/trunk/includes/settings/class-onlyoffice-plugin-settings.php

@@ -15 +15 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -56 +56 @@
 
     /**
+     * ID setting allowed_owerwrite_network_settings.
+     */
+    const ALLOWED_OWERWRITE_NETWORK_SETTINGS = 'onlyoffice_settings_allowed_owerwrite_network_settings';
+
+    /**
+     * ID setting inherit_network_settings.
+     */
+    const INHERIT_NETWORK_SETTINGS = 'onlyoffice_settings_inherit_network_settings';
+
+    /**
      * Init menu.
      *
@@ -64 +74 @@
         $can_manage_settings = current_user_can( 'manage_options' );
         $can_upload_files    = current_user_can( 'upload_files' );
-
-        if ( $can_manage_settings && ! $can_upload_files ) {
-            add_menu_page(
-                __( 'ONLYOFFICE', 'onlyoffice-plugin' ),
-                'ONLYOFFICE',
-                'manage_options',
+        $can_manage_network  = current_user_can( 'manage_network' );
+
+        if ( $can_manage_settings ) {
+            if ( $can_upload_files ) {
+                $hook = add_submenu_page(
+                    'onlyoffice-files',
+                    __( 'ONLYOFFICE Docs Settings', 'onlyoffice-plugin' ),
+                    __( 'Settings', 'onlyoffice-plugin' ),
+                    'manage_options',
+                    'onlyoffice-settings',
+                    array( $this, 'options_page' )
+                );
+            } else {
+                $hook = add_menu_page(
+                    __( 'ONLYOFFICE Docs Settings', 'onlyoffice-plugin' ),
+                    'ONLYOFFICE Docs',
+                    'manage_options',
+                    'onlyoffice-settings',
+                    array( $this, 'options_page' ),
+                    'data:image/svg+xml;base64,' . base64_encode( $logo_svg ) // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
+                );
+            }
+        }
+
+        if ( $can_manage_network && is_network_admin() ) {
+            $hook = add_menu_page(
+                __( 'ONLYOFFICE Docs Settings', 'onlyoffice-plugin' ),
+                'ONLYOFFICE Docs',
+                'manage_network',
                 'onlyoffice-settings',
                 array( $this, 'options_page' ),
-                'data:image/svg+xml;base64,' . base64_encode( $logo_svg )
+                'data:image/svg+xml;base64,' . base64_encode( $logo_svg ) // phpcs:ignore WordPress.PHP.DiscouragedPHPFunctions.obfuscation_base64_encode
             );
         }
-        if ( $can_manage_settings && $can_upload_files ) {
-            add_submenu_page(
-                'onlyoffice-files',
-                'ONLYOFFICE',
-                __( 'Settings', 'onlyoffice-plugin' ),
-                'manage_options',
-                'onlyoffice-settings',
-                array( $this, 'options_page' )
-            );
+
+        if ( isset( $hook ) ) {
+            add_action( "load-$hook", array( $this, 'update_plugin_settings' ) );
         }
     }
@@ -102 +129 @@
         );
 
+        if ( is_multisite() ) {
+            if ( ! is_network_admin() ) {
+                add_settings_field(
+                    self::INHERIT_NETWORK_SETTINGS,
+                    __( 'Connection Settings', 'onlyoffice-plugin' ),
+                    array( $this, 'input_checkbox' ),
+                    'onlyoffice_settings_group',
+                    'onlyoffice_settings_general_section',
+                    array(
+                        'id'          => self::INHERIT_NETWORK_SETTINGS,
+                        'checked'     => self::inherit_network_settings(),
+                        'disabled'    => ! $this->allowed_owerwrite_network_settings(),
+                        'description' => __( 'Inherit Network Settings', 'onlyoffice-plugin' ),
+                    ),
+                );
+            }
+        }
+
         add_settings_field(
-            'onlyoffice_settings_docserver_url',
+            self::DOCSERVER_URL,
             __( 'Document Editing Service address', 'onlyoffice-plugin' ),
-            array( $this, 'input_cb' ),
+            array( $this, 'input_text' ),
             'onlyoffice_settings_group',
             'onlyoffice_settings_general_section',
             array(
-                'label_for' => self::DOCSERVER_URL,
-                'desc'      => '',
+                'id'          => self::DOCSERVER_URL,
+                'value'       => $this->get_onlyoffice_current_value_setting( self::DOCSERVER_URL ),
+                'disabled'    => is_multisite() && ! is_network_admin() && ( ! $this->allowed_owerwrite_network_settings() || self::inherit_network_settings() ),
+                'description' => '',
             )
         );
 
         add_settings_field(
-            'onlyoffice_settings_docserver_jwt',
+            self::DOCSERVER_JWT,
             __( 'Document server JWT secret key', 'onlyoffice-plugin' ),
-            array( $this, 'input_cb' ),
+            array( $this, 'input_text' ),
             'onlyoffice_settings_group',
             'onlyoffice_settings_general_section',
             array(
-                'label_for' => self::DOCSERVER_JWT,
-                'desc'      => __( 'Secret key (leave blank to disable)', 'onlyoffice-plugin' ),
+                'id'          => self::DOCSERVER_JWT,
+                'value'       => $this->get_onlyoffice_current_value_setting( self::DOCSERVER_JWT ),
+                'disabled'    => is_multisite() && ! is_network_admin() && ( ! $this->allowed_owerwrite_network_settings() || self::inherit_network_settings() ),
+                'description' => __( 'Secret key (leave blank to disable)', 'onlyoffice-plugin' ),
             )
         );
 
         add_settings_field(
-            'onlyoffice_settings_jwt_header',
+            self::JWT_HEADER,
             __( 'Authorization header', 'onlyoffice-plugin' ),
-            array( $this, 'input_cb' ),
+            array( $this, 'input_text' ),
             'onlyoffice_settings_group',
             'onlyoffice_settings_general_section',
             array(
-                'label_for' => self::JWT_HEADER,
-                'desc'      => __( 'Leave blank to use default header', 'onlyoffice-plugin' ),
+                'id'          => self::JWT_HEADER,
+                'value'       => $this->get_onlyoffice_current_value_setting( self::JWT_HEADER ),
+                'disabled'    => is_multisite() && ! is_network_admin() && ( ! $this->allowed_owerwrite_network_settings() || self::inherit_network_settings() ),
+                'description' => __( 'Leave blank to use default header', 'onlyoffice-plugin' ),
             )
         );
-    }
-
-    /**
-     * Input cb
+
+        if ( is_multisite() ) {
+            if ( is_network_admin() ) {
+                add_settings_field(
+                    self::ALLOWED_OWERWRITE_NETWORK_SETTINGS,
+                    '',
+                    array( $this, 'input_checkbox' ),
+                    'onlyoffice_settings_group',
+                    'onlyoffice_settings_general_section',
+                    array(
+                        'id'          => self::ALLOWED_OWERWRITE_NETWORK_SETTINGS,
+                        'checked'     => self::allowed_owerwrite_network_settings(),
+                        'disabled'    => '',
+                        'description' => __( 'Allow site administrators to configure plugin for their sites', 'onlyoffice-plugin' ),
+                    )
+                );
+            }
+        }
+    }
+
+    /**
+     * Input text
      *
      * @param array $args Args.
@@ -146 +215 @@
      * @return void
      */
-    public function input_cb( array $args ) {
+    public function input_text( array $args ) {
         ?>
-        <input id="<?php echo esc_attr( $args['label_for'] ); ?>" type="text" class="regular-text" name="onlyoffice_settings[<?php echo esc_attr( $args['label_for'] ); ?>]" value="<?php echo esc_attr( $this->get_onlyoffice_setting( $args['label_for'] ) ); ?>">
-        <p class="description">
-            <?php echo esc_attr( $args['desc'] ); ?>
+        <input id="<?php echo esc_attr( $args['id'] ); ?>" name="<?php echo esc_attr( $args['id'] ); ?>" value="<?php echo esc_attr( $args['value'] ); ?>" <?php disabled( $args['disabled'] ); ?> type="text" class="regular-text">
+        <p class="description"><?php echo esc_attr( $args['description'] ); ?></p>
+        <?php
+    }
+
+    /**
+     * Input checkbox
+     *
+     * @param array $args Args.
+     *
+     * @return void
+     */
+    public function input_checkbox( array $args ) {
+        ?>
+        <input id="<?php echo esc_attr( $args['id'] ); ?>" name="<?php echo esc_attr( $args['id'] ); ?>" <?php checked( $args['checked'] ); ?> <?php disabled( $args['disabled'] ); ?> type="checkbox" value="1">
+        <label for="<?php echo esc_attr( $args['id'] ); ?>"><?php echo esc_attr( $args['description'] ); ?></label>
+        <?php
+    }
+
+    /**
+     * General section callback.
+     *
+     * @param array $args Args.
+     *
+     * @return void
+     */
+    public function general_section_callback( $args ) {
+        settings_errors();
+        ?>
+        <p id="<?php echo esc_attr( $args['id'] ); ?>">
+        <?php
+        if ( is_multisite() ) {
+            if ( is_network_admin() ) {
+                esc_html_e( 'Configure ONLYOFFICE Docs plugin settings for the whole network.', 'onlyoffice-plugin' );
+            } else {
+                printf(
+                    wp_kses(
+                        /* translators: %s: Title WP Site. */
+                        __( 'Configure ONLYOFFICE Docs plugin settings for %s site.', 'onlyoffice-plugin' ),
+                        array(
+                            'strong' => array(
+                                'class' => array(),
+                            ),
+                        ),
+                    ),
+                    '<a href="' . esc_attr( get_bloginfo( 'url' ) ) . '">' . esc_attr( get_bloginfo() ) . '</a>'
+                );
+
+                if ( ! $this->allowed_owerwrite_network_settings() ) {
+                    ?>
+                    <div class="onlyoffice-settings-notice">
+                        <p>
+                            <?php esc_html_e( 'Blocked from changing settings by the Network administrator', 'onlyoffice-plugin' ); ?>
+                        </p>
+                    </div>
+                    <?php
+                }
+            }
+        } else {
+            ?>
+            <p id="<?php echo esc_attr( $args['id'] ); ?>"><?php esc_html_e( 'Configure ONLYOFFICE Docs plugin settings.', 'onlyoffice-plugin' ); ?></p>
+            <?php
+        }
+        ?>
         </p>
-        <?php
-    }
-
-    /**
-     * General section callback.
-     *
-     * @param array $args Args.
-     *
-     * @return void
-     */
-    public function general_section_callback( $args ) {
-        ?>
-        <p id="<?php echo esc_attr( $args['id'] ); ?>"><?php esc_html_e( 'Configure ONLYOFFICE connector settings', 'onlyoffice-plugin' ); ?></p>
         <?php
     }
@@ -177 +294 @@
 
         wp_enqueue_style(
-            'onlyoffice-settings',
+            ONLYOFFICE_PLUGIN_NAME . '-settings',
+            ONLYOFFICE_PLUGIN_URL . 'admin/css/settings.css',
+            array(),
+            ONLYOFFICE_PLUGIN_VERSION
+        );
+
+        wp_enqueue_style(
+            ONLYOFFICE_PLUGIN_NAME . '-cloud-banner',
             ONLYOFFICE_PLUGIN_URL . 'admin/css/banner/onlyoffice-cloud-banner.css',
             array(),
@@ -183 +307 @@
         );
 
-        if ( ! empty( $_GET['settings-updated'] ) && sanitize_key( $_GET['settings-updated'] ) === 'true' ) {
-            add_settings_error( 'onlyoffice_settings_messages', 'onlyoffice_message', __( 'Settings Saved', 'onlyoffice-plugin' ), 'updated' ); // ToDo: can also check if settings are valid e.g. make connection to docServer.
-        }
-
-        settings_errors( 'onlyoffice_settings_messages' );
+        wp_enqueue_script(
+            ONLYOFFICE_PLUGIN_NAME . '-settings',
+            ONLYOFFICE_PLUGIN_URL . 'admin/js/settings.js',
+            array( 'jquery' ),
+            ONLYOFFICE_PLUGIN_VERSION,
+            true
+        );
+
+        if ( function_exists( 'wp_set_script_translations' ) ) {
+            wp_set_script_translations(
+                ONLYOFFICE_PLUGIN_NAME . '-settings',
+                'onlyoffice-plugin',
+                plugin_dir_path( ONLYOFFICE_PLUGIN_FILE ) . 'languages/'
+            );
+        }
+
         ?>
         <div class="wrap">
             <h1><?php echo esc_html( get_admin_page_title() ); ?></h1>
-            <form action="options.php" method="post">
+            <form id="onlyoffice-settings-form" action="admin.php?page=onlyoffice-settings" method="post">
                 <?php
                 settings_fields( 'onlyoffice_settings_group' );
                 do_settings_sections( 'onlyoffice_settings_group' );
-                submit_button( __( 'Save Settings', 'onlyoffice-plugin' ) );
+
+                $submit_button_args = array(
+                    'id' => 'onlyoffice-settings-submit-button',
+                );
+                if ( is_multisite() && ! is_network_admin() && ! $this->allowed_owerwrite_network_settings() ) {
+                    $submit_button_args = array(
+                        'disabled' => '',
+                    );
+                }
+
+                submit_button(
+                    __( 'Save Settings', 'onlyoffice-plugin' ),
+                    'primary',
+                    '',
+                    true,
+                    $submit_button_args
+                );
                 ?>
             </form>
@@ -212 +363 @@
         </div>
         <?php
-    }
-
-    /**
-     * Return ONLYOFFICE  Setting
+        $this->wp_print_onlyoffice_setting_confirm_dialog();
+    }
+
+    /**
+     * Update settings.
+     */
+    public function update_plugin_settings() {
+        switch ( $this->current_action() ) {
+            case 'update':
+                check_admin_referer( 'onlyoffice_settings_group-options' );
+
+                if ( is_multisite() && ! is_network_admin() && ! $this->allowed_owerwrite_network_settings() ) {
+                    wp_die( 'Blocked from changing settings by the Network administrator!', '', array( 'response' => 403 ) );
+                }
+
+                $value = array();
+
+                if ( isset( $_POST[ self::DOCSERVER_URL ] ) ) {
+                    $value[ self::DOCSERVER_URL ] = sanitize_text_field( wp_unslash( $_POST[ self::DOCSERVER_URL ] ) );
+                }
+
+                if ( isset( $_POST[ self::DOCSERVER_JWT ] ) ) {
+                    $value[ self::DOCSERVER_JWT ] = sanitize_text_field( wp_unslash( $_POST[ self::DOCSERVER_JWT ] ) );
+                }
+
+                if ( isset( $_POST[ self::JWT_HEADER ] ) ) {
+                    $value[ self::JWT_HEADER ] = sanitize_text_field( wp_unslash( $_POST[ self::JWT_HEADER ] ) );
+                }
+
+                if ( is_multisite() ) {
+                    if ( is_network_admin() ) {
+                        if ( isset( $_POST[ self::ALLOWED_OWERWRITE_NETWORK_SETTINGS ] ) ) {
+                            $value[ self::ALLOWED_OWERWRITE_NETWORK_SETTINGS ] = sanitize_text_field( wp_unslash( $_POST[ self::ALLOWED_OWERWRITE_NETWORK_SETTINGS ] ) );
+                        } else {
+                            $value[ self::ALLOWED_OWERWRITE_NETWORK_SETTINGS ] = 0;
+                        }
+
+                        $current_options = get_site_option( 'onlyoffice_settings', array() );
+                        $new_options     = array_merge( $current_options, $value );
+
+                        update_site_option( 'onlyoffice_settings', $new_options );
+                    } else {
+                        if ( isset( $_POST[ self::INHERIT_NETWORK_SETTINGS ] ) ) {
+                            $value[ self::INHERIT_NETWORK_SETTINGS ] = sanitize_text_field( wp_unslash( $_POST[ self::INHERIT_NETWORK_SETTINGS ] ) );
+
+                            if ( $value[ self::INHERIT_NETWORK_SETTINGS ] ) {
+                                $value = array(
+                                    self::INHERIT_NETWORK_SETTINGS => $value[ self::INHERIT_NETWORK_SETTINGS ],
+                                );
+                            }
+                        } else {
+                            $value[ self::INHERIT_NETWORK_SETTINGS ] = 0;
+                        }
+
+                        $current_options = get_option( 'onlyoffice_settings', array() );
+                        $new_options     = array_merge( $current_options, $value );
+
+                        update_option( 'onlyoffice_settings', $new_options );
+                    }
+                } else {
+                    $current_options = get_site_option( 'onlyoffice_settings', array() );
+                    $new_options     = array_merge( $current_options, $value );
+
+                    update_option( 'onlyoffice_settings', $new_options );
+                }
+
+                add_settings_error( 'general', 'settings_updated', __( 'Settings saved.' ), 'success' );
+                set_transient( 'settings_errors', get_settings_errors(), 30 );
+
+                if ( is_network_admin() ) {
+                    wp_safe_redirect( network_admin_url( 'admin.php?page=onlyoffice-settings&settings-updated=true' ) );
+                } else {
+                    wp_safe_redirect( admin_url( 'admin.php?page=onlyoffice-settings&settings-updated=true' ) );
+                }
+
+                exit;
+        }
+    }
+
+    /**
+     * Return ONLYOFFICE Docs plugin Settings
      *
      * @param string $key Setting key.
@@ -221 +449 @@
      */
     public static function get_onlyoffice_setting( $key, $def = '' ) {
-        $options = get_option( 'onlyoffice_settings' );
+        if ( is_multisite() ) {
+            if ( ! self::allowed_owerwrite_network_settings() || self::inherit_network_settings() ) {
+                $options = get_site_option( 'onlyoffice_settings' );
+            } else {
+                $options = get_option( 'onlyoffice_settings' );
+            }
+        } else {
+            $options = get_option( 'onlyoffice_settings' );
+        }
+
         if ( ! empty( $options ) && array_key_exists( $key, $options ) ) {
             return $options[ $key ];
@@ -228 +465 @@
         return $def;
     }
+
+    /**
+     * Return ONLYOFFICE Docs plugin settings value
+     *
+     * @param string $key Setting key.
+     * @param string $def Default value.
+     */
+    private function get_onlyoffice_current_value_setting( $key, $def = '' ) {
+        if ( is_multisite() ) {
+            if ( is_network_admin() ) {
+                $options = get_site_option( 'onlyoffice_settings' );
+            } else {
+                $options = get_option( 'onlyoffice_settings' );
+            }
+        } else {
+            $options = get_option( 'onlyoffice_settings' );
+        }
+
+        if ( ! empty( $options ) && array_key_exists( $key, $options ) ) {
+            return $options[ $key ];
+        }
+
+        return $def;
+    }
+
+    /**
+     * Return current actrion.
+     */
+    private function current_action() {
+        global $filter_action, $action;
+        wp_reset_vars( array( 'filter_action', 'action' ) );
+
+        if ( ! empty( $filter_action ) ) {
+            return false;
+        }
+
+        if ( ! empty( $action ) && -1 !== $action ) {
+            return $action;
+        }
+
+        return false;
+    }
+
+    /**
+     * Return setting allowed_owerwrite_network_settings.
+     */
+    private static function allowed_owerwrite_network_settings() {
+        $options = get_site_option( 'onlyoffice_settings' );
+        if ( ! empty( $options ) && array_key_exists( self::ALLOWED_OWERWRITE_NETWORK_SETTINGS, $options ) ) {
+            return $options[ self::ALLOWED_OWERWRITE_NETWORK_SETTINGS ];
+        }
+
+        return false;
+    }
+
+    /**
+     * Return setting inherit_network_settings.
+     */
+    private static function inherit_network_settings() {
+        $options = get_option( 'onlyoffice_settings' );
+        if ( ! empty( $options ) && array_key_exists( self::INHERIT_NETWORK_SETTINGS, $options ) ) {
+            return $options[ self::INHERIT_NETWORK_SETTINGS ];
+        }
+
+        return true;
+    }
+
+    /**
+     * Return confirm update settings dialog.
+     */
+    private function wp_print_onlyoffice_setting_confirm_dialog() {
+        ?>
+        <div id="onlyoffice-setting-confirm-dialog" class="notification-dialog-wrap hidden">
+            <div class="notification-dialog-background"></div>
+            <div class="notification-dialog" role="dialog" tabindex="0">
+                <div class="onlyoffice-setting-confirm-dialog-content">
+                    <h1><?php esc_html_e( 'Settings update', 'onlyoffice-plugin' ); ?></h1>
+                    <div class="onlyoffice-setting-confirm-message"></div>
+                    <p>
+                        <a class="button onlyoffice-setting-confirm-dialog-cancel"><?php esc_html_e( 'Cancel' ); ?></a>
+                        <button type="button" class="onlyoffice-setting-confirm-dialog-ok button button-primary"><?php esc_html_e( 'OK' ); ?></button>
+                    </p>
+                </div>
+            </div>
+        </div>
+        <?php
+    }
 }

onlyoffice/trunk/languages/onlyoffice-plugin-de_DE.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "Allgemeine Einstellungen"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "Leer lassen, um die standardmäßige Kopfzeile zu verwenden"
 
-msgid "Settings Saved"
-msgstr "Die Einstellungen werden gespeichert"
-
 msgid "Open in ONLYOFFICE"
 msgstr "In ONLYOFFICE öffnen"
@@ -49 +43 @@
 msgstr "Einstellungen"
 
-msgid "General settings section"
-msgstr "Allgemeine Einstellungen"
-
 msgid "Files"
 msgstr "Dateien"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "ONLYOFFICE-Konnektor konfigurieren"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "ONLYOFFICE Docs Einstellungen "
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "ONLYOFFICE ist nicht zugänglich. Bitte wende Dich an Deinen Administrator"
+msgid "Configure ONLYOFFICE Docs plugin settings."
+msgstr "Einstellungen von ONLYOFFICE Docs konfigurieren"
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "Hier werden die Dateien zugänglich, die Sie in ONLYOFFICE öffnen und bearbeiten können"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "Konfigurieren Sie die Einstellungen des Plugins ONLYOFFICE Docs für das gesamte Netzwerk."
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "Keine Dateien zum Öffnen oder Bearbeiten in ONLYOFFICE gefunden."
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "Konfigurieren Sie die Einstellungen des Plugins ONLYOFFICE Docs für die Website %s."
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "ONLYOFFICE-Editor zur Seite hinzufügen"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "Der Netzwerkadministrator hat die Änderung der Einstellungen verhindert"
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "Erlauben Sie Site-Administratoren, Plugins für ihre Sites zu konfigurieren"
+
+msgid "Inherit Network Settings"
+msgstr "Netzwerkeinstellungen übernehmen"
+
+msgid "Connection Settings"
+msgstr "Verbindungseinstellungen"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "ONLYOFFICE Docs ist nicht zugänglich. Bitte wende Dich an Deinen Administrator."
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "Hier werden die Dateien angezeigt, die Sie in ONLYOFFICE Docs öffnen und bearbeiten können."
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "Keine Dateien zum Öffnen oder Bearbeiten in ONLYOFFICE Docs gefunden."
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "ONLYOFFICE Docs zur Seite hinzufügen"
 
 msgid "ONLYOFFICE Docs Cloud"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "Jetzt erhalten"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "Eingebettet"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "Dokument-Ansicht"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "In ONLYOFFICE öffnen"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "Schaltfläche 'In ONLYOFFICE öffnen' anzeigen"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "Datei nicht gefunden!"
+
+msgid "Settings update"
+msgstr "Einstellungen aktualisieren"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "Möchten Sie Site-Administratoren erlauben, das Plugin selbst zu konfigurieren?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "Möchten Sie diese Einstellungen auf alle Websites anwenden?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "Möchten Sie die Netzwerkeinstellungen übernehmen?"

onlyoffice/trunk/languages/onlyoffice-plugin-en.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "General Settings"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "Leave blank to use default header"
 
-msgid "Settings Saved"
-msgstr "Settings Saved"
-
 msgid "Open in ONLYOFFICE"
 msgstr "Open in ONLYOFFICE"
@@ -49 +43 @@
 msgstr "Settings"
 
-msgid "General settings section"
-msgstr "General settings section"
-
 msgid "Files"
 msgstr "Files"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "Configure ONLYOFFICE connector settings"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "ONLYOFFICE Docs Settings"
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "ONLYOFFICE cannot be reached. Please contact admin"
+msgid "Configure ONLYOFFICE Docs plugin settings."
+msgstr "Configure ONLYOFFICE Docs plugin settings."
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "Files that can be edited and opened in ONLYOFFICE will be displayed here"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "Configure ONLYOFFICE Docs plugin settings for the whole network."
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "No files found for editing or viewing in ONLYOFFICE."
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "Configure ONLYOFFICE Docs plugin settings for %s site."
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "Add ONLYOFFICE editor on page"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "Blocked from changing settings by the Network administrator"
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "Allow site administrators to configure plugin for their sites"
+
+msgid "Inherit Network Settings"
+msgstr "Inherit Network Settings"
+
+msgid "Connection Settings"
+msgstr "Connection Settings"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "ONLYOFFICE Docs cannot be reached. Please contact admin."
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "No files found for editing or viewing in ONLYOFFICE Docs editor."
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "Add ONLYOFFICE Docs editor on page"
 
 msgid "ONLYOFFICE Docs Cloud"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "Get Now"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "Embedded"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "Document view"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "Open in ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "Show Open in ONLYOFFICE button"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "File not found!"
+
+msgid "Settings update"
+msgstr "Settings update"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "Do you want to allow sites administrators to configure the plugin themselves?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "Do you want to apply these settings to all sites?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "Do you want to apply the network settings?"

onlyoffice/trunk/languages/onlyoffice-plugin-es_ES.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "Ajustes generales"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "Dejar en blanco para utilizar el encabezado predeterminado"
 
-msgid "Settings Saved"
-msgstr "Los ajustes se han guardado"
-
 msgid "Open in ONLYOFFICE"
 msgstr "Abrir en ONLYOFFICE"
@@ -49 +43 @@
 msgstr "Ajustes"
 
-msgid "General settings section"
-msgstr "Sección de ajustes generales"
-
 msgid "Files"
 msgstr "Archivos"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "Configurar los ajustes del conector de ONLYOFFICE"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "Ajustes de ONLYOFFICE Docs"
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "No se puede establecer contacto con ONLYOFFICE. Por favor, contacte con admin"
+msgid "Configure ONLYOFFICE Docs plugin settings."
+msgstr "Configurar los ajustes del plugin de ONLYOFFICE Docs"
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "Los archivos que se pueden editar y abrir en ONLYOFFICE se mostrarán aquí"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "Configurar los ajustes del plugin ONLYOFFICE Docs para toda la red."
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "No se han encontrado archivos para editar o ver en ONLYOFFICE."
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "Configurar los ajustes del plugin ONLYOFFICE Docs para el sitio %s."
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "Añadir el editor de ONLYOFFICE en la página"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "El administrador de la red no le permite cambiar los ajustes"
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "Permitir a los administradores de los sitios configurar el plugin para sus sitios"
+
+msgid "Inherit Network Settings"
+msgstr "Aplicar los ajustes de red"
+
+msgid "Connection Settings"
+msgstr "Ajustes de conexión"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "No se puede acceder a ONLYOFFICE Docs. Por favor, contacte con el administrador."
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "Los archivos que se pueden editar y abrir en el editor de ONLYOFFICE Docs se mostrarán aquí."
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "No se han encontrado archivos para editar o ver en el editor de ONLYOFFICE Docs."
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "Añadir el editor de ONLYOFFICE Docs a la página"
 
 msgid "ONLYOFFICE Docs Cloud"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "Obtener ahora"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "Incorporado"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "Visualización de documento"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "Abrir en ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "Mostrar el botón Abrir en ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "¡No se ha encontrado el archivo!"
+
+msgid "Settings update"
+msgstr "Actualización de los ajustes"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "¿Desea permitir a los administradores de los sitios que configuren ellos mismos el plugin?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "¿Desea aplicar estos ajustes a todos los sitios?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "¿Desea aplicar los ajustes de red?"

onlyoffice/trunk/languages/onlyoffice-plugin-fr_FR.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "Paramètres généraux"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "Laissez vide pour utiliser l'en-tête par défaut"
 
-msgid "Settings Saved"
-msgstr "Paramètres sauvegardés"
-
 msgid "Open in ONLYOFFICE"
 msgstr "Ouvrir dans ONLYOFFICE"
@@ -49 +43 @@
 msgstr "Paramètres"
 
-msgid "General settings section"
-msgstr "Section des paramètres généraux"
-
 msgid "Files"
 msgstr "Fichiers"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "Configurer les paramètres du connecteur ONLYOFFICE"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "Paramètres d'ONLYOFFICE Docs"
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "Impossible de joindre ONLYOFFICE. Veuillez contacter l'administrateur"
+msgid "Configure ONLYOFFICE Docs plugin settings."
+msgstr "Configurer les paramètres du connecteur ONLYOFFICE Docs"
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "Les fichiers qui peuvent être édités et ouverts dans ONLYOFFICE seront affichés ici"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "Configurez les paramètres du plugin ONLYOFFICE Docs pour l'ensemble du réseau."
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "Aucun fichier trouvé pour être édité ou affiché dans ONLYOFFICE."
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "Configurez les paramètres du plugin ONLYOFFICE Docs pour le site %s."
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "Ajouter l'éditeur ONLYOFFICE à la page"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "L'administrateur du réseau a bloqué la modification des paramètres"
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "Permettez aux administrateurs de sites de configurer le plugin pour leurs sites"
+
+msgid "Inherit Network Settings"
+msgstr "Appliquer les paramètres réseau"
+
+msgid "Connection Settings"
+msgstr "Paramètres de connexion"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "Impossible de joindre ONLYOFFICE Docs. Veuillez contacter l'administrateur."
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "Les fichiers qui peuvent être édités et ouverts dans l'éditeur ONLYOFFICE Docs sont affichés ici."
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "Aucun fichier trouvé pour être édité ou affiché dans ONLYOFFICE Docs."
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "Ajouter l'éditeur ONLYOFFICE Docs à la page"
 
 msgid "ONLYOFFICE Docs Cloud"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "Obtenir maintenant"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "Intégré"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "Vue du document"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "Ouvrir dans ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "Afficher le bouton Ouvrir dans ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "Fichier non trouvé !"
+
+msgid "Settings update"
+msgstr "Actualiser les paramètres"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "Souhaitez-vous permettre aux administrateurs de sites de configurer eux-mêmes le plugin ?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "Souhaitez-vous appliquer ces paramètres à tous les sites ?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "Souhaitez-vous appliquer les paramètres du réseau ?"

onlyoffice/trunk/languages/onlyoffice-plugin-it_IT.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "Impostazioni generali"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "Lascia vuoto per utilizzare l'intestazione predefinita"
 
-msgid "Settings Saved"
-msgstr "Le impostazioni sono state salvate"
-
 msgid "Open in ONLYOFFICE"
 msgstr "Aprire in ONLYOFFICE"
@@ -49 +43 @@
 msgstr "Impostazioni"
 
-msgid "General settings section"
-msgstr "Sezione Impostazioni generali"
-
 msgid "Files"
 msgstr "File"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "Configurare le impostazioni del connettore ONLYOFFICE"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "Impostazioni di ONLYOFFICE Docs"
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "Impossibile raggiungere ONLYOFFICE. Si prega di contattare l'amministratore"
+msgid "Configure ONLYOFFICE Docs plugin settings."
+msgstr "Configura le impostazioni del plugin di ONLYOFFICE Docs"
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "I file che possono essere modificati e aperti in ONLYOFFICE verranno visualizzati qui"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "Configura le impostazioni del plugin di ONLYOFFICE Docs per l'intera rete."
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "Nessun file trovato per la modifica o la visualizzazione in ONLYOFFICE"
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "Configura le impostazioni del plugin di ONLYOFFICE Docs per il sito di %s."
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "Aggiungere l'editor ONLYOFFICE alla pagina"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "Bloccato dalle modifiche delle impostazioni da parte dell'amministratore di rete"
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "Consenti agli amministratori del sito di configurare il plugin per i loro siti"
+
+msgid "Inherit Network Settings"
+msgstr "Eredita le impostazioni di rete"
+
+msgid "Connection Settings"
+msgstr "Impostazioni della connessione"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "Impossibile raggiungere ONLYOFFICE Docs. Ti preghiamo di contattare l'amministratore."
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "I file che possono essere modificati e aperti nell'editor di ONLYOFFICE Docs vengono visualizzati qui."
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "Nessun file trovato per la modifica o la visualizzazione nell'editor di ONLYOFFICE Docs."
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "Aggiungi l'editor di ONLYOFFICE Docs alla pagina"
 
 msgid "ONLYOFFICE Docs Cloud"
-msgstr "ONLYOFFICE Docs nel Cloud"
+msgstr "ONLYOFFICE Docs Cloud"
 
 msgid "Easily launch the editors in the cloud without downloading and installation"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "Ottieni ora"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "Incorporato"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "Visualizzazione del documento"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "Aprire in ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "Mostra il pulsante Apri in ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "File non trovato!"
+
+msgid "Settings update"
+msgstr "Aggiornamento delle impostazioni"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "Vuoi consentire agli amministratori dei siti di configurare il plugin autonomamente?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "Vuoi applicare queste impostazioni a tutti i siti?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "Vuoi applicare le impostazioni di rete?"

onlyoffice/trunk/languages/onlyoffice-plugin-ja.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "一般設定"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "デフォルトのヘッダーを使用したい場合は空白にしてください"
 
-msgid "Settings Saved"
-msgstr "設定が保存されました"
-
 msgid "Open in ONLYOFFICE"
 msgstr "ONLYOFFICEで開く"
@@ -49 +43 @@
 msgstr "設定"
 
-msgid "General settings section"
-msgstr "一般設定セクション"
-
 msgid "Files"
 msgstr "ファイル"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "ONLYOFFICEコネクタ設定を構成する"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "ONLYOFFICE Docsの設定"
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "ONLYOFFICE に接続できません。管理者にお問い合わせください"
+msgid "Configure ONLYOFFICE Docs plugin settings."
+msgstr "ONLYOFFICE Docsプラグインの設定"
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "ONLYOFFICEで開いて、編集することができるファイルがここに表示されます"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "ネットワーク全体のONLYOFFICE Docsプラグイン設定を行う"
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "ONLYOFFICEで編集または表示するファイルが見つかりません。"
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "%s サイトのONLYOFFICE Docsプラグイン設定を行う"
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "ページにONLYOFFICEエディターを追加する"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "ネットワーク管理者による設定の変更がブロックされています"
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "サイト管理者が自分のサイトのプラグインを設定できるようにする"
+
+msgid "Inherit Network Settings"
+msgstr "ネットワーク設定の継承"
+
+msgid "Connection Settings"
+msgstr "接続設定"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "ONLYOFFICE Docsにアクセスできません。管理者にお問い合わせください。"
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "ここではONLYOFFICE Docsエディタで編集・閲覧可能なファイルが表示されます。"
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "ONLYOFFICE Docsエディタで編集・閲覧可能なファイルは見つかりませんでした。"
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "ONLYOFFICE Docsエディタ追加ページ"
 
 msgid "ONLYOFFICE Docs Cloud"
-msgstr "ONLYOFFICE Docs Cloud"
+msgstr "ONLYOFFICEドキュメントエディタをページに追加する"
 
 msgid "Easily launch the editors in the cloud without downloading and installation"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "今すぐ使ってみる"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "埋め込み"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "ドキュメント表示"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "ONLYOFFICEで開く"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "「ONLYOFFICEで開く」ボタンを表示"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "ファイルが見つかりません！"
+
+msgid "Settings update"
+msgstr "設定の更新"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "サイト管理者自身がプラグインを設定できるようにしますか？"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "これらの設定をすべてのサイトに適用しますか？"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "ネットワーク設定を適用しますか？"

onlyoffice/trunk/languages/onlyoffice-plugin-ru_RU.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "Основные настройки"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "Оставьте пустым, чтобы использовать заголовок по умолчанию"
 
-msgid "Settings Saved"
-msgstr "Настройки сохранены"
-
 msgid "Open in ONLYOFFICE"
 msgstr "Открыть в ONLYOFFICE"
@@ -49 +43 @@
 msgstr "Настройки"
 
-msgid "General settings section"
-msgstr "Раздел основных настроек"
-
 msgid "Files"
 msgstr "Файлы"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "Настройка параметров коннектора ONLYOFFICE"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "Настройки ONLYOFFICE Docs"
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "Приложение ONLYOFFICE недоступно. Пожалуйста, свяжитесь с администратором"
+msgid "Configure ONLYOFFICE Docs plugin settings."
+msgstr "Настройте параметры плагина ONLYOFFICE Docs."
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "Здесь будут отражены файлы, которые можно редактировать и открывать в ONLYOFFICE"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "Настройте параметры плагина ONLYOFFICE Docs для всей сети."
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "Не найдены файлы для редактирования или просмотра в ONLYOFFICE."
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "Настройте параметры плагина ONLYOFFICE Docs для сайта %s."
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "Добавить редактор ONLYOFFICE на страницу"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "Администратор сети заблокировал изменение настроек."
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "Разрешить администраторам сайта настраивать плагин для своих сайтов"
+
+msgid "Inherit Network Settings"
+msgstr "Наследовать настройки сети"
+
+msgid "Connection Settings"
+msgstr "Настройки соединения"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "Приложение ONLYOFFICE Docs недоступно. Пожалуйста, свяжитесь с администратором."
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "Здесь отображаются файлы, которые можно редактировать и открывать в редакторе ONLYOFFICE Docs."
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "Не найдены файлы для редактирования или просмотра в редакторе ONLYOFFICE Docs."
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "Добавить редактор ONLYOFFICE Docs на страницу"
 
 msgid "ONLYOFFICE Docs Cloud"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "Получить сейчас"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "Встроенный"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "Просмотр документа"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "Открыть в ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "Показать кнопку Открыть в ONLYOFFICE"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "Файл не найден!"
+
+msgid "Settings update"
+msgstr "Обновление настроек"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "Хотите разрешить администраторам сайтов самостоятельно настраивать плагин?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "Хотите применить эти настройки ко всем сайтам?"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "Хотите применить настройки сети?"

onlyoffice/trunk/languages/onlyoffice-plugin-zh_CN.po

@@ -11 +11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 3.0.1\n"
-
-msgid "General Settings"
-msgstr "一般设置"
+"X-Generator: Poedit 3.4.1\n"
 
 msgid "Document Editing Service address"
@@ -31 +28 @@
 msgstr "留空以使用默认的标头"
 
-msgid "Settings Saved"
-msgstr "设置已保存"
-
 msgid "Open in ONLYOFFICE"
 msgstr "用 ONLYOFFICE 打开"
@@ -49 +43 @@
 msgstr "设置"
 
-msgid "General settings section"
-msgstr "通用设置部分"
-
 msgid "Files"
 msgstr "文件"
 
-msgid "Configure ONLYOFFICE connector settings"
-msgstr "配置ONLYOFFICE连接器设置"
+msgid "ONLYOFFICE Docs Settings"
+msgstr "ONLYOFFICE 文档设置"
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
-msgstr "无法联系到ONLYOFFICE。请联系管理员"
+msgid "Configure ONLYOFFICE Docs plugin settings"
+msgstr "配置 ONLYOFFICE 文档插件设置"
 
-msgid "Files that can be edited and opened in ONLYOFFICE will be displayed here"
-msgstr "可在ONLYOFFICE中编辑并打开的文件将在这里显示"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
+msgstr "为整个网络进行 ONLYOFFICE 文档插件设置。"
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
-msgstr "未发现可在ONLYOFFICE中编辑或查看的文件。"
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
+msgstr "为 %s 站点进行 ONLYOFFICE 文档插件设置。"
 
-msgid "Add ONLYOFFICE editor on page"
-msgstr "将ONLYOFFICE编辑器添加到页面上"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr "更改设置已被网络管理员阻止"
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr "允许站点管理员为其站点配置插件"
+
+msgid "Inherit Network Settings"
+msgstr "继承网络设置"
+
+msgid "Connection Settings"
+msgstr "连接设置"
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr "无法连接到 ONLYOFFICE 文档。请联系管理员。"
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr "可在 ONLYOFFICE 文档中编辑并打开的文件在这里显示。"
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr "未找到可在 ONLYOFFICE 文档编辑器中编辑或查看的文件。"
+
+msgid "Add ONLYOFFICE Docs editor on page"
+msgstr "将 ONLYOFFICE 文档编辑器添加到页面上"
 
 msgid "ONLYOFFICE Docs Cloud"
@@ -78 +91 @@
 msgid "Get Now"
 msgstr "立即获取"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr "嵌入式"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr "文档视图"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr "用 ONLYOFFICE 打开"
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr "显示在 ONLYOFFICE 中打开按钮"
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr "未找到文件！"
+
+msgid "Settings update"
+msgstr "设置更新"
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr "您是否允许站点管理员自己配置插件？"
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr "是否将这些设置应用到所有站点？"
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr "是否应用网络设置？"

onlyoffice/trunk/languages/onlyoffice-plugin.pot

@@ -3 +3 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 
-msgid "General Settings"
-msgstr ""
+
+
+
+
+
+
+
+
+
 
 msgid "Document Editing Service address"
@@ -19 +26 @@
 
 msgid "Leave blank to use default header"
-msgstr ""
-
-msgid "Settings Saved"
 msgstr ""
 
@@ -39 +43 @@
 msgstr ""
 
-msgid "General settings section"
-msgstr ""
-
 msgid "Files"
 msgstr ""
 
-msgid "Configure ONLYOFFICE connector settings"
+msgid "ONLYOFFICE Docs Settings"
 msgstr ""
 
-msgid "ONLYOFFICE cannot be reached. Please contact admin"
+msgid "Configure ONLYOFFICE Docs plugin settings."
 msgstr ""
 
-msgid "Files that can be edited and opened in ONLYOFFYCE will be displayed here"
+msgid "Configure ONLYOFFICE Docs plugin settings for the whole network."
 msgstr ""
 
-msgid "No files found for editing or viewing in ONLYOFFICE."
+msgid "Configure ONLYOFFICE Docs plugin settings for %s site."
 msgstr ""
 
-msgid "Add ONLYOFFICE editor on page"
+msgid "Blocked from changing settings by the Network administrator"
+msgstr ""
+
+msgid "Allow site administrators to configure plugin for their sites"
+msgstr ""
+
+msgid "Inherit Network Settings"
+msgstr ""
+
+msgid "Connection Settings"
+msgstr ""
+
+#: controllers/js/frontend-controller.js
+msgid "ONLYOFFICE Docs cannot be reached. Please contact admin."
+msgstr ""
+
+msgid "Files that can be edited and opened in ONLYOFFICE Docs editor are displayed here."
+msgstr ""
+
+msgid "No files found for editing or viewing in ONLYOFFICE Docs editor."
+msgstr ""
+
+msgid "Add ONLYOFFICE Docs editor on page"
 msgstr ""
 
@@ -68 +91 @@
 msgid "Get Now"
 msgstr ""
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Embedded"
+msgstr ""
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Document view"
+msgstr ""
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Open in ONLYOFFICE"
+msgstr ""
+
+#: onlyoffice-wordpress-block/build/index.js
+msgid "Show Open in ONLYOFFICE button"
+msgstr ""
+
+#: onlyoffice-wordpress-block/build/index.js
+#: controllers/js/frontend-controller.js
+msgid "File not found!"
+msgstr ""
+
+msgid "Settings update"
+msgstr ""
+
+#: admin/js/settings.js
+msgid "Do you want to allow sites administrators to configure the plugin themselves?"
+msgstr ""
+
+#: admin/js/settings.js
+msgid "Do you want to apply these settings to all sites?"
+msgstr ""
+
+#: admin/js/settings.js
+msgid "Do you want to apply the network settings?"
+msgstr ""

onlyoffice/trunk/licenses/3rd-Party.license

@@ -1 @@
-ONLYOFFICE WordPress plugin uses code from the following 3rd party projects.
+ONLYOFFICE Docs plugin uses code from the following 3rd party projects.
 
 JWT           - A simple library to encode and decode JSON Web Tokens (JWT) in PHP. (https://github.com/firebase/php-jwt)

onlyoffice/trunk/onlyoffice-tinymce/onlyoffice-tinymce.js

@@ -1 @@
-/*
- * (c) Copyright Ascensio System SIA 2023
+/**
+ * JS for ONLYOFFICE Docs TinyMCE.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
+ * @package Onlyoffice_Wordpress
+ */
 
-(function() {
-    tinymce.PluginManager.add("onlyoffice-tinymce", function(editor) {
-        editor.addButton("onlyoffice-tinymce", {
-            tooltip: "ONLYOFFICE",
-            onclick:  function() {
-                let frameOnlyoffice = wp.media.frames.onlyoffice;
+( function ( ) {
+    tinymce.PluginManager.add(
+        "onlyoffice-tinymce",
+        function ( editor ) {
+            editor.addButton(
+                "onlyoffice-tinymce",
+                {
+                    tooltip: "ONLYOFFICE",
+                    onclick: function () {
+                        let frameOnlyoffice = wp.media.frames.onlyoffice;
 
-                if (frameOnlyoffice) {
-                    frameOnlyoffice.open();
-                    return;
-                }
+                        if (frameOnlyoffice) {
+                            frameOnlyoffice.open();
+                            return;
+                        }
 
-                const onlyofficeAllowedExts = oo_media.formats.toString().split(" ").join("").split(".").join("").split(",");
-                let onlyofficeAllowedMimes = [];
+                        let onlyofficeAllowedMimes = [];
 
-                for (let ext of onlyofficeAllowedExts) {
-                    var mimeType = getMimeType(ext);
+                        for (let ext of ONLYOFFICE.formatsUtils.getViewableExtensions()) {
+                            var mimeType = getMimeType( ext );
 
-                    if (mimeType){
-                        onlyofficeAllowedMimes.push(mimeType);
-                    }
-                }
+                            if ( mimeType ) {
+                                onlyofficeAllowedMimes.push( mimeType );
+                            }
+                        }
 
-                frameOnlyoffice = wp.media.frames.onlyoffice = wp.media({
-                    title: wp.i18n.__("Select or Upload Media"),
-                    library: {
-                        type: onlyofficeAllowedMimes
-                    }
-                });
+                        frameOnlyoffice = wp.media.frames.onlyoffice = wp.media(
+                            {
+                                title: wp.i18n.__( "Select or Upload Media" ),
+                                library: {
+                                    type: onlyofficeAllowedMimes
+                                }
+                            }
+                        );
 
-                frameOnlyoffice.on("select", function() {
-                    const selectedAttachment = frameOnlyoffice.state().get('selection').first();
+                        frameOnlyoffice.on(
+                            "select",
+                            function () {
+                                const selectedAttachment = frameOnlyoffice.state().get( 'selection' ).first();
 
-                    let params = {
-                        id: selectedAttachment.id,
-                        fileName: selectedAttachment.attributes.filename,
-                    }
+                                let params = {
+                                    id: selectedAttachment.id,
+                                    fileName: selectedAttachment.attributes.filename,
+                                }
 
-                    const wpOnlyofficeBlock = `<!-- wp:onlyoffice-wordpress/onlyoffice ${JSON.stringify(params)} -->`;
+                                const wpOnlyofficeBlock = "<!-- wp:onlyoffice-wordpress/onlyoffice " + JSON.stringify( params ) + " -->";
 
-                    let wpOnlyofficeBody = "[onlyoffice id=" + selectedAttachment.id + " /]";
+                                let wpOnlyofficeBody = "[onlyoffice id=" + selectedAttachment.id + " /]";
 
-                    let wpOnlyofficeBlockEnd = "<!-- /wp:onlyoffice-wordpress/onlyoffice -->"
+                                let wpOnlyofficeBlockEnd = "<!-- /wp:onlyoffice-wordpress/onlyoffice -->"
 
-                    editor.insertContent(wpOnlyofficeBlock + wpOnlyofficeBody + wpOnlyofficeBlockEnd);
-                });
+                                editor.insertContent( wpOnlyofficeBlock + wpOnlyofficeBody + wpOnlyofficeBlockEnd );
+                            }
+                        );
 
-                frameOnlyoffice.open();
-            }
-        });
-    });
+                        frameOnlyoffice.open();
+                    }
+                }
+            );
+        }
+    );
 
-    var getMimeType = function( name ) {
-        var allTypes = oo_media.mimeTypes;
+    var getMimeType = function ( name ) {
+        var allTypes = ONLYOFFICE.mimeTypes;
 
-        if (allTypes[name] !== undefined) {
-            return allTypes[name];
-        }
+        if ( allTypes[name] !== undefined ) {
+            return allTypes[name];
+        }
 
-        for(var key in allTypes) {
-            if(key.indexOf(name) !== -1) {
-                return allTypes[key];
-            }
-        }
+        for ( var key in allTypes ) {
+            if ( key.indexOf( name ) !== -1 ) {
+                return allTypes[key];
+            }
+        }
 
-        return false;
-    };
+        return false;
+    };
 })();

onlyoffice/trunk/onlyoffice-tinymce/onlyoffice-tinymce.php

@@ -9 +9 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or

onlyoffice/trunk/onlyoffice-wordpress-block/block.json

@@ -3 +3 @@
     "apiVersion": 2,
     "name": "onlyoffice-wordpress/onlyoffice",
-    "title": "ONLYOFFICE",
+    "title": "ONLYOFFICE Docs",
     "category": "media",
     "editorScript": "file:./build/index.js",
+    "editorStyle": "file:build/index.css",
     "keywords": ["onlyoffice"],
     "textdomain": "onlyoffice-plugin",
@@ -14 +15 @@
         "fileName": {
             "type": "string"
+        },
+        "documentView": {
+            "type": "string"
+        },
+        "inNewTab": {
+            "type": "boolean",
+            "default": true
+        },
+        "width":  {
+            "type": "string"
+        },
+        "height":{
+            "type": "string"
+        },
+        "showOpenButton":{
+            "type": "boolean",
+            "default": true
+        },
+        "openButtonText":{
+            "type": "string"
         }
+    },
+    "supports": {
+        "align": true
     }
 }

onlyoffice/trunk/onlyoffice-wordpress-block/build/index.asset.php

@@ -1 @@
-<?php return array('dependencies' => array('wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n', 'wp-polyfill'), 'version' => '704b791d5149e64f7dcc');
+<?php return array('dependencies' => array('react', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-element', 'wp-i18n'), 'version' => '4f7c984e58f9263b6891');

onlyoffice/trunk/onlyoffice-wordpress-block/build/index.js

@@ -1 @@
-!function(){"use strict";var e={d:function(t,l){for(var n in l)e.o(l,n)&&!e.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:l[n]})},o:function(e,t){return Object.prototype.hasOwnProperty.call(e,t)}};e.d({},{l:function(){return r},i:function(){return d}});var t=window.wp.element,l=window.wp.blocks,n=JSON.parse('{"u2":"onlyoffice-wordpress/onlyoffice"}'),i=window.wp.blockEditor,o=window.wp.components,a=window.wp.i18n;const r={padding:"20px"},d=(0,t.createElement)("svg",{width:"66",height:"60",viewBox:"0 0 66 60",fill:"black",xmlns:"http://www.w3.org/2000/svg"},(0,t.createElement)("path",{opacity:"0.5",fillRule:"evenodd",clipRule:"evenodd",d:"M28.9406 59.2644L2.20792 46.9066C-0.0693069 45.8277 -0.0693069 44.1604 2.20792 43.1796L11.5148 38.8642L28.8416 46.9066C31.1188 47.9854 34.7822 47.9854 36.9604 46.9066L54.2871 38.8642L63.5941 43.1796C65.8713 44.2585 65.8713 45.9258 63.5941 46.9066L36.8614 59.2644C34.7822 60.2452 31.1188 60.2452 28.9406 59.2644Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.75",fillRule:"evenodd",clipRule:"evenodd",d:"M28.9406 44.0606L2.20792 31.7028C-0.069307 30.6239 -0.069307 28.9566 2.20792 27.9758L11.3168 23.7584L28.9406 31.8989C31.2178 32.9778 34.8812 32.9778 37.0594 31.8989L54.6832 23.7584L63.7921 27.9758C66.0693 29.0547 66.0693 30.722 63.7921 31.7028L37.0594 44.0606C34.7822 45.1395 31.1188 45.1395 28.9406 44.0606Z",fill:"black"}),(0,t.createElement)("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M28.9406 29.2518L2.20792 16.8939C-0.069307 15.8151 -0.069307 14.1478 2.20792 13.167L28.9406 0.809144C31.2178 -0.269715 34.8812 -0.269715 37.0594 0.809144L63.7921 13.167C66.0693 14.2458 66.0693 15.9132 63.7921 16.8939L37.0594 29.2518C34.7822 30.2325 31.1188 30.2325 28.9406 29.2518Z",fill:"black"}));(0,l.registerBlockType)(n.u2,{icon:d,edit:e=>{let{attributes:l,setAttributes:n}=e;const c=oo_media.formats;let s=[];const p=function(e){var t=oo_media.mimeTypes;if(void 0!==t[e])return t[e];for(var l in t)if(-1!==l.indexOf(e))return t[l];return!1};for(let e of c){let t=p(e);t&&s.push(t)}const f=(0,i.useBlockProps)({style:r});return l.id?(0,t.createElement)("div",f,(0,t.createElement)(i.InspectorControls,{key:"setting"},(0,t.createElement)(o.PanelBody,{title:(0,a.__)("Settings")},(0,t.createElement)(o.__experimentalInputControl,{label:(0,a.__)("Name"),value:l.fileName,onChange:e=>n({fileName:e})}))),(0,t.createElement)("p",{style:{display:"flex"}},d,(0,t.createElement)("p",{style:{marginLeft:"25px"}}," ",l.fileName||"")),(0,t.createElement)(i.BlockControls,null,(0,t.createElement)(i.MediaReplaceFlow,{mediaId:l.id,allowedTypes:s,accept:s.join(),onSelect:e=>{e&&e.hasOwnProperty("id")&&n({id:e.id,fileName:e.filename||e.guid.raw.substring(e.guid.raw.lastIndexOf("/")+1)})},name:(0,a.__)("Replace")}))):(0,t.createElement)(i.MediaPlaceholder,{labels:{title:"ONLYOFFICE"},allowedTypes:s,accept:s.join(),onSelect:e=>{e&&e.hasOwnProperty("id")&&n({id:e.id,fileName:e.filename||e.guid.raw.substring(e.guid.raw.lastIndexOf("/")+1)})}})},save:e=>{let{attributes:l}=e;return(0,t.createElement)(t.RawHTML,null,`[onlyoffice id=${l.id} /]`)}})}();
+(()=>{"use strict";var e={d:(t,l)=>{for(var n in l)e.o(l,n)&&!e.o(t,n)&&Object.defineProperty(t,n,{enumerable:!0,get:l[n]})},o:(e,t)=>Object.prototype.hasOwnProperty.call(e,t)};e.d({},{V:()=>p});const t=window.React,l=window.wp.blocks,n=JSON.parse('{"UU":"onlyoffice-wordpress/onlyoffice"}'),i=window.wp.blockEditor,a=window.wp.components,o=window.wp.i18n,C=(0,t.createElement)("svg",{width:"161",height:"205",viewBox:"0 0 161 205",fill:"none",xmlns:"http://www.w3.org/2000/svg"},(0,t.createElement)("path",{d:"M152.45 37.2371V191.59C152.45 192.738 151.994 193.84 151.182 194.652C150.37 195.464 149.268 195.92 148.12 195.92H12.88C11.7316 195.92 10.6302 195.464 9.81821 194.652C9.00618 193.84 8.54999 192.738 8.54999 191.59V12.88C8.54999 11.7316 9.00618 10.6302 9.81822 9.81822C10.6302 9.00618 11.7316 8.54999 12.88 8.54999H123.763L152.45 37.2371Z",fill:"#214479",stroke:"#1A3661"}),(0,t.createElement)("path",{opacity:"0.2",d:"M151.5 37.03H128.8C127.519 37.03 126.29 36.5211 125.385 35.6153C124.479 34.7095 123.97 33.481 123.97 32.2V9.5L151.5 37.03Z",fill:"black"}),(0,t.createElement)("path",{d:"M70.9538 167.902L68.2292 178.61H65.6437L64.1936 172.985C64.1643 172.878 64.1252 172.714 64.0764 172.494C64.0275 172.275 63.9763 172.035 63.9226 171.776C63.8688 171.513 63.82 171.266 63.7761 171.037C63.737 170.802 63.7102 170.617 63.6955 170.48C63.6809 170.617 63.6516 170.8 63.6076 171.029C63.5686 171.259 63.5222 171.503 63.4685 171.762C63.4196 172.021 63.3708 172.262 63.322 172.487C63.2731 172.712 63.2341 172.882 63.2048 173L61.7619 178.61H59.1838L56.4519 167.902H58.6857L60.0554 173.747C60.0944 173.922 60.1384 174.132 60.1872 174.377C60.2409 174.621 60.2922 174.877 60.341 175.146C60.3947 175.409 60.4411 175.666 60.4802 175.915C60.5241 176.159 60.5559 176.371 60.5754 176.552C60.5998 176.366 60.6315 176.151 60.6706 175.907C60.7097 175.658 60.7512 175.407 60.7951 175.153C60.8439 174.894 60.8928 174.655 60.9416 174.435C60.9904 174.215 61.0344 174.037 61.0734 173.901L62.6335 167.902H64.7795L66.3396 173.901C66.3737 174.032 66.4128 174.211 66.4567 174.435C66.5056 174.655 66.5544 174.894 66.6032 175.153C66.6521 175.412 66.696 175.666 66.7351 175.915C66.779 176.159 66.8107 176.371 66.8303 176.552C66.8645 176.308 66.9108 176.012 66.9694 175.666C67.0329 175.314 67.0988 174.965 67.1672 174.618C67.2404 174.272 67.3039 173.981 67.3576 173.747L68.7199 167.902H70.9538ZM82.0207 173.241C82.0207 174.067 81.9182 174.818 81.7131 175.497C81.508 176.171 81.1955 176.752 80.7756 177.24C80.3605 177.729 79.8332 178.105 79.1936 178.368C78.5539 178.627 77.7971 178.756 76.923 178.756C76.049 178.756 75.2922 178.627 74.6525 178.368C74.0129 178.105 73.4831 177.729 73.0632 177.24C72.6481 176.752 72.3381 176.169 72.133 175.49C71.9279 174.811 71.8254 174.057 71.8254 173.227C71.8254 172.118 72.0061 171.154 72.3674 170.334C72.7336 169.508 73.2951 168.869 74.052 168.415C74.8088 167.961 75.7707 167.734 76.9377 167.734C78.0998 167.734 79.0544 167.961 79.8015 168.415C80.5534 168.869 81.1101 169.508 81.4714 170.334C81.8376 171.159 82.0207 172.128 82.0207 173.241ZM74.2058 173.241C74.2058 173.988 74.2985 174.633 74.4841 175.175C74.6745 175.712 74.9699 176.127 75.3703 176.42C75.7707 176.708 76.2883 176.852 76.923 176.852C77.5676 176.852 78.09 176.708 78.4904 176.42C78.8908 176.127 79.1813 175.712 79.362 175.175C79.5476 174.633 79.6403 173.988 79.6403 173.241C79.6403 172.118 79.4304 171.234 79.0104 170.59C78.5905 169.945 77.8996 169.623 76.9377 169.623C76.298 169.623 75.7756 169.77 75.3703 170.063C74.9699 170.351 74.6745 170.766 74.4841 171.308C74.2985 171.845 74.2058 172.489 74.2058 173.241ZM87.3601 167.902C88.3317 167.902 89.1325 168.019 89.7624 168.254C90.3972 168.488 90.8684 168.842 91.176 169.316C91.4836 169.789 91.6374 170.387 91.6374 171.11C91.6374 171.598 91.5446 172.026 91.3591 172.392C91.1735 172.758 90.9294 173.068 90.6267 173.322C90.3239 173.576 89.9968 173.783 89.6452 173.944L92.7946 178.61H90.2751L87.7189 174.501H86.5104V178.61H84.2399V167.902H87.3601ZM87.1989 169.762H86.5104V172.655H87.2429C87.9948 172.655 88.5319 172.531 88.8542 172.282C89.1813 172.028 89.3449 171.657 89.3449 171.169C89.3449 170.661 89.1691 170.299 88.8176 170.085C88.4709 169.87 87.9313 169.762 87.1989 169.762ZM103.027 173.153C103.027 174.359 102.795 175.368 102.331 176.178C101.872 176.984 101.205 177.592 100.331 178.002C99.4572 178.407 98.405 178.61 97.1745 178.61H94.1423V167.902H97.5041C98.6271 167.902 99.6013 168.102 100.426 168.503C101.252 168.898 101.891 169.486 102.345 170.268C102.8 171.044 103.027 172.006 103.027 173.153ZM100.668 173.212C100.668 172.421 100.551 171.772 100.317 171.264C100.087 170.751 99.7453 170.373 99.2912 170.129C98.842 169.884 98.2854 169.762 97.6213 169.762H96.4128V176.735H97.3869C98.4953 176.735 99.3181 176.44 99.8552 175.849C100.397 175.258 100.668 174.379 100.668 173.212Z",fill:"white"}),(0,t.createElement)("path",{d:"M109.158 77.28L99.015 120.75L87.745 77.28H82.915H78.085L66.815 120.75L56.672 77.28H47.334L61.019 132.02H71.323L82.915 87.101L94.507 132.02H104.811L118.496 77.28H109.158Z",fill:"white"})),r=(0,t.createElement)("svg",{width:"161",height:"205",viewBox:"0 0 161 205",fill:"none",xmlns:"http://www.w3.org/2000/svg"},(0,t.createElement)("path",{d:"M123.763 9.01997L152.45 37.7071V192.06C152.45 193.208 151.994 194.31 151.182 195.122C150.37 195.934 149.268 196.39 148.12 196.39H12.88C11.7316 196.39 10.6302 195.934 9.81822 195.122L9.46466 195.475L9.81821 195.122C9.00618 194.31 8.54999 193.208 8.54999 192.06V13.35C8.54999 12.2016 9.00618 11.1002 9.81822 10.2882C10.6302 9.47617 11.7316 9.01997 12.88 9.01997H123.763Z",fill:"#1F7244",stroke:"#195B36"}),(0,t.createElement)("path",{opacity:"0.2",d:"M151.5 37.47H128.833C127.551 37.47 126.322 36.9783 125.416 36.1031C124.509 35.228 124 34.041 124 32.8033V9.96997L151.5 37.47Z",fill:"black"}),(0,t.createElement)("path",{d:"M68.5777 170.108C68.1431 170.108 67.7574 170.193 67.4204 170.364C67.0884 170.53 66.8077 170.772 66.5782 171.089C66.3536 171.407 66.1827 171.79 66.0655 172.239C65.9483 172.688 65.8897 173.194 65.8897 173.755C65.8897 174.512 65.9825 175.159 66.168 175.696C66.3584 176.228 66.6514 176.636 67.0469 176.919C67.4424 177.198 67.9527 177.337 68.5777 177.337C69.0122 177.337 69.4468 177.288 69.8814 177.19C70.3208 177.093 70.7969 176.953 71.3096 176.773V178.677C70.836 178.872 70.3697 179.012 69.9107 179.095C69.4517 179.182 68.9366 179.226 68.3653 179.226C67.2618 179.226 66.3536 178.999 65.6407 178.545C64.9327 178.086 64.4078 177.447 64.066 176.626C63.7242 175.801 63.5533 174.839 63.5533 173.741C63.5533 172.93 63.6631 172.188 63.8828 171.514C64.1026 170.84 64.4248 170.257 64.8496 169.764C65.2745 169.27 65.7994 168.89 66.4244 168.621C67.0494 168.352 67.7671 168.218 68.5777 168.218C69.1099 168.218 69.6421 168.286 70.1744 168.423C70.7115 168.555 71.2242 168.738 71.7124 168.973L70.98 170.818C70.5796 170.628 70.1768 170.462 69.7715 170.32C69.3662 170.179 68.9683 170.108 68.5777 170.108ZM79.7618 179.08H73.5948V168.372H79.7618V170.232H75.8653V172.583H79.4908V174.444H75.8653V177.205H79.7618V179.08ZM82.003 179.08V168.372H84.2735V177.205H88.6167V179.08H82.003ZM90.4844 179.08V168.372H92.7549V177.205H97.0982V179.08H90.4844Z",fill:"white"}),(0,t.createElement)("path",{d:"M84.9275 99.6943L103.04 72.92H94.185L80.5 93.1416L66.815 72.92H57.96L76.0725 99.6943L57.155 127.66H66.01L80.5 106.247L94.99 127.66H103.845L84.9275 99.6943Z",fill:"white"})),c=(0,t.createElement)("svg",{width:"161",height:"206",viewBox:"0 0 161 206",fill:"none",xmlns:"http://www.w3.org/2000/svg"},(0,t.createElement)("path",{d:"M152.45 37.8027V192.557C152.45 193.709 151.993 194.813 151.181 195.628C150.369 196.442 149.268 196.899 148.12 196.899H12.88C11.732 196.899 10.6308 196.442 9.81867 195.628C9.0065 194.813 8.54999 193.709 8.54999 192.557V13.3834C8.54999 12.2313 9.0065 11.1266 9.81867 10.3123C10.6308 9.49806 11.732 9.04086 12.88 9.04086H123.762L152.45 37.8027Z",fill:"#DD682B",stroke:"#B15322"}),(0,t.createElement)("path",{opacity:"0.2",d:"M151.5 37.596H128.8C127.519 37.596 126.29 37.0858 125.385 36.1776C124.479 35.2695 123.97 34.0378 123.97 32.7535V9.97L151.5 37.596Z",fill:"black"}),(0,t.createElement)("path",{d:"M68.0131 176.528C68.0131 177.163 67.8593 177.714 67.5517 178.183C67.2441 178.652 66.7949 179.013 66.2041 179.267C65.6181 179.521 64.9052 179.648 64.0654 179.648C63.6943 179.648 63.3305 179.624 62.9741 179.575C62.6225 179.526 62.2832 179.455 61.956 179.362C61.6337 179.265 61.3261 179.145 61.0332 179.003V176.894C61.541 177.119 62.0683 177.321 62.6152 177.502C63.1621 177.683 63.7041 177.773 64.2412 177.773C64.6123 177.773 64.9101 177.724 65.1347 177.627C65.3642 177.529 65.5302 177.395 65.6328 177.224C65.7353 177.053 65.7866 176.857 65.7866 176.638C65.7866 176.369 65.6962 176.14 65.5156 175.949C65.3349 175.759 65.0859 175.581 64.7685 175.415C64.456 175.249 64.102 175.07 63.7065 174.88C63.4575 174.763 63.1865 174.621 62.8935 174.455C62.6005 174.284 62.3222 174.077 62.0585 173.833C61.7949 173.588 61.5776 173.293 61.4067 172.946C61.2407 172.595 61.1577 172.175 61.1577 171.687C61.1577 171.047 61.3042 170.5 61.5971 170.046C61.8901 169.592 62.3076 169.245 62.8496 169.006C63.3964 168.762 64.041 168.64 64.7832 168.64C65.3398 168.64 65.8696 168.706 66.3725 168.837C66.8803 168.964 67.4101 169.15 67.9619 169.394L67.2294 171.159C66.7363 170.959 66.2944 170.805 65.9038 170.698C65.5131 170.585 65.1152 170.529 64.7099 170.529C64.4267 170.529 64.185 170.576 63.9848 170.669C63.7846 170.756 63.6333 170.883 63.5307 171.049C63.4282 171.21 63.3769 171.398 63.3769 171.613C63.3769 171.867 63.4501 172.082 63.5966 172.258C63.748 172.429 63.9726 172.595 64.2705 172.756C64.5732 172.917 64.9492 173.105 65.3984 173.32C65.9453 173.579 66.4116 173.85 66.7973 174.133C67.1879 174.411 67.4882 174.741 67.6982 175.122C67.9082 175.498 68.0131 175.966 68.0131 176.528ZM69.9541 179.502V168.794H72.2246V177.627H76.5678V179.502H69.9541ZM78.4355 179.502V168.794H80.706V179.502H78.4355ZM92.2856 174.045C92.2856 175.251 92.0537 176.259 91.5898 177.07C91.1308 177.876 90.4643 178.483 89.5903 178.894C88.7163 179.299 87.664 179.502 86.4335 179.502H83.4013V168.794H86.7631C87.8862 168.794 88.8603 168.994 89.6855 169.394C90.5107 169.79 91.1503 170.378 91.6044 171.159C92.0585 171.936 92.2856 172.898 92.2856 174.045ZM89.9272 174.104C89.9272 173.313 89.81 172.663 89.5756 172.155C89.3461 171.643 89.0043 171.264 88.5502 171.02C88.101 170.776 87.5444 170.654 86.8803 170.654H85.6718V177.627H86.6459C87.7543 177.627 88.5771 177.331 89.1142 176.74C89.6562 176.149 89.9272 175.271 89.9272 174.104ZM100.672 179.502H94.5048V168.794H100.672V170.654H96.7753V173.005H100.401V174.865H96.7753V177.627H100.672V179.502Z",fill:"white"}),(0,t.createElement)("path",{d:"M80.5 111.848C87.332 111.848 93.8841 109.127 98.7151 104.283C103.546 99.44 106.26 92.8709 106.26 86.0212H80.5V60.1944C73.668 60.1944 67.1159 62.9154 62.2849 67.7589C57.454 72.6024 54.74 79.1715 54.74 86.0212C54.74 92.8709 57.454 99.44 62.2849 104.283C67.1159 109.127 73.668 111.848 80.5 111.848Z",fill:"white"}),(0,t.createElement)("path",{d:"M85.33 55.3519V81.1787H111.09C111.09 74.329 108.376 67.7598 103.545 62.9164C98.7141 58.0729 92.162 55.3519 85.33 55.3519Z",fill:"white"}),(0,t.createElement)("path",{d:"M120.75 144.131H40.25V147.36H120.75V144.131Z",fill:"white"}),(0,t.createElement)("path",{d:"M120.75 134.446H40.25V137.675H120.75V134.446Z",fill:"white"}),(0,t.createElement)("path",{d:"M120.75 124.761H40.25V127.99H120.75V124.761Z",fill:"white"})),d=(0,t.createElement)("svg",{width:"163",height:"205",viewBox:"0 0 163 205",fill:"none",xmlns:"http://www.w3.org/2000/svg"},(0,t.createElement)("path",{d:"M154.4 37.126V192.087C154.4 193.371 153.888 194.603 152.977 195.511C152.065 196.419 150.829 196.929 149.54 196.929H13.46C12.171 196.929 10.9349 196.419 10.0234 195.511C9.11201 194.603 8.59998 193.371 8.59998 192.087V12.9134C8.59998 11.6291 9.11201 10.3974 10.0234 9.4892C10.9349 8.58105 12.171 8.07086 13.46 8.07086H125.24L154.4 37.126Z",fill:"#F8F8F8"}),(0,t.createElement)("path",{opacity:"0.2",d:"M125.24 8.07086H13.46C12.171 8.07086 10.9349 8.58105 10.0234 9.4892C9.11201 10.3974 8.59998 11.6291 8.59998 12.9134V192.087C8.59998 193.371 9.11201 194.603 10.0234 195.511C10.9349 196.419 12.171 196.929 13.46 196.929H149.54C150.829 196.929 152.065 196.419 152.977 195.511C153.888 194.603 154.4 193.371 154.4 192.087V37.126L125.24 8.07086ZM152.78 192.087C152.78 192.943 152.439 193.764 151.831 194.369C151.223 194.975 150.399 195.315 149.54 195.315H13.46C12.6007 195.315 11.7766 194.975 11.1689 194.369C10.5613 193.764 10.22 192.943 10.22 192.087V12.9134C10.22 12.0572 10.5613 11.236 11.1689 10.6306C11.7766 10.0252 12.6007 9.68504 13.46 9.68504H124.576L125.24 10.3468V32.2835C125.24 33.5678 125.752 34.7995 126.663 35.7076C127.575 36.6158 128.811 37.126 130.1 37.126H152.116L152.78 37.7878V192.087Z",fill:"black"}),(0,t.createElement)("g",{opacity:"0.2"},(0,t.createElement)("path",{opacity:"0.2",d:"M122 138.819H81.5V142.047H122V138.819Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.2",d:"M122 129.134H41V132.362H122V129.134Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.2",d:"M122 119.449H41V122.677H122V119.449Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.2",d:"M122 109.764H41V112.992H122V109.764Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.2",d:"M122 100.079H41V103.307H122V100.079Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.2",d:"M79.88 69.4094H41V72.6378H79.88V69.4094Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.2",d:"M71.78 59.7244H41V62.9527H71.78V59.7244Z",fill:"black"}))),h=window.wp.element,p={height:"500px"},w=(0,t.createElement)("svg",{width:"66",height:"60",viewBox:"0 0 66 60",fill:"black",xmlns:"http://www.w3.org/2000/svg"},(0,t.createElement)("path",{opacity:"0.5",fillRule:"evenodd",clipRule:"evenodd",d:"M28.9406 59.2644L2.20792 46.9066C-0.0693069 45.8277 -0.0693069 44.1604 2.20792 43.1796L11.5148 38.8642L28.8416 46.9066C31.1188 47.9854 34.7822 47.9854 36.9604 46.9066L54.2871 38.8642L63.5941 43.1796C65.8713 44.2585 65.8713 45.9258 63.5941 46.9066L36.8614 59.2644C34.7822 60.2452 31.1188 60.2452 28.9406 59.2644Z",fill:"black"}),(0,t.createElement)("path",{opacity:"0.75",fillRule:"evenodd",clipRule:"evenodd",d:"M28.9406 44.0606L2.20792 31.7028C-0.069307 30.6239 -0.069307 28.9566 2.20792 27.9758L11.3168 23.7584L28.9406 31.8989C31.2178 32.9778 34.8812 32.9778 37.0594 31.8989L54.6832 23.7584L63.7921 27.9758C66.0693 29.0547 66.0693 30.722 63.7921 31.7028L37.0594 44.0606C34.7822 45.1395 31.1188 45.1395 28.9406 44.0606Z",fill:"black"}),(0,t.createElement)("path",{fillRule:"evenodd",clipRule:"evenodd",d:"M28.9406 29.2518L2.20792 16.8939C-0.069307 15.8151 -0.069307 14.1478 2.20792 13.167L28.9406 0.809144C31.2178 -0.269715 34.8812 -0.269715 37.0594 0.809144L63.7921 13.167C66.0693 14.2458 66.0693 15.9132 63.7921 16.8939L37.0594 29.2518C34.7822 30.2325 31.1188 30.2325 28.9406 29.2518Z",fill:"black"}));(0,l.registerBlockType)(n.UU,{icon:w,edit:({attributes:e,setAttributes:l})=>{const[n,h]=(0,t.useState)(null),w=["core/bold","core/image","core/italic","core/strikethrough","core/text-color","core/code","core/keyboard","core/subscript","core/superscript"];let s=[];const m=[{label:(0,o.__)("Embedded","onlyoffice-plugin"),value:"embedded"},{label:(0,o.__)("Link"),value:"link"}];(0,t.useEffect)((()=>{e.id&&ONLYOFFICE.formatsUtils.getFileName(e.id).then((e=>{const t=ONLYOFFICE.formatsUtils.getDocumentType(e);h(t)}))}),[e.id]),e.hasOwnProperty("width")&&e.width.length>0&&(p.width=e.width),e.hasOwnProperty("height")&&e.height.length>0&&(p.height=e.height);let H=!0;"full"===e.align&&(delete p.width,H=!1);const f=function(e){var t=ONLYOFFICE.mimeTypes;if(void 0!==t[e])return t[e];for(var l in t)if(-1!==l.indexOf(e))return t[l];return!1};for(let e of ONLYOFFICE.formatsUtils.getViewableExtensions()){let t=f(e);t&&s.push(t)}const u="link"!==e.documentView&&e.id?(0,i.useBlockProps)({style:p}):(0,i.useBlockProps)({style:null});return(0,t.createElement)("div",{...u},e.id?(0,t.createElement)(t.Fragment,null,(0,t.createElement)(i.InspectorControls,{key:"setting"},(0,t.createElement)(a.PanelBody,{title:(0,o.__)("Settings")},(0,t.createElement)(a.__experimentalInputControl,{label:(0,o.__)("Name"),value:e.fileName,onChange:e=>l({fileName:e})}),(0,t.createElement)(a.SelectControl,{label:(0,o.__)("Document view","onlyoffice-plugin"),value:e.documentView,options:m,onChange:e=>{l({documentView:e})}}),"link"===e.documentView?(0,t.createElement)("div",null,(0,t.createElement)(a.ToggleControl,{checked:e.inNewTab,label:(0,o.__)("Open in new tab"),onChange:e=>l({inNewTab:e})}),(0,t.createElement)(a.ToggleControl,{checked:e.showOpenButton,label:(0,o.__)("Show Open in ONLYOFFICE button","onlyoffice-plugin"),onChange:e=>l({showOpenButton:e})})):(0,t.createElement)("div",null,H?(0,t.createElement)(i.HeightControl,{label:(0,o.__)("Width","onlyoffice-docspace-plugin"),value:e.width,onChange:e=>l({width:e})}):"",(0,t.createElement)(i.HeightControl,{label:(0,o.__)("Height","onlyoffice-docspace-plugin"),value:e.height,onChange:e=>l({height:e})})))),"link"===e.documentView?(0,t.createElement)("div",null,(0,t.createElement)(i.RichText,{tagName:"a",allowedFormats:w,onChange:e=>l({fileName:e}),value:e.fileName}),e.showOpenButton?(0,t.createElement)("div",{class:"wp-block-onlyoffice-wordpress-onlyoffice__button-richtext-wrapper"},(0,t.createElement)(i.RichText,{tagName:"div",className:"wp-element-button",value:e.openButtonText||(0,o.__)("Open in ONLYOFFICE","onlyoffice-plugin"),allowedFormats:w,onChange:e=>l({openButtonText:e}),placeholder:(0,o.__)("Add text...")})):""):(0,t.createElement)("div",{className:`wp-block-onlyoffice-wordpress-onlyoffice__embedded ${n}`},(0,t.createElement)("div",null,(e=>{switch(e){case"word":return C;case"cell":return r;case"slide":return c;default:return d}})(n),(0,t.createElement)("p",null," ",n?e.fileName||"":(0,o.__)("File not found!","onlyoffice-plugin")))),(0,t.createElement)(i.BlockControls,{group:"other"},(0,t.createElement)(i.MediaReplaceFlow,{mediaId:e.id,allowedTypes:s,accept:s.join(),onSelect:e=>{e&&e.hasOwnProperty("id")&&l({id:e.id,fileName:e.filename||e.guid.raw.substring(e.guid.raw.lastIndexOf("/")+1)})},name:(0,o.__)("Replace")}))):(0,t.createElement)(i.MediaPlaceholder,{labels:{title:"ONLYOFFICE Docs"},allowedTypes:s,accept:s.join(),onSelect:e=>{e&&e.hasOwnProperty("id")&&l({id:e.id,fileName:e.filename||e.guid.raw.substring(e.guid.raw.lastIndexOf("/")+1)})}}))},save:({attributes:e})=>{if(!e.id)return"";let l="";return e.hasOwnProperty("id")&&(l+="id="+e.id+" "),e.hasOwnProperty("documentView")&&e.documentView.length>0&&(l+="documentView="+e.documentView+" "),e.hasOwnProperty("inNewTab")&&(l+="inNewTab="+e.inNewTab+" "),e.hasOwnProperty("align")&&e.align.length>0&&(l+="align="+e.align+" "),e.hasOwnProperty("width")&&e.width.length>0&&(l+="width="+e.width+" "),e.hasOwnProperty("height")&&e.height.length>0&&(l+="height="+e.height+" "),e.hasOwnProperty("showOpenButton")&&(l+="showOpenButton="+e.showOpenButton+" "),e.hasOwnProperty("openButtonText")&&e.openButtonText.length>0&&(l+="openButtonText="+e.openButtonText+" "),(0,t.createElement)(h.RawHTML,null,`[onlyoffice ${l} /]`)}})})();

onlyoffice/trunk/onlyoffice-wordpress-block/src/edit.js

@@ -1 +1 @@
 /*
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  * 
  * This program is free software; you can redistribute it and/or
@@ -23 +23 @@
     MediaReplaceFlow,
     InspectorControls,
+    RichText,
+    HeightControl
 } from '@wordpress/block-editor';
 import {
     PanelBody,
+    ToggleControl,
+    SelectControl,
     __experimentalInputControl as InputControl
 } from '@wordpress/components';
@@ -31 +35 @@
 import { blockStyle } from "./index";
 import { __ } from '@wordpress/i18n';
+import { useState, useEffect } from 'react';
+import { getLogoByDocumentType } from "./logos";
 
 const Edit = ({attributes, setAttributes}) => {
-    const onlyofficeAllowedExts = oo_media.formats;
+    const [documentType, setDocumentType] = useState(null);
+
+    const richTextAllowedFormats = [ 'core/bold', 'core/image', 'core/italic', 'core/strikethrough', 'core/text-color', 'core/code', 'core/keyboard' , 'core/subscript', 'core/superscript' ];
     let onlyofficeAllowedMimes = [];
+    const viewOptions = [
+        {
+            label: __('Embedded', 'onlyoffice-plugin'),
+            value: 'embedded'
+        },
+        {
+            label: __('Link'),
+            value: 'link'
+        }
+    ];
+
+    useEffect(() => {
+        if (attributes.id) {
+            ONLYOFFICE.formatsUtils.getFileName(attributes.id).then((fileName) => {
+                const documentType = ONLYOFFICE.formatsUtils.getDocumentType(fileName);
+                setDocumentType(documentType);
+            });
+        }
+    }, [attributes.id]);
+
+    if (attributes.hasOwnProperty('width') && attributes.width.length > 0) {
+        blockStyle.width = attributes.width;
+    }
+
+    if (attributes.hasOwnProperty('height') && attributes.height.length > 0) {
+        blockStyle.height = attributes.height;
+    }
+
+    let showWidthControl = true;
+
+    if (attributes.align === "full") {
+        delete blockStyle.width;
+        showWidthControl = false;
+    }
 
     const getMimeType = function( name ) {
-        var allTypes = oo_media.mimeTypes;
+        var allTypes = ONLYOFFICE.mimeTypes;
 
         if (allTypes[name] !== undefined) {
@@ -52 +94 @@
     };
 
-    for (let ext of onlyofficeAllowedExts) {
+    for (let ext of ONLYOFFICE.formatsUtils.getViewableExtensions()) {
         let mimeType = getMimeType(ext);
 
@@ -60 +102 @@
     }
 
-    const blockProps = useBlockProps( { style: blockStyle } );
+    const blockProps = attributes.documentView === 'link' || ! attributes.id ?  useBlockProps( { style: null } ) : useBlockProps( { style: blockStyle } );
     return (
-        attributes.id ?
-            <div {...blockProps}>
+        <div {...blockProps}>
+        {attributes.id ?
+            <>
                 <InspectorControls key="setting">
                     <PanelBody title={__('Settings')}>
                         <InputControl label={__('Name')} value={attributes.fileName} onChange={ ( value ) => setAttributes({ fileName: value }) } />
+                        <SelectControl
+                            label={__('Document view', 'onlyoffice-plugin')}
+                            value={attributes.documentView}
+                            options={viewOptions}
+                            onChange={(value) => {setAttributes({ documentView: value })}}
+                            />
+                        {
+                            attributes.documentView === 'link' ?
+                                <div>
+                                    <ToggleControl
+                                        checked={attributes.inNewTab}
+                                        label={__('Open in new tab')}
+                                        onChange={(value) => setAttributes({ inNewTab: value })} 
+                                        />
+                                    <ToggleControl
+                                        checked={attributes.showOpenButton}
+                                        label={__('Show Open in ONLYOFFICE button', 'onlyoffice-plugin')}
+                                        onChange={(value) => setAttributes({ showOpenButton: value })} 
+                                        />
+                                </div>
+                                :
+                                <div>
+                                    {
+                                        showWidthControl ?
+                                            <HeightControl label={ __("Width", "onlyoffice-docspace-plugin") } value={attributes.width} onChange={ ( value ) => setAttributes({ width: value }) }/>
+                                            :
+                                            ''
+                                        }
+                                    <HeightControl label={ __("Height", "onlyoffice-docspace-plugin") } value={attributes.height} onChange={ ( value ) => setAttributes({ height: value }) }/>
+                                </div>
+                        }
                     </PanelBody>
                 </InspectorControls>
 
-                <p style={{display: 'flex'}}>
-                    {onlyofficeIcon}
-                    <p style={{marginLeft: '25px'}}> {attributes.fileName || ""}</p>
-                </p>
-                <BlockControls>
+                {
+                    attributes.documentView === 'link' ?
+                        <div>
+                            <RichText
+                                tagName="a"
+                                allowedFormats={ richTextAllowedFormats } 
+                                onChange={ ( value ) => setAttributes({ fileName: value }) }
+                                value={ attributes.fileName }
+                            />
+                            {
+                                attributes.showOpenButton ?
+                                    <div class="wp-block-onlyoffice-wordpress-onlyoffice__button-richtext-wrapper">
+                                        <RichText
+                                            tagName="div"
+                                            className = {'wp-element-button'}
+                                            value= { attributes.openButtonText || __('Open in ONLYOFFICE', 'onlyoffice-plugin') }
+                                            allowedFormats={ richTextAllowedFormats }
+                                            onChange={ ( openButtonText ) => setAttributes( { openButtonText } ) }
+                                            placeholder={ __('Add text...') }
+                                        />
+                                    </div>
+                                    :
+                                    ''
+                            }
+                        </div>
+
+                        :
+                        <div className={ `wp-block-onlyoffice-wordpress-onlyoffice__embedded ${documentType}`}>
+                            <div>
+                                {getLogoByDocumentType(documentType)}
+                                <p> {documentType ? attributes.fileName || "" : __('File not found!', 'onlyoffice-plugin')}</p>
+                            </div>
+                        </div>
+                }
+
+                <BlockControls group="other">
                     <MediaReplaceFlow
                         mediaId={ attributes.id }
@@ -87 +192 @@
                     />
                 </BlockControls>
-            </div>
+            </>
             :
             <MediaPlaceholder
-                labels={{title: 'ONLYOFFICE'}}
+                labels={{title: 'ONLYOFFICE Docs'}}
                 allowedTypes={onlyofficeAllowedMimes}
                 accept={onlyofficeAllowedMimes.join()}
@@ -99 +204 @@
                 }}
             />
+        }
+        </div>
     )
 };

onlyoffice/trunk/onlyoffice-wordpress-block/src/index.js

@@ -1 +1 @@
 /*
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  * 
  * This program is free software; you can redistribute it and/or
@@ -19 +19 @@
 import { registerBlockType } from '@wordpress/blocks';
 
+import "./styles.css"
+
 import block from '../block.json';
 import edit from './edit';
@@ -24 +26 @@
 
 export const blockStyle = {
-    padding: '20px',
+    height: '500px',
 };
 

onlyoffice/trunk/onlyoffice-wordpress-block/src/save.js

@@ -1 +1 @@
 /*
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  * 
  * This program is free software; you can redistribute it and/or
@@ -20 +20 @@
 
 const Save = ( { attributes } ) => {
-    return <RawHTML>{ `[onlyoffice id=${ attributes.id } /]` }</RawHTML>;
+    if ( !attributes.id ) {
+        return '';
+    }
+
+    let parameters = '';
+
+    if ( attributes.hasOwnProperty('id')) {
+        parameters += 'id=' + attributes.id + ' ';
+    }
+
+    if ( attributes.hasOwnProperty('documentView') && attributes.documentView.length > 0 ) {
+        parameters += 'documentView=' + attributes.documentView + ' ';
+    }
+
+    if ( attributes.hasOwnProperty('inNewTab')) {
+        parameters += 'inNewTab=' + attributes.inNewTab + ' ';
+    }
+
+    if ( attributes.hasOwnProperty('align') && attributes.align.length > 0 ) {
+        parameters += 'align=' + attributes.align + ' ';
+    }
+
+    if ( attributes.hasOwnProperty('width') && attributes.width.length > 0 ) {
+        parameters += 'width=' + attributes.width + ' ';
+    }
+
+    if ( attributes.hasOwnProperty('height') && attributes.height.length > 0 ) {
+        parameters += 'height=' + attributes.height + ' ';
+    }
+
+    if ( attributes.hasOwnProperty('showOpenButton') ) {
+        parameters += 'showOpenButton=' + attributes.showOpenButton + ' ';
+    }
+
+    if ( attributes.hasOwnProperty('openButtonText') && attributes.openButtonText.length > 0 ) {
+        parameters += 'openButtonText=' + attributes.openButtonText + ' ';
+    }
+
+    return <RawHTML>{ `[onlyoffice ${ parameters } /]` }</RawHTML>;
 };
 export default Save;

onlyoffice/trunk/onlyoffice-wordpress.php

@@ -5 +5 @@
  * @package           Onlyoffice_Plugin
  *
- * Plugin Name:       ONLYOFFICE
+ * Plugin Name:       ONLYOFFICE Docs
  * Plugin URI:        https://github.com/ONLYOFFICE/onlyoffice-wordpress
- * Description:       Add ONLYOFFICE editor on page
- * Version:           1.1.0
+ * Description:       Add ONLYOFFICE Docs blocks to posts to allow your site visitors to view the inserted file without downloading. Edit and collaborate on office documents from the admin dashboard.
+ * Version:           2.0.0
  * Requires at least: 5.7
  * Requires PHP:      7.4
@@ -21 +21 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -41 +41 @@
  * Currently plugin version.
  */
-define( 'ONLYOFFICE_PLUGIN_VERSION', '1.1.0' );
+define( 'ONLYOFFICE_PLUGIN_NAME', 'onlyoffice-plugin' );
+define( 'ONLYOFFICE_PLUGIN_VERSION', '2.0.0' );
 define( 'ONLYOFFICE_PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define( 'ONLYOFFICE_PLUGIN_FILE', __FILE__ );
 
 
@@ -66 +68 @@
  */
 function uninstall_onlyoffice_wordpress_plugin() {
-    delete_option( 'onlyoffice_settings' );
-    delete_option( 'onlyoffice-plugin-uuid' );
-    delete_option( 'onlyoffice-plugin-bytes' );
+    delete_site_option( 'onlyoffice_settings' );
+    delete_site_option( 'onlyoffice-plugin-uuid' );
+    delete_site_option( 'onlyoffice-plugin-bytes' );
+    delete_site_option( 'onlyoffice-formats' );
 }
 
@@ -99 +102 @@
 
 /**
- * Data about additional ONLYOFFICE formats.
+ * Data about additional ONLYOFFICE Docs formats.
  *
  * @since    2.0.0
@@ -107 +110 @@
  */
 function onlyoffice_forms_mime_types( $mimes ) {
-    $mimes['oform'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform';
     $mimes['docxf'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf';
 
@@ -127 +129 @@
     $ext = pathinfo( $filename, PATHINFO_EXTENSION );
     switch ( $ext ) {
-        case 'oform':
-            $data['ext']  = 'oform';
-            $data['type'] = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform';
-            break;
         case 'docxf':
             $data['ext']  = 'docxf';

onlyoffice/trunk/public/assets/document-formats/CHANGELOG.md

@@ -1 +1 @@
 # Change Log
 
+##
+- fb2 additional mime
+
+## 1.1.0
+- filling pdf
 - conversion formats for txt, csv
 - formats for auto conversion

onlyoffice/trunk/public/assets/document-formats/onlyoffice-docs-formats.json

@@ -32 +32 @@
         "type": "word",
         "actions": ["view", "edit"],
-        "convert": ["docx", "bmp", "docm", "dotm", "dotx", "epub", "fb2", "gif", "html", "jpg", "odt", "oform", "ott", "pdf", "pdfa", "png", "rtf", "txt"],
+        "convert": ["docx", "bmp", "docm", "dotm", "dotx", "epub", "fb2", "gif", "html", "jpg", "odt", "ott", "pdf", "pdfa", "png", "rtf", "txt"],
         "mime": ["application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf"]
     },
@@ -68 +68 @@
         "actions": ["view", "lossy-edit", "auto-convert"],
         "convert": ["docx", "docxf", "bmp", "docm", "dotm", "dotx", "epub", "gif", "html", "jpg", "odt", "ott", "pdf", "pdfa", "png", "rtf", "txt"],
-        "mime": ["text/fb2+xml"]
+        "mime": ["text/fb2+xml", "application/x-fictionbook+xml"]
     },
     {
@@ -115 +115 @@
         "name": "oform",
         "type": "word",
-        "actions": ["view", "fill"],
+        "actions": ["view"],
         "convert": ["pdf"],
         "mime": ["application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform"]
@@ -136 +136 @@
         "name": "pdf",
         "type": "word",
-        "actions": ["view"],
+        "actions": ["view", "fill"],
         "convert": ["docx", "docxf", "bmp", "docm", "dotm", "dotx", "epub", "fb2", "gif", "html", "jpg", "odt", "ott", "pdfa", "png", "rtf", "txt"],
         "mime": ["application/pdf", "application/acrobat", "application/nappdf", "application/x-pdf", "image/pdf"]
@@ -398 +398 @@
         "convert": ["pptx", "bmp", "gif", "jpg", "odp", "otp", "pdf", "pdfa", "png", "potm", "potx", "ppsm", "ppsx", "pptm"],
         "mime": ["application/vnd.sun.xml.impress"]
+    },
+    {
+        "name": "bmp",
+        "type": "",
+        "actions": [],
+        "convert": [],
+        "mime": ["image/bmp"]
+    },
+    {
+        "name": "gif",
+        "type": "",
+        "actions": [],
+        "convert": [],
+        "mime": ["image/gif"]
+    },
+    {
+        "name": "jpg",
+        "type": "",
+        "actions": [],
+        "convert": [],
+        "mime": ["image/jpeg"]
+    },
+    {
+        "name": "pdfa",
+        "type": "",
+        "actions": [],
+        "convert": [],
+        "mime": ["application/pdf", "application/acrobat", "application/nappdf", "application/x-pdf", "image/pdf"]
+    },
+    {
+        "name": "png",
+        "type": "",
+        "actions": [],
+        "convert": [],
+        "mime": ["image/png"]
+    },
+    {
+        "name": "zip",
+        "type": "",
+        "actions": [],
+        "convert": [],
+        "mime": ["application/zip"]
     }
 ]

onlyoffice/trunk/public/class-onlyoffice-plugin-public.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -42 +42 @@
 
     /**
-     * The ID of this plugin.
-     *
-     * @since    1.0.0
-     * @access   private
-     * @var      string    $plugin_name    The ID of this plugin.
-     */
-    private $plugin_name;
-
-    /**
-     * The version of this plugin.
-     *
-     * @since    1.0.0
-     * @access   private
-     * @var      string    $version    The current version of this plugin.
-     */
-    private $version;
-
-    /**
-     * Initialize the class and set its properties.
-     *
-     * @since    1.0.0
-     * @param      string $plugin_name       The name of the plugin.
-     * @param      string $version    The version of this plugin.
-     */
-    public function __construct( $plugin_name, $version ) {
-        $this->plugin_name = $plugin_name;
-        $this->version     = $version;
-    }
-
-    /**
      * Register the stylesheets for the public-facing side of the site.
      *
@@ -95 +65 @@
         require_once plugin_dir_path( __FILE__ ) . 'views/class-onlyoffice-plugin-callback.php';
         require_once plugin_dir_path( __FILE__ ) . 'views/class-onlyoffice-plugin-download.php';
-        require_once plugin_dir_path( __FILE__ ) . 'views/class-onlyoffice-plugin-editor.php';
 
         $callback = new Onlyoffice_Plugin_Callback();
         $download = new Onlyoffice_Plugin_Download();
-        $editor   = new Onlyoffice_Plugin_Editor();
 
         // "oo."-prefix is needed to keep the connector working in conjunction with the plugin "Force Lowercase URLs"
         // (https://wordpress.org/plugins/force-lowercase-urls/)
-
-        register_rest_route(
-            'onlyoffice',
-            '/oo.editor/(?P<id>[^\/\n\r]+)',
-            array(
-                'methods'             => WP_REST_Server::READABLE,
-                'callback'            => array( $editor, 'editor' ),
-                'permission_callback' => array( $this, 'check_attachment_id' ),
-            )
-        );
 
         register_rest_route(

onlyoffice/trunk/public/views/class-onlyoffice-plugin-callback.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -113 +113 @@
         $param = urldecode( str_replace( ',', '%', $req->get_params()['id'] ) );
 
-        $attachemnt_id = intval( Onlyoffice_Plugin_Url_Manager::decode_openssl_data( $param, get_option( 'onlyoffice-plugin-uuid' ) ) );
+        $attachemnt_id = intval( Onlyoffice_Plugin_Url_Manager::decode_openssl_data( $param, get_site_option( 'onlyoffice-plugin-uuid' ) ) );
         $user_id       = isset( $body['actions'] ) ? $body['actions'][0]['userid'] : null;
 
@@ -136 +136 @@
                 break;
             case 'MustSave':
-                $can_edit = Onlyoffice_Plugin_Document_Manager::has_edit_capability( $attachemnt_id );
+                $can_edit = Onlyoffice_Plugin_Document_Manager::can_user_edit_attachment( $attachemnt_id );
                 if ( ! $can_edit ) {
                     wp_die( 'No edit capability', '', array( 'response' => 403 ) );

onlyoffice/trunk/public/views/class-onlyoffice-plugin-download.php

@@ -12 +12 @@
 /**
  *
- * (c) Copyright Ascensio System SIA 2023
+ * (c) Copyright Ascensio System SIA 2024
  *
  * This program is free software; you can redistribute it and/or
@@ -43 +43 @@
      * @param array $req The request.
      *
-     * @return void
+     * @return void|WP_Error
      */
     public function get_file( $req ) {
+        global $wp_filesystem;
 
         if ( Onlyoffice_Plugin_JWT_Manager::is_jwt_enabled() ) {
@@ -91 +92 @@
         }
 
-        $filepath = get_attached_file( $attachment_id );
+        if ( ! function_exists( 'WP_Filesystem' ) ) {
+            include ABSPATH . '/wp-admin/includes/file.php';
+        }
 
-        header( 'Content-Length: ' . filesize( $filepath ) );
-        header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . urldecode( basename( $filepath ) ) );
-        header( 'Content-Type: ' . Onlyoffice_Plugin_Document_Manager::get_mime_type( $filepath ) );
+        if ( ! WP_Filesystem() ) {
+            return new WP_Error( 'filesystem_error', 'Unable to initialize the filesystem.' );
+        }
 
-        readfile( $filepath );
-        flush();
-        exit;
+        $file_path = get_attached_file( $attachment_id );
+
+        if ( $wp_filesystem->is_file( $file_path ) ) {
+            header( 'Content-Length: ' . filesize( $file_path ) );
+            header( 'Content-Disposition: attachment; filename*=UTF-8\'\'' . urldecode( basename( $file_path ) ) );
+            header( 'Content-Type: ' . Onlyoffice_Plugin_Document_Manager::get_mime_type( $file_path ) );
+
+            $file_content = $wp_filesystem->get_contents( $file_path );
+            echo $file_content; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+
+            exit;
+        } else {
+                return new WP_Error( 'file_not_found', 'File not found.' );
+        }
     }
 }

onlyoffice/trunk/readme.txt

@@ -1 @@
-=== ONLYOFFICE ===
+=== ONLYOFFICE Docs ===
 Contributors: onlyoffice
-Tags: onlyoffice, integration, collaboration, editor, office, document, spreadsheet, presentation
+Tags: onlyoffice, collaboration, editor, office, document, spreadsheet, presentation, forms, pdf
 Requires at least: 5.7
 Tested up to: 6.1
-Stable tag: 1.1.0
+Stable tag: 2.0.0
 Requires PHP: 7.4
 License: GPLv2
 License URI: https://github.com/ONLYOFFICE/onlyoffice-wordpress/blob/main/LICENSE
 
-ONLYOFFICE plugin allows users to edit and view office documents from WordPress using ONLYOFFICE Docs.
+ONLYOFFICE Docs plugin allows users to edit and view office documents from WordPress using ONLYOFFICE Docs.
 
 == Description ==
 
-ONLYOFFICE integration plugin allows WordPress administrators to open documents, spreadsheets, and presentations for collaborative editing using ONLYOFFICE Docs (online document editors). In published posts, the editors are visible to all WordPress site visitors (both authorized and unauthorized) in the Embedded mode only.
+ONLYOFFICE Docs integration plugin allows WordPress administrators to open documents, spreadsheets, and presentations for collaborative editing using ONLYOFFICE Docs (online document editors). In published posts, the editors are visible to all WordPress site visitors (both authorized and unauthorized) in the Embedded mode only.
 
 **Editing files uploaded to Wordpress**
 
-All uploaded files from the Media section will appear on the ONLYOFFICE -> Files page. The editor opens in the same tab by clicking on the file name. Users with administrator rights are able to co-edit documents. All the changes are saved in the same file.
+All uploaded files from the Media section will appear on the ONLYOFFICE Docs -> Files page. The editor opens in the same tab by clicking on the file name. Users with administrator rights are able to co-edit documents. All the changes are saved in the same file.
 
 **Creating a post**
 
-When creating a post, you can add the ONLYOFFICE element (block) and then upload a new file or select one from the Media Library. The added file will be displayed as the ONLYOFFICE logo with the file name in the currently edited post. After the post is published (when you press the Publish or Update button), your WordPress site visitors will have access to this file for viewing in the Embedded mode.
+When creating a post, you can add the ONLYOFFICE Docs element (block) and then upload a new file or select one from the Media Library. The added file will be displayed as the ONLYOFFICE logo with the file name in the currently edited post. After the post is published (when you press the Publish or Update button), your WordPress site visitors will have access to this file for viewing in the Embedded mode.
 
 == Frequently Asked Questions ==
@@ -31 +31 @@
 = How to configure the plugin? =
 
-Go to WordPress administrative dashboard -> ONLYOFFICE -> Settings. Specify the URL of the installed ONLYOFFICE Document Server and the Secret key.
+Go to WordPress administrative dashboard -> ONLYOFFICE Docs -> Settings. Specify the URL of the installed ONLYOFFICE Document Server and the Secret key.
 
 Please note: Starting from version 7.2 of ONLYOFFICE Docs, JWT is enabled by default and the secret key is generated automatically to restrict the access to ONLYOFFICE Docs and for security reasons and data integrity. Specify your own secret key in the WordPress administrative configuration. In the ONLYOFFICE Docs [config file](https://api.onlyoffice.com/editors/signature/), specify the same secret key and enable the validation.
@@ -41 +41 @@
 == Screenshots ==
 
-1. ONLYOFFICE plugin configuration settings within the WordPress administrative dashboard.
-2. ONLYOFFICE -> Files page within the WordPress administrative dashboard.
-3. ONLYOFFICE document editor opened from the WordPress admin dashboard.
-4. Adding ONLYOFFICE block when creating a post.
-5. Uploading a new file or selecting one from the Media Library to the ONLYOFFICE block.
+1. ONLYOFFICE Docs plugin configuration settings within the WordPress administrative dashboard.
+2. ONLYOFFICE Docs -> Files page within the WordPress administrative dashboard.
+3. ONLYOFFICE Docs editor opened from the WordPress admin dashboard.
+4. Adding ONLYOFFICE Docs block when creating a post.
+5. Uploading a new file or selecting one from the Media Library to the ONLYOFFICE Docs block.
 6. Added file displayed as the ONLYOFFICE logo with the file name in the currently edited post.
 7. ONLYOFFICE file available for viewing in the Embedded mode to the WordPress site visitors.
 
 == Changelog ==
+= 2.0.0 =
+* multisite support
+* stub for onlyoffice-wordpress-block that displays error information if the document server is not accessible or the file is not found 
+* settings for onlyoffice block (width, height, align, show open in onlyoffice button)
+* button copy link to editor, in the table with files
+* ability to insert a link to the editor on the page
+* access for an anonymous user, open the document for viewing in the editor if the document is attached to a public post
+* filling pdf
+* editor url
+* displaying the onlyoffice-wordpress-block component in the Gutenberg editor
+* remove filling for oform
+* supported formats updated
+
+= 1.1.0 =
+* extended list of supported formats
+* support docxf and oform formats
+* support for the connector to work in conjunction with the plugin "Force Lowercase URLs" (https://wordpress.org/plugins/force-lowercase-urls)
+* setting authorization header
+* compatible with classic editor TinyMCE
+* Link to docs cloud
 
 = 1.0.2 =
@@ -65 +85 @@
 * set favicon on editor page
 * added goBack url for document editor
-
-== Upgrade Notice ==
-
-= 1.0 =
-This is the first version of the plugin.

onlyoffice/trunk/vendor/autoload.php

@@ -23 +23 @@
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit38bfbb3e5772cda36e94ef9ca1a3fa4f::getLoader();
+return ComposerAutoloaderInit233fba0d7a41b0f5c532bee7586a2e7b::getLoader();

onlyoffice/trunk/vendor/composer/autoload_real.php

@@ -3 +3 @@
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit38bfbb3e5772cda36e94ef9ca1a3fa4f
+class ComposerAutoloaderInit233fba0d7a41b0f5c532bee7586a2e7b
 {
     private static $loader;
@@ -25 +25 @@
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit38bfbb3e5772cda36e94ef9ca1a3fa4f', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit233fba0d7a41b0f5c532bee7586a2e7b', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit38bfbb3e5772cda36e94ef9ca1a3fa4f', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit233fba0d7a41b0f5c532bee7586a2e7b', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit38bfbb3e5772cda36e94ef9ca1a3fa4f::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit233fba0d7a41b0f5c532bee7586a2e7b::getInitializer($loader));
 
         $loader->register(true);

onlyoffice/trunk/vendor/composer/autoload_static.php

@@ -5 +5 @@
 namespace Composer\Autoload;
 
-class ComposerStaticInit38bfbb3e5772cda36e94ef9ca1a3fa4f
+class ComposerStaticInit233fba0d7a41b0f5c532bee7586a2e7b
 {
     public static $prefixLengthsPsr4 = array (
@@ -28 +28 @@
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit38bfbb3e5772cda36e94ef9ca1a3fa4f::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit38bfbb3e5772cda36e94ef9ca1a3fa4f::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit38bfbb3e5772cda36e94ef9ca1a3fa4f::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit233fba0d7a41b0f5c532bee7586a2e7b::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit233fba0d7a41b0f5c532bee7586a2e7b::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit233fba0d7a41b0f5c532bee7586a2e7b::$classMap;
 
         }, null, ClassLoader::class);

onlyoffice/trunk/vendor/composer/installed.json

@@ -3 +3 @@
         {
             "name": "firebase/php-jwt",
-            "version": "v6.9.0",
-            "version_normalized": "6.9.0.0",
+            "version": "v6.10.0",
+            "version_normalized": "6.10.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/firebase/php-jwt.git",
-                "reference": "f03270e63eaccf3019ef0f32849c497385774e11"
+                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/f03270e63eaccf3019ef0f32849c497385774e11",
-                "reference": "f03270e63eaccf3019ef0f32849c497385774e11",
+                "url": "https://api.github.com/repos/firebase/php-jwt/zipball/a49db6f0a5033aef5143295342f1c95521b075ff",
+                "reference": "a49db6f0a5033aef5143295342f1c95521b075ff",
                 "shasum": ""
             },
@@ -31 +31 @@
                 "paragonie/sodium_compat": "Support EdDSA (Ed25519) signatures when libsodium is not present"
             },
-            "time": "2023-10-05T00:24:42+00:00",
+            "time": "2023-12-01T16:26:39+00:00",
             "type": "library",
             "installation-source": "dist",
@@ -63 +63 @@
             "support": {
                 "issues": "https://github.com/firebase/php-jwt/issues",
-                "source": "https://github.com/firebase/php-jwt/tree/v6.9.0"
+                "source": "https://github.com/firebase/php-jwt/tree/v6.10.0"
             },
             "install-path": "../firebase/php-jwt"

onlyoffice/trunk/vendor/composer/installed.php

@@ -4 +4 @@
         'pretty_version' => 'dev-main',
         'version' => 'dev-main',
-        'reference' => '165dea0488ea93230789f01c30f2fa34fa319c15',
+        'reference' => 'eb4282d29affcb188143d0992bcc70993ad7578d',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -14 +14 @@
             'pretty_version' => 'dev-main',
             'version' => 'dev-main',
-            'reference' => '165dea0488ea93230789f01c30f2fa34fa319c15',
+            'reference' => 'eb4282d29affcb188143d0992bcc70993ad7578d',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
@@ -21 +21 @@
         ),
         'firebase/php-jwt' => array(
-            'pretty_version' => 'v6.9.0',
-            'version' => '6.9.0.0',
-            'reference' => 'f03270e63eaccf3019ef0f32849c497385774e11',
+            'pretty_version' => 'v6.10.0',
+            'version' => '6.10.0.0',
+            'reference' => 'a49db6f0a5033aef5143295342f1c95521b075ff',
             'type' => 'library',
             'install_path' => __DIR__ . '/../firebase/php-jwt',

onlyoffice/trunk/vendor/firebase/php-jwt/CHANGELOG.md

@@ -1 +1 @@
 # Changelog
+
+## [6.10.0](https://github.com/firebase/php-jwt/compare/v6.9.0...v6.10.0) (2023-11-28)
+
+
+### Features
+
+* allow typ header override ([#546](https://github.com/firebase/php-jwt/issues/546)) ([79cb30b](https://github.com/firebase/php-jwt/commit/79cb30b729a22931b2fbd6b53f20629a83031ba9))
 
 ## [6.9.0](https://github.com/firebase/php-jwt/compare/v6.8.1...v6.9.0) (2023-10-04)

onlyoffice/trunk/vendor/firebase/php-jwt/src/JWT.php

@@ -204 +204 @@
         array $head = null
     ): string {
-        $header = ['typ' => 'JWT', 'alg' => $alg];
+        $header = ['typ' => 'JWT'];
+        if (isset($head) && \is_array($head)) {
+            $header = \array_merge($header, $head);
+        }
+        $header['alg'] = $alg;
         if ($keyId !== null) {
             $header['kid'] = $keyId;
-        }
-        if (isset($head) && \is_array($head)) {
-            $header = \array_merge($head, $header);
         }
         $segments = [];