Changeset 1369562

Timestamp:

03/11/2016 11:20:34 PM (10 years ago)

Author:

christophherr

Message:

Adds check if Sensei is active, conditional to use the adequate remove-action depensing on Sensei version.

File:

• genesis-connect-for-woothemes-sensei/trunk/genesis-connect-for-woothemes-sensei.php (modified) (6 diffs)

genesis-connect-for-woothemes-sensei/trunk/genesis-connect-for-woothemes-sensei.php

@@ -6 +6 @@
  * Author:      Christoph Herr
  * Author URI:  http://www.christophherr.com
- * Version:     1.0.3
+ * Version:     1.1.0
  * Text Domain: genesis-connect-for-woothemes-sensei
  * Domain Path: /languages
@@ -14 +14 @@
  * @package   GenesisConnectforWoothemesSensei
  * @author    Christoph Herr
- * @version   1.0.3
+ * @version   1.1.0
  * @license   GPL-2.0+
  *
@@ -38 +38 @@
 /**
  * This function runs on plugin activation. It checks to make sure the
- * Genesis Framework is active. If not, it deactivates the plugin.
+ * Genesis Framework and Woothemes Sensei are active. If not, it deactivates the plugin.
  *
  * @since 1.0
@@ -47 +47 @@
         deactivate_plugins( plugin_basename( __FILE__ ) );
         add_action( 'admin_notices', 'gcfws_admin_notice_message' );
+    }
+    if ( ! class_exists( ('Sensei_Main' ) || ( 'WooThemes_Sensei' ) ) ) {
+        // Deactivate.
+        deactivate_plugins( plugin_basename( __FILE__ ) );
+        add_action( 'admin_notices', 'gcfws_admin_notice_message_sensei' );
     }
 }
@@ -85 +90 @@
 
 /**
+ * Error message if you're not using Woothemes Sensei.
+ *
+ * @since 1.1
+ */
+function gcfws_admin_notice_message_sensei() {
+    $error = sprintf( _e( 'Sorry, you can\'t use the Genesis Connect for Woothemes Sensei Plugin unless the <a href="%s">Sensei Plugin</a> is active. The plugin has been deactivated.', 'gcfws' ), 'http://senseilms.com' );
+
+    echo '<div class="error"><p>' . $error . '</p></div>';
+
+    if ( isset( $_GET['activate'] ) ) {
+        unset( $_GET['activate'] );
+    }
+}
+
+/**
  * Load plugin textdomain.
  *
@@ -108 +128 @@
 
 /**
- * Remove the default Sensei wrappers
+ * Force content-sidebar layout on Woothemes Sensei Course, Lesson and Question pages.
+ * @since 1.1
  */
-global $woothemes_sensei;
-remove_action( 'sensei_before_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper' ), 10 );
-remove_action( 'sensei_after_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper_end' ), 10 );
+function gcfws_force_content_sidebar_layout() {
+    if ( is_singular( array( 'course', 'lesson', 'question' ) ) ) {
+            add_filter( 'genesis_pre_get_option_site_layout', '__genesis_return_content_sidebar' );
+    }
+}
+
+add_action( 'genesis_meta', 'gcfws_force_content_sidebar_layout' );
+
+/**
+ * Remove the default Woothemes Sensei wrappers.
+ * Checks which version of Woothemes Sensei is running
+ * and removes the wrappers accordingly.
+ * @since 1.1
+ */
+function gcfws_remove_default_sensei_wrappers() {
+
+    if ( Sensei()->version >= '1.9.0' ) {
+        remove_action( 'sensei_before_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper' ), 10 );
+        remove_action( 'sensei_after_main_content', array( Sensei()->frontend, 'sensei_output_content_wrapper_end' ), 10 );
+        return;
+    }
+    global $woothemes_sensei;
+    remove_action( 'sensei_before_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper' ), 10 );
+    remove_action( 'sensei_after_main_content', array( $woothemes_sensei->frontend, 'sensei_output_content_wrapper_end' ), 10 );
+}
+
+add_action( 'genesis_meta', 'gcfws_remove_default_sensei_wrappers' );