If multisite use network wide option

Related to ActiveCampaign#11
guillaumemolter · Aug 6, 2016 · 9a67361 · 9a67361
1 parent a1b8cd0
commit 9a67361
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 14 deletions.
diff --git a/postmark.php b/postmark.php
@@ -38,19 +38,41 @@ function init() {
 
 
     function load_settings() {
-        $settings = get_option( 'postmark_settings' );
+
+	    // If on a multisite instance, get the network wide option
+	    if ( is_multisite() ){
+			$settings = get_site_option( 'postmark_settings' ); 
+	    }
+	    else {
+		    $settings = get_option( 'postmark_settings' );
+	    }
+
+
 
         if ( false === $settings ) {
-            $settings = array(
-                'enabled'           => get_option( 'postmark_enabled', 0 ),
-                'api_key'           => get_option( 'postmark_api_key', '' ),
-                'sender_address'    => get_option( 'postmark_sender_address', '' ),
-                'force_html'        => get_option( 'postmark_force_html', 0 ),
-                'track_opens'       => get_option( 'postmark_trackopens', 0 )
-            );
-
-            update_option( 'postmark_settings', json_encode( $settings ) );
-
+
+			// If on a multisite instance, update the network wide option
+		    if ( is_multisite() ){
+				$settings = array(
+	                'enabled'           => get_site_option( 'postmark_enabled', 0 ),
+	                'api_key'           => get_site_option( 'postmark_api_key', '' ),
+	                'sender_address'    => get_site_option( 'postmark_sender_address', '' ),
+	                'force_html'        => get_site_option( 'postmark_force_html', 0 ),
+	                'track_opens'       => get_site_option( 'postmark_trackopens', 0 )
+	            );
+				update_site_option( 'postmark_settings', json_encode( $settings ) );
+		    }
+		    else {
+			    $settings = array(
+	                'enabled'           => get_option( 'postmark_enabled', 0 ),
+	                'api_key'           => get_option( 'postmark_api_key', '' ),
+	                'sender_address'    => get_option( 'postmark_sender_address', '' ),
+	                'force_html'        => get_option( 'postmark_force_html', 0 ),
+	                'track_opens'       => get_option( 'postmark_trackopens', 0 )
+	            );
+			    update_option( 'postmark_settings', json_encode( $settings ) );
+		    }
+
             return $settings;
         }
 
@@ -197,8 +219,14 @@ function save_settings() {
         else {
 	        $settings['track_opens'] = 0;
         }
-
-        update_option( 'postmark_settings', json_encode($settings) );
+
+		// If on a multisite instance, get the network wide option
+	    if ( is_multisite() ){
+			update_site_option( 'postmark_settings', json_encode($settings) );
+	    }
+	    else {
+		    update_option( 'postmark_settings', json_encode($settings) );
+	    }
 
         wp_die('Settings saved');
     }

diff --git a/wp-mail.php b/wp-mail.php
@@ -6,7 +6,13 @@ function wp_mail( $to, $subject, $message, $headers = '', $attachments = array()
     // Compact the input, apply the filters, and extract them back out
     extract( apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) ) );
 
-    $settings = json_decode( get_option( 'postmark_settings' ), true );
+    if (is_multisite()){
+	    $settings = json_decode( get_site_option( 'postmark_settings' ), true );
+    }
+    else {
+	    $settings = json_decode( get_option( 'postmark_settings' ), true );
+    }
+
 
     if ( ! is_array( $attachments ) ) {
         $attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) );