Multisite Support (#37)

* Add multisite connection configuration handling in fetch_option_connection_objs method

* Add methods for managing default storage connection ID with multisite support

* Enhance default connection ID retrieval with validation check

Author: kodinkat

disciple-tools-storage-api.php

@@ -118,6 +118,25 @@ public static function validate_url( $url ): string {
     public static function fetch_option_connection_objs(): object {
         $option = get_option( self::$option_dt_storage_connection_objects );
 
+        // If multisite, then ensure specified connection configuration is always included.
+        if ( is_multisite() && !empty( get_site_option( 'dt_storage_multisite_connection_object', [] ) ) ) {
+            $multisite_connection_objects = get_site_option( 'dt_storage_multisite_connection_object', [] );
+
+            // Check if there is a valid, specified multisite storage connection.
+            if ( isset( $multisite_connection_objects['id'], $multisite_connection_objects['enabled'], $multisite_connection_objects['name'], $multisite_connection_objects['type'] ) && boolval( $multisite_connection_objects['enabled'] ) ) {
+                $type = $multisite_connection_objects['type'];
+
+                // Ensure identified connection contains a valid type configuration.
+                if ( isset( $multisite_connection_objects[ $type ]['access_key'], $multisite_connection_objects[ $type ]['secret_access_key'], $multisite_connection_objects[ $type ]['region'], $multisite_connection_objects[ $type ]['endpoint'], $multisite_connection_objects[ $type ]['bucket'] ) ) {
+
+                    // Finally, update option, with identified multisite connection.
+                    $decoded_option = json_decode( !empty( $option ) ? $option : '{}' );
+                    $decoded_option->{$multisite_connection_objects['id']} = (object) $multisite_connection_objects;
+                    $option = json_encode( $decoded_option );
+                }
+            }
+        }
+
         if ( ! empty( $option ) ) {
 
             $connection_objs = [];

disciple-tools-storage-filters.php

@@ -6,11 +6,48 @@
 
 class DT_Storage {
 
+    /**
+     * @param string $connection_id
+     * @return bool
+     */
+    public static function update_default_connection_id( string $connection_id ): bool {
+        return update_option( 'dt_storage_connection_id', $connection_id );
+    }
+
+    /**
+     * @return string
+     */
+    public static function get_default_connection_id(): string {
+        $storage_connection_id = dt_get_option( 'dt_storage_connection_id' );
+
+        // Return if a valid storage connection id is found.
+        if ( !empty( $storage_connection_id ) ) {
+            return $storage_connection_id;
+        }
+
+        // Default to multisite global setting, if available; otherwise revert to local settings.
+        if ( is_multisite() && !empty( get_site_option( 'dt_storage_multisite_connection_object', [] ) ) ) {
+            $multisite_connection_objects = get_site_option( 'dt_storage_multisite_connection_object', [] );
+
+            // Check if there is a valid, specified multisite storage connection.
+            if ( isset( $multisite_connection_objects['id'], $multisite_connection_objects['enabled'] ) && boolval( $multisite_connection_objects['enabled'] ) ) {
+
+                // Switch storage connection id to multisite global setting, if currently empty.
+                if ( empty( $storage_connection_id ) ) {
+                    $storage_connection_id = $multisite_connection_objects['id'];
+                    self::update_default_connection_id( $storage_connection_id );
+                }
+            }
+        }
+
+        return $storage_connection_id;
+    }
+
     /**
      * @return object|null
      */
     private static function get_connection(){
-        $storage_connection_id = dt_get_option( 'dt_storage_connection_id' );
+        $storage_connection_id = self::get_default_connection_id();
         if ( empty( $storage_connection_id ) ) {
             return null;
         }