1 files changed, 64 insertions, 41 deletions
diff --git a/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php b/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php
index ca65c6b5..a3e8c7c1 100644
--- a/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php
+++ b/plugins/wordpress-mobile-pack/wordpress-mobile-pack.php
@@ -5,48 +5,71 @@
  * Description: WordPress Mobile Pack 2.0+ has been completely rebuilt from the ground up and repurposed to empower bloggers, publishers and other content creators to go beyond responsiveness and 'appify' the content of their blog.
  * Author: Appticles.com
  * Author URI: http://www.appticles.com/
- * Version: 2.1.2
- * Copyright (c) 2009 – 2015 James Pearce, mTLD Top Level Domain Limited, ribot, Forum Nokia, Appticles.com
+ * Version: 2.2.1
+ * Copyright (c) 2009 - 2015 James Pearce, mTLD Top Level Domain Limited, ribot, Forum Nokia, Appticles.com
  * License: The WordPress Mobile Pack is Licensed under the Apache License, Version 2.0
+ * Text Domain: wordpress-mobile-pack
  */
- 
+
 require_once('core/config.php');
 require_once('core/class-wmp.php');
-require_once('core/class-admin.php');
-
-if ( class_exists( 'WMobilePack' ) && class_exists( 'WMobilePackAdmin' ) ) {
-	
-	global $wmobile_pack; 
-	$wmobile_pack = new WMobilePack();
-    $wmobile_pack_admin = new WMobilePackAdmin();
-
-	// add hooks
-	register_activation_hook( __FILE__, array( &$wmobile_pack, 'wmp_install' ) );
-	register_deactivation_hook( __FILE__, array( &$wmobile_pack, 'wmp_uninstall' ) );
-
-    // Initialize the Wordpress Mobile Pack check logic and rendering 
-    add_action('plugins_loaded',array( &$wmobile_pack, 'wmp_check_load' )); 
-	
-	if (is_admin()) {
- 
-		$wmobile_pack->wmp_admin_init();
-		
-		add_action( 'wp_ajax_wmp_content_save', array( &$wmobile_pack_admin, 'wmp_content_save' ) );
-		add_action( 'wp_ajax_wmp_content_pagestatus', array( &$wmobile_pack_admin, 'wmp_content_pagestatus' ) );
-        add_action( 'wp_ajax_wmp_content_pagedetails', array( &$wmobile_pack_admin, 'wmp_content_pagedetails' ) );
-		add_action( 'wp_ajax_wmp_content_order', array( &$wmobile_pack_admin, 'wmp_content_order' ) );
-		
-		add_action( 'wp_ajax_wmp_settings_editimages', array( &$wmobile_pack_admin, 'wmp_settings_editimages' ) );
-		add_action( 'wp_ajax_wmp_settings_editcover', array( &$wmobile_pack_admin, 'wmp_settings_editcover' ) );
-        add_action( 'wp_ajax_wmp_settings_save', array( &$wmobile_pack_admin, 'wmp_settings_save' ) );
-		add_action( 'wp_ajax_wmp_send_feedback', array( &$wmobile_pack_admin, 'wmp_send_feedback' ) );
-		
-		add_action( 'wp_ajax_wmp_premium_save', array( &$wmobile_pack_admin, 'wmp_premium_save' ) );
-		add_action( 'wp_ajax_wmp_premium_connect', array( &$wmobile_pack_admin, 'wmp_premium_connect' ) );
-		add_action( 'wp_ajax_wmp_premium_disconnect', array( &$wmobile_pack_admin, 'wmp_premium_disconnect' ) );
-		
-		add_action( 'wp_admin_wmp_page_details', array( &$wmobile_pack_admin, 'wmp_page_content' ) );
-        
-	}
-    
-} 
+
+/**
+ * Used to load the required files on the plugins_loaded hook, instead of immediately.
+ */
+function wmobilepack_frontend_init() {
+
+    require_once('frontend/class-application.php');
+    new WMobilePack_Application();
+}
+
+function wmobilepack_admin_init() {
+
+    require_once('admin/class-admin-init.php');
+    new WMobilePack_Admin_Init();
+}
+
+if (class_exists( 'WMobilePack' ) && class_exists( 'WMobilePack' )) {
+
+    global $wmobile_pack;
+    $wmobile_pack = new WMobilePack();
+
+    // Add hooks for activating & deactivating the plugin
+    register_activation_hook(__FILE__, array(&$wmobile_pack, 'activate'));
+    register_deactivation_hook(__FILE__, array(&$wmobile_pack, 'deactivate'));
+
+    // Initialize the Wordpress Mobile Pack check logic and rendering
+    if (is_admin()) {
+
+        if (defined('DOING_AJAX') && DOING_AJAX) {
+
+            require_once(WMP_PLUGIN_PATH . 'admin/class-admin-ajax.php');
+
+            $wmobile_pack_ajax = new WMobilePack_Admin_Ajax();
+
+            add_action('wp_ajax_wmp_theme_settings', array(&$wmobile_pack_ajax, 'theme_settings'));
+            add_action('wp_ajax_wmp_theme_editimages', array(&$wmobile_pack_ajax, 'theme_editimages'));
+
+            add_action('wp_ajax_wmp_content_status', array(&$wmobile_pack_ajax, 'content_status'));
+            add_action('wp_ajax_wmp_content_pagedetails', array(&$wmobile_pack_ajax, 'content_pagedetails'));
+            add_action('wp_ajax_wmp_content_order', array(&$wmobile_pack_ajax, 'content_order'));
+
+            add_action('wp_ajax_wmp_settings_save', array(&$wmobile_pack_ajax, 'settings_save'));
+            add_action('wp_ajax_wmp_settings_app', array(&$wmobile_pack_ajax, 'settings_app'));
+
+            add_action( 'wp_ajax_wmp_premium_save', array( &$wmobile_pack_ajax, 'premium_save' ) );
+            add_action( 'wp_ajax_wmp_premium_connect', array( &$wmobile_pack_ajax, 'premium_connect' ) );
+            add_action( 'wp_ajax_wmp_premium_disconnect', array( &$wmobile_pack_ajax, 'premium_disconnect' ) );
+
+            add_action('wp_ajax_wmp_join_waitlist', array(&$wmobile_pack_ajax, 'settings_waitlist'));
+            add_action('wp_ajax_wmp_send_feedback', array(&$wmobile_pack_ajax, 'send_feedback'));
+
+        } else {
+            add_action('plugins_loaded', 'wmobilepack_admin_init');
+        }
+
+    } else {
+        add_action('plugins_loaded', 'wmobilepack_frontend_init');
+    }
+
+}