Merge remote-tracking branch 'origin/master'

Author: kprovance

extendify-sdk/app/Admin.php

@@ -128,27 +128,19 @@ public function addScopedScriptsAndStyles()
                 'sitesettings' => json_decode(SiteSettings::data()),
                 'sdk_partner' => \esc_attr(APP::$sdkPartner),
                 'asset_path' => \esc_url(EXTENDIFY_URL . 'public/assets'),
+                'standalone' => \esc_attr(APP::$standalone),
             ]
         );
         \wp_enqueue_script(App::$slug . '-scripts');
 
-        \wp_set_script_translations(App::$slug . '-scripts', App::$textDomain);
+        \wp_set_script_translations(App::$slug . '-scripts', 'extendify');
 
-        \wp_enqueue_style(
-            App::$slug,
-            EXTENDIFY_BASE_URL . 'public/build/extendify.css',
-            [],
-            $version,
-            'all'
-        );
-
-        \wp_enqueue_style(
-            App::$slug . '-utilities',
-            EXTENDIFY_BASE_URL . 'public/build/extendify-utilities.css',
-            [],
-            $version,
-            'all'
-        );
+        // Inline the library styles to keep them out of the iframe live preview.
+        // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
+        $css = file_get_contents(EXTENDIFY_PATH . 'public/build/extendify.css');
+        \wp_register_style(App::$slug, false, [], $version);
+        \wp_enqueue_style(App::$slug);
+        \wp_add_inline_style(App::$slug, $css);
     }
 
     /**
@@ -158,6 +150,10 @@ public function addScopedScriptsAndStyles()
      */
     private function isAdmin()
     {
+        if (\is_multisite()) {
+            return \is_super_admin();
+        }
+
         return in_array('administrator', \wp_get_current_user()->roles, true);
     }
 

extendify-sdk/app/App.php

@@ -42,11 +42,11 @@ class App
     public static $apiVersion = 'v1';
 
     /**
-     * Plugin text domain
+     * Whether this is the standalone plugin
      *
-     * @var string
+     * @var boolean
      */
-    public static $textDomain = '';
+    public static $standalone;
 
     /**
      * Plugin environment
@@ -60,7 +60,7 @@ class App
      *
      * @var string
      */
-    public static $sdkPartner = '';
+    public static $sdkPartner = 'standalone';
 
     /**
      * Host plugin
@@ -83,10 +83,8 @@ class App
      */
     public function __construct()
     {
-        // Set the "partner" plugin/theme here with a fallback to support the previous plugin implementation.
-        self::$sdkPartner = isset($GLOBALS['extendify_sdk_partner']) ? $GLOBALS['extendify_sdk_partner'] : '';
-        if (!self::$sdkPartner && isset($GLOBALS['extendifySdkSourcePlugin'])) {
-            self::$sdkPartner = $GLOBALS['extendifySdkSourcePlugin'];
+        if (isset($GLOBALS['extendify_sdk_partner'])) {
+            self::$sdkPartner = $GLOBALS['extendify_sdk_partner'];
         }
 
         // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents
@@ -103,7 +101,7 @@ public function __construct()
         $isDev = is_readable(EXTENDIFY_PATH . 'node_modules') || is_readable(EXTENDIFY_PATH . '.devbuild');
         self::$environment = $isDev ? 'DEVELOPMENT' : 'PRODUCTION';
 
-        self::$textDomain = Plugin::getPluginInfo('TextDomain', self::$slug);
+        self::$standalone = self::$sdkPartner === 'standalone';
 
         // Add the config.
         // phpcs:ignore WordPress.WP.AlternativeFunctions.file_get_contents_file_get_contents

extendify-sdk/app/Controllers/PluginController.php

@@ -44,14 +44,24 @@ public static function active()
     /**
      * Install plugins
      *
+     * @param \WP_REST_Request $request - The request.
      * @return bool|WP_Error
      */
-    public static function install()
+    public static function install($request)
     {
         if (!\current_user_can('activate_plugins')) {
             return new \WP_Error('not_allowed', \__('You are not allowed to activate plugins on this site.', 'extendify'));
         }
 
+        $requiredPlugins = json_decode($request->get_param('plugins'), true);
+        foreach ($requiredPlugins as $plugin) {
+            $status = Plugin::install_and_activate_plugin($plugin);
+            if (\is_wp_error($status)) {
+                // Return first error encountered.
+                return $status;
+            }
+        }
+
         return true;
     }
 }

extendify-sdk/app/Frontend.php

@@ -58,13 +58,5 @@ function () {
      */
     public function addStylesheets()
     {
-        $version = App::$environment === 'PRODUCTION' ? App::$version : uniqid();
-        \wp_enqueue_style(
-            App::$slug . '-utilities',
-            EXTENDIFY_BASE_URL . 'public/build/extendify-utilities.css',
-            [],
-            $version,
-            'all'
-        );
     }
 }