Update pluging wordpress-mobile-pack to 2.2.2

9 files changed, 366 insertions, 136 deletions

diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-cookie.php b/plugins/wordpress-mobile-pack/inc/class-wmp-cookie.php
index 37773842..37773842 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-cookie.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-cookie.php
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php b/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php
index 8d61267f..b1d12aa5 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-formatter.php
@@ -36,7 +36,7 @@ if ( ! class_exists( 'WMobilePack_Formatter' ) ) {
             $config->set('URI.AllowedSchemes', array('http' => true, 'https' => true, 'mailto' => true, 'news' => true, 'tel' => true, 'callto' => true, 'skype' => true, 'sms' => true, 'whatsapp' => true));

 

             $config->set('HTML.SafeIframe', 1);

-            $config->set('URI.SafeIframeRegexp', "%^(https?:)?(http?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player.vimeo.com|www\.dailymotion.com|w.soundcloud.com|fast.wistia.net|fast.wistia.com|wi.st|flickrit.com|www.spreaker.com|spreaker.com|instagram.com|www.instagram.com)%");

+            $config->set('URI.SafeIframeRegexp', "%^(https?:)?(http?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player.vimeo.com|www\.dailymotion.com|w.soundcloud.com|fast.wistia.net|fast.wistia.com|wi.st|flickrit.com|www.spreaker.com|spreaker.com|instagram.com|www.instagram.com|embed.spotify.com|play.spotify.com|spotify.com)%");

 

             // extend purifier

             $Html5Purifier = new WMPHtmlPurifier();

diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-options.php b/plugins/wordpress-mobile-pack/inc/class-wmp-options.php
index 4493fa6c..4493fa6c 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-options.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-options.php
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-premium.php b/plugins/wordpress-mobile-pack/inc/class-wmp-premium.php
index 71d5b23a..044db0db 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-premium.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-premium.php
@@ -11,7 +11,116 @@ if (!class_exists('WMobilePack_Premium')) {
     {

 

         /**

-         * Method used to read the config js for the premium theme and save it to a transient,

+         * Method used to read the config js for the premium theme and save it to a transient

+         */

+        public function set_premium_config(){

+

+            if (WMobilePack_Options::get_setting('premium_api_key') != '') {

+

+                // get config path

+                $config_path = WMobilePack_Options::get_setting('premium_config_path');

+

+                if ($config_path != '') { // check if config path is set

+

+                    $json_data = get_transient(WMobilePack_Options::$transient_prefix."premium_config_path");

+

+                    if (!$json_data) {

+

+                        if (filter_var($config_path, FILTER_VALIDATE_URL) !== false) {

+

+                            // get response

+                            $json_response = $this->readJSONData($config_path);

+

+                            if ($json_response !== false && $json_response != '') {

+

+                                // is valid json

+                                $arr_app_settings = json_decode($json_response, true);

+

+                                if (isset($arr_app_settings['kit_type']) && ctype_alnum($arr_app_settings['kit_type']) && $arr_app_settings['kit_type'] == 'wpmp'){

+                                    $valid_json = $this->validateJSONWPMP($arr_app_settings);

+                                } else {

+                                    $valid_json = $this->validateJSON($arr_app_settings);

+                                }

+

+                                if ($valid_json){

+

+                                    set_transient( WMobilePack_Options::$transient_prefix.'premium_config_path', $json_response, 600 ); // transient expires every 10 minutes

+                                    return $json_response;

+                                }

+

+                            } else {

+

+                                // the json doesn't exist, so the dashboards were disconnected

+

+                                $arr_data = array(

+                                    'premium_api_key' => '',

+                                    'premium_active'  => 0,

+                                    'premium_config_path' => ''

+                                );

+

+                                // save options

+                                WMobilePack_Options::update_settings($arr_data);

+

+                            }

+                        }

+                    }

+

+                    return $json_data;

+                }

+            }

+

+            return false;

+        }

+

+

+        /**

+         * Get array with premium settings

+         *

+         * @param bool $as_array

+         * @return mixed|null

+         */

+        public function get_premium_config($as_array = true){

+

+            $json_config_premium = $this->set_premium_config();

+

+            if ($json_config_premium !== false) {

+                return json_decode($json_config_premium, $as_array);

+            }

+

+            return null;

+        }

+

+

+        /**

+         * Get Premium kit type

+         *

+         * @return string (wpmp|classic)

+         */

+        public function get_kit_type(){

+

+            $arr_config_premium = $this->get_premium_config();

+

+            if ($arr_config_premium !== null && isset($arr_config_premium['kit_type']) && $arr_config_premium['kit_type'] == 'wpmp'){

+                return 'wpmp';

+            }

+

+            return 'classic';

+        }

+

+

+        /**

+         * Wrapper for reading the JSON data

+         *

+         * @param $config_path

+         * @return bool|mixed|string

+         */

+        protected function readJSONData($config_path){

+            return WMobilePack::read_data($config_path);

+        }

+

+

+        /**

+         * Validate JSON config array

          *

          * The JSON file has the following format:

          *

@@ -19,33 +128,31 @@ if (!class_exists('WMobilePack_Premium')) {
          * {

          *

          *  'kit_version' : 'v2.4.2',

+         *

          *  'cdn_kits' : 'http://cdn-kits.appticles.com',

+         *  'cdn_kits_https': 'https://d2drn63u22mxd7.cloudfront.net',

          *  'cdn_apps': 'http://cdn.appticles.com',

+         *  'cdn_apps_https': 'https://d1wltzw0mxj130.cloudfront.net',

          *

          *  'api_content': 'http://api.appticles.com/content1/',

+         *  'api_content_https': 'https://api.appticles.com/content1/',

          *  'api_social' : 'http://api.appticles.com/social',

+         *  'api_social_https' : 'http://api.appticles.com/social',

          *

          *  'webapp' : 'xxxxxxxxxxxxxxxxxxxxxxx',

          *  'title' : 'My app',

          *  'shorten_url' : 'xxxxxx',

-         *

          *  'status' => 'visible' / 'hidden',

-         *  'theme' : 1,                      // will be removed in future versions

          *

          *  'has_phone_ads' : 0/1,

          *  'has_tablet_ads' : 0/1,

          *

          *  // OPTIONAL fields

          *  'domain_name' : 'myapp.domain.com',

+         *  'website_url' : 'http://mywebsiteurl.com',

          *  'deactivated' : 1,

          *  'api_content_external': 'http://yourcustomapi.com',

-         *

-         *  'color_scheme'      : 1,          // will be removed in future versions

-         *  'font_headlines'    : 1,          // will be removed in future versions

-         *  'font_subtitles'    : 1,          // will be removed in future versions

-         *  'font_paragraphs'   : 1,          // will be removed in future versions

-         *  'cover_smartphones_path' : '',    // will be removed in future versions

-         *  'cover_tablets_path' : '',        // will be removed in future versions

+         *  'locale': 'en_EN',

          *

          *  'logo_path' : '',

          *  'icon_path' : '',

@@ -63,15 +170,12 @@ if (!class_exists('WMobilePack_Premium')) {
          *  'enable_facebook': 1,

          *  'enable_twitter': 1,

          *

-         *  // This variable should be removed in the future (it is used by WPMP <= 2.1.5)

-         *  'language': 'en',

-         *

-         *  'locale': 'en_EN',

          *  'google_analytics_id' : 'UA-XXXXXX-1',

          *  'google_internal_id' : 'xxxxx',

          *  'google_webmasters_code' : 'xxxxxx',

          *

-         *  // VERSION 2.6.0 (Separate phone and tablet theme settings)

+         *  'timestamp' : 'numeric timestamp',

+         *

          * 'phone' : {

          *  'theme'             : 1, // 0 means a custom theme

          *  'color_scheme'      : 1,

@@ -95,147 +199,263 @@ if (!class_exists('WMobilePack_Premium')) {
          * }

          *

          * }

+         *

+         * @param $arr_app_settings

+         * @return bool

+         *

          */

-        public function set_premium_config(){

+        protected function validateJSON($arr_app_settings){

 

-            if (WMobilePack_Options::get_setting('premium_api_key') != '') {

+            if (isset($arr_app_settings['kit_version']) && ctype_alnum(str_replace('.', '', $arr_app_settings['kit_version'])) &&

+                isset($arr_app_settings['cdn_kits']) && filter_var($arr_app_settings['cdn_kits'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['cdn_kits_https']) && filter_var($arr_app_settings['cdn_kits_https'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['cdn_apps']) && filter_var($arr_app_settings['cdn_apps'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['cdn_apps_https']) && filter_var($arr_app_settings['cdn_apps_https'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['api_content']) && filter_var($arr_app_settings['api_content'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['api_content_https']) && filter_var($arr_app_settings['api_content_https'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['api_social']) && filter_var($arr_app_settings['api_social'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['api_social_https']) && filter_var($arr_app_settings['api_social_https'], FILTER_VALIDATE_URL) &&

 

-                // get config path

-                $config_path = WMobilePack_Options::get_setting('premium_config_path');

+                isset($arr_app_settings['webapp']) && ctype_alnum($arr_app_settings['webapp']) &&

+                isset($arr_app_settings['shorten_url']) && ctype_alnum($arr_app_settings['shorten_url']) &&

+                isset($arr_app_settings['title']) && $arr_app_settings['title'] == strip_tags($arr_app_settings['title']) &&

+                isset($arr_app_settings['status']) && in_array($arr_app_settings['status'], array('visible', 'hidden')) &&

 

-                if ($config_path != '') { // check if config path is set

+                isset($arr_app_settings['has_phone_ads']) && is_numeric($arr_app_settings['has_phone_ads']) &&

+                isset($arr_app_settings['has_tablet_ads']) && is_numeric($arr_app_settings['has_tablet_ads']) &&

 

-                    $json_data = get_transient(WMobilePack_Options::$transient_prefix."premium_config_path");

+                // validate optional fields

+                (!isset($arr_app_settings['domain_name']) || $arr_app_settings['domain_name'] == '' || filter_var('http://'.$arr_app_settings['domain_name'], FILTER_VALIDATE_URL)) &&

+                (!isset($arr_app_settings['website_url']) || $arr_app_settings['website_url'] == '' || filter_var($arr_app_settings['website_url'], FILTER_VALIDATE_URL)) &&

+                (!isset($arr_app_settings['deactivated']) || $arr_app_settings['deactivated'] == 0 || $arr_app_settings['deactivated'] == 1) &&

+                (!isset($arr_app_settings['api_content_external']) || $arr_app_settings['api_content_external'] == '' || filter_var('http://'.$arr_app_settings['api_content_external'], FILTER_VALIDATE_URL)) &&

 

-                    if (!$json_data) {

+                (!isset($arr_app_settings['logo_path']) || $arr_app_settings['logo_path'] == '' || $arr_app_settings['logo_path'] == strip_tags($arr_app_settings['logo_path'])) &&

+                (!isset($arr_app_settings['icon_path']) || $arr_app_settings['icon_path'] == '' || $arr_app_settings['icon_path'] == strip_tags($arr_app_settings['icon_path'])) &&

 

-                        $delete_premium = false;

+                (!isset($arr_app_settings['locale']) || $arr_app_settings['locale'] == '' || ctype_alnum(str_replace('_','', $arr_app_settings['locale']))) &&

+                (!isset($arr_app_settings['google_analytics_id']) || $arr_app_settings['google_analytics_id'] == '' || ctype_alnum(str_replace('-','', $arr_app_settings['google_analytics_id']))) &&

+                (!isset($arr_app_settings['google_internal_id']) || $arr_app_settings['google_internal_id'] == '' || is_numeric($arr_app_settings['google_internal_id'])) &&

+                (!isset($arr_app_settings['google_webmasters_code']) || $arr_app_settings['google_webmasters_code'] == '' || $arr_app_settings['google_webmasters_code'] == strip_tags($arr_app_settings['google_webmasters_code'])) &&

 

-                        if (filter_var($config_path, FILTER_VALIDATE_URL) !== false) {

+                (!isset($arr_app_settings['enable_facebook']) || $arr_app_settings['enable_facebook'] == '' || is_numeric($arr_app_settings['enable_facebook'])) &&

+                (!isset($arr_app_settings['enable_twitter']) || $arr_app_settings['enable_twitter'] == '' || is_numeric($arr_app_settings['enable_twitter'])) &&

 

-                            // get response

-                            $json_response = WMobilePack::read_data($config_path);

+                (!isset($arr_app_settings['phone_network_code']) || $arr_app_settings['phone_network_code'] == '' || is_numeric($arr_app_settings['phone_network_code'])) &&

+                (!isset($arr_app_settings['phone_unit_name']) || $arr_app_settings['phone_unit_name'] == '' || $arr_app_settings['phone_unit_name'] == strip_tags($arr_app_settings['phone_unit_name'])) &&

+                (!isset($arr_app_settings['phone_ad_interval']) || $arr_app_settings['phone_ad_interval'] == '' || is_numeric($arr_app_settings['phone_ad_interval'])) &&

+                (!isset($arr_app_settings['phone_ad_sizes']) || $arr_app_settings['phone_ad_sizes'] == '' || is_array($arr_app_settings['phone_ad_sizes'])) &&

 

-                            if ($json_response !== false && $json_response != '') {

+                (!isset($arr_app_settings['tablet_network_code']) || $arr_app_settings['tablet_network_code'] == '' || is_numeric($arr_app_settings['tablet_network_code'])) &&

+                (!isset($arr_app_settings['tablet_unit_name']) || $arr_app_settings['tablet_unit_name'] == '' || $arr_app_settings['tablet_unit_name'] == strip_tags($arr_app_settings['tablet_unit_name'])) &&

+                (!isset($arr_app_settings['tablet_ad_interval']) || $arr_app_settings['tablet_ad_interval'] == '' || is_numeric($arr_app_settings['tablet_ad_interval'])) &&

+                (!isset($arr_app_settings['tablet_ad_sizes']) || $arr_app_settings['tablet_ad_sizes'] == '' || is_array($arr_app_settings['tablet_ad_sizes'])) &&

 

-                                // is valid json

-                                $arr_app_settings = json_decode($json_response, true);

+                (!isset($arr_app_settings['timestamp']) || is_numeric($arr_app_settings['timestamp']))

+            ) {

 

-                                if (isset($arr_app_settings['kit_version']) && ctype_alnum(str_replace('.', '', $arr_app_settings['kit_version'])) &&

-                                    isset($arr_app_settings['cdn_kits']) && filter_var($arr_app_settings['cdn_kits'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['cdn_kits_https']) && filter_var($arr_app_settings['cdn_kits_https'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['cdn_apps']) && filter_var($arr_app_settings['cdn_apps'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['cdn_apps_https']) && filter_var($arr_app_settings['cdn_apps_https'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['api_content']) && filter_var($arr_app_settings['api_content'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['api_content_https']) && filter_var($arr_app_settings['api_content_https'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['api_social']) && filter_var($arr_app_settings['api_social'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['api_social_https']) && filter_var($arr_app_settings['api_social_https'], FILTER_VALIDATE_URL) &&

-                                    isset($arr_app_settings['webapp']) && ctype_alnum($arr_app_settings['webapp']) &&

-                                    isset($arr_app_settings['shorten_url']) && ctype_alnum($arr_app_settings['shorten_url']) &&

-                                    isset($arr_app_settings['title']) && $arr_app_settings['title'] == strip_tags($arr_app_settings['title']) &&

-                                    isset($arr_app_settings['status']) && in_array($arr_app_settings['status'], array('visible', 'hidden')) &&

-                                    isset($arr_app_settings['theme']) && is_numeric($arr_app_settings['theme']) &&

-

-                                    isset($arr_app_settings['has_phone_ads']) && is_numeric($arr_app_settings['has_phone_ads']) &&

-                                    isset($arr_app_settings['has_tablet_ads']) && is_numeric($arr_app_settings['has_tablet_ads']) &&

-

-                                    // validate optional fields

-                                    (!isset($arr_app_settings['domain_name']) || $arr_app_settings['domain_name'] == '' || filter_var('http://'.$arr_app_settings['domain_name'], FILTER_VALIDATE_URL)) &&

-                                    (!isset($arr_app_settings['deactivated']) || $arr_app_settings['deactivated'] == 0 || $arr_app_settings['deactivated'] == 1) &&

-                                    (!isset($arr_app_settings['api_content_external']) || $arr_app_settings['api_content_external'] == '' || filter_var('http://'.$arr_app_settings['api_content_external'], FILTER_VALIDATE_URL)) &&

-                                    (!isset($arr_app_settings['color_scheme']) || $arr_app_settings['color_scheme'] == '' || is_numeric($arr_app_settings['color_scheme'])) &&

-                                    (!isset($arr_app_settings['font_headlines']) || $arr_app_settings['font_headlines'] == '' || is_numeric($arr_app_settings['font_headlines'])) &&

-                                    (!isset($arr_app_settings['font_subtitles']) || $arr_app_settings['font_subtitles'] == '' || is_numeric($arr_app_settings['font_subtitles'])) &&

-                                    (!isset($arr_app_settings['font_paragraphs']) || $arr_app_settings['font_paragraphs'] == '' || is_numeric($arr_app_settings['font_paragraphs'])) &&

-

-                                    (!isset($arr_app_settings['cover_smartphones_path']) || $arr_app_settings['cover_smartphones_path'] == '' || $arr_app_settings['cover_smartphones_path'] == strip_tags($arr_app_settings['cover_smartphones_path'])) &&

-                                    (!isset($arr_app_settings['cover_tablets_path']) || $arr_app_settings['cover_tablets_path'] == '' || $arr_app_settings['cover_tablets_path'] == strip_tags($arr_app_settings['cover_tablets_path'])) &&

-                                    (!isset($arr_app_settings['logo_path']) || $arr_app_settings['logo_path'] == '' || $arr_app_settings['logo_path'] == strip_tags($arr_app_settings['logo_path'])) &&

-                                    (!isset($arr_app_settings['icon_path']) || $arr_app_settings['icon_path'] == '' || $arr_app_settings['icon_path'] == strip_tags($arr_app_settings['icon_path'])) &&

-

-                                    (!isset($arr_app_settings['locale']) || $arr_app_settings['locale'] == '' || ctype_alnum(str_replace('_','', $arr_app_settings['locale']))) &&

-                                    (!isset($arr_app_settings['language']) || $arr_app_settings['language'] == '' || ctype_alpha($arr_app_settings['language'])) &&

-                                    (!isset($arr_app_settings['google_analytics_id']) || $arr_app_settings['google_analytics_id'] == '' || ctype_alnum(str_replace('-','', $arr_app_settings['google_analytics_id']))) &&

-                                    (!isset($arr_app_settings['google_internal_id']) || $arr_app_settings['google_internal_id'] == '' || is_numeric($arr_app_settings['google_internal_id'])) &&

-                                    (!isset($arr_app_settings['google_webmasters_code']) || $arr_app_settings['google_webmasters_code'] == '' || $arr_app_settings['google_webmasters_code'] == strip_tags($arr_app_settings['google_webmasters_code'])) &&

-

-                                    (!isset($arr_app_settings['enable_facebook']) || $arr_app_settings['enable_facebook'] == '' || is_numeric($arr_app_settings['enable_facebook'])) &&

-                                    (!isset($arr_app_settings['enable_twitter']) || $arr_app_settings['enable_twitter'] == '' || is_numeric($arr_app_settings['enable_twitter'])) &&

-

-                                    (!isset($arr_app_settings['phone_network_code']) || $arr_app_settings['phone_network_code'] == '' || is_numeric($arr_app_settings['phone_network_code'])) &&

-                                    (!isset($arr_app_settings['phone_unit_name']) || $arr_app_settings['phone_unit_name'] == '' || $arr_app_settings['phone_unit_name'] == strip_tags($arr_app_settings['phone_unit_name'])) &&

-                                    (!isset($arr_app_settings['phone_ad_interval']) || $arr_app_settings['phone_ad_interval'] == '' || is_numeric($arr_app_settings['phone_ad_interval'])) &&

-                                    (!isset($arr_app_settings['phone_ad_sizes']) || $arr_app_settings['phone_ad_sizes'] == '' || is_array($arr_app_settings['phone_ad_sizes'])) &&

-

-                                    (!isset($arr_app_settings['tablet_network_code']) || $arr_app_settings['tablet_network_code'] == '' || is_numeric($arr_app_settings['tablet_network_code'])) &&

-                                    (!isset($arr_app_settings['tablet_unit_name']) || $arr_app_settings['tablet_unit_name'] == '' || $arr_app_settings['tablet_unit_name'] == strip_tags($arr_app_settings['tablet_unit_name'])) &&

-                                    (!isset($arr_app_settings['tablet_ad_interval']) || $arr_app_settings['tablet_ad_interval'] == '' || is_numeric($arr_app_settings['tablet_ad_interval'])) &&

-                                    (!isset($arr_app_settings['tablet_ad_sizes']) || $arr_app_settings['tablet_ad_sizes'] == '' || is_array($arr_app_settings['tablet_ad_sizes']))

-                                ) {

-

-                                    $valid_phone = false;

-                                    $valid_tablet = false;

-

-                                    // validate new theme settings format

-                                    if (isset($arr_app_settings['phone']) && is_array($arr_app_settings['phone']) &&

-                                        isset($arr_app_settings['tablet']) && is_array($arr_app_settings['tablet'])) {

-

-                                        foreach (array('phone', 'tablet') as $device){

-

-                                            // validate theme settings per device

-                                            if ( isset($arr_app_settings[$device]['theme']) && is_numeric($arr_app_settings[$device]['theme']) &&

-                                                (!isset($arr_app_settings[$device]['color_scheme']) || $arr_app_settings[$device]['color_scheme'] == '' || is_numeric($arr_app_settings[$device]['color_scheme'])) &&

-                                                (!isset($arr_app_settings[$device]['font_headlines']) || $arr_app_settings[$device]['font_headlines'] == '' || is_numeric($arr_app_settings[$device]['font_headlines'])) &&

-                                                (!isset($arr_app_settings[$device]['font_subtitles']) || $arr_app_settings[$device]['font_subtitles'] == '' || is_numeric($arr_app_settings[$device]['font_subtitles'])) &&

-                                                (!isset($arr_app_settings[$device]['font_paragraphs']) || $arr_app_settings[$device]['font_paragraphs'] == '' || is_numeric($arr_app_settings[$device]['font_paragraphs'])) &&

-                                                (!isset($arr_app_settings[$device]['custom_fonts']) || $arr_app_settings[$device]['custom_fonts'] == '' || $arr_app_settings[$device]['custom_fonts'] == strip_tags($arr_app_settings[$device]['custom_fonts'])) &&

-                                                (!isset($arr_app_settings[$device]['cover']) || $arr_app_settings[$device]['cover'] == '' || $arr_app_settings[$device]['cover'] == strip_tags($arr_app_settings[$device]['cover']))) {

-

-                                                if ($device == 'phone')

-                                                    $valid_phone = true;

-                                                else

-                                                    $valid_tablet = true;

-                                            }

-                                        }

-

-                                    } else {

-

-                                        // these will be valid if we have an old config format

-                                        if ($arr_app_settings['kit_version'] == 'v2.5.0') {

-                                            $valid_phone = true;

-                                            $valid_tablet = true;

-                                        }

-                                    }

-

-                                    if ($valid_phone && $valid_tablet) {

-                                        set_transient( WMobilePack_Options::$transient_prefix.'premium_config_path', $json_response, 600 ); // transient expires every 10 minutes

-                                        return $json_response;

-                                    }

-                                }

+                $valid_phone = false;

+                $valid_tablet = false;

 

-                            } else

-                                $delete_premium = true;

+                // validate new theme settings format

+                if (isset($arr_app_settings['phone']) && isset($arr_app_settings['tablet'])) {

 

-                            if ($delete_premium) { // the dashboards were disconnected

+                    $valid_phone = $this->validateThemeSettings($arr_app_settings['phone']);

+                    $valid_tablet = $this->validateThemeSettings($arr_app_settings['tablet']);

 

-                                $arr_data = array(

-                                    'premium_api_key' => '',

-                                    'premium_active'  => 0,

-                                    'premium_config_path' => ''

-                                );

+                }

 

-                                // save options

-                                WMobilePack_Options::update_settings($arr_data);

-                            }

-                        }

-                    }

+                if ($valid_phone && $valid_tablet) {

+                    return true;

+                }

+            }

 

-                    return $json_data;

+            return false;

+        }

+

+        /**

+         * The JSON file has the following format:

+         *

+         * // MANDATORY fields

+         * {

+         *

+         *  'kit_version' : 'v1.0.0',

+         *  'kit_type' : 'wpmp',

+         *  'cdn_kits' : 'http://cdn-kits.appticles.com',

+         *  'cdn_kits_https' : 'https://d2drn63u22mxd7.cloudfront.net',

+         *  'cdn_apps': 'http://cdn.appticles.com'

+         *  'cdn_apps_https': 'https://d1wltzw0mxj130.cloudfront.net'

+         *

+         *  'webapp' : 'xxxxxxxxxxxxxxxxxxxxxxx',

+         *  'title' : 'My app',

+         *  'shorten_url' : 'xxxxxx',

+         *  'status' => 'visible' / 'hidden',

+         *

+         *  'has_phone_ads' : 0/1,

+         *  'has_tablet_ads' : 0/1,

+         *

+         *  // OPTIONAL fields

+         *  'domain_name' : 'myapp.domain.com',

+         *  'website_url' : 'http://mywebsiteurl.com',

+         *  'deactivated' : 1,

+         *  'logo_path' : '',

+         *  'icon_path' : '',

+         *  'locale': 'en_EN',

+         *

+         *  'phone_network_code' : '',

+         *  'phone_unit_name' : '',

+         *  'phone_ad_interval' : 30,

+         *  'phone_ad_sizes' : [[250,250],[300,300],...],

+         *

+         *  'tablet_network_code' : '',

+         *  'tablet_unit_name' : '',

+         *  'tablet_ad_interval' : 30,

+         *  'tablet_ad_sizes' : [[250,250],[300,300],...],

+         *

+         *  'enable_facebook': 1,

+         *  'enable_twitter': 1,

+         *  'enable_google': 1,

+         *

+         *  'google_analytics_id' : 'UA-XXXXXX-1',

+         *  'google_internal_id' : 'xxxxx',

+         *  'google_webmasters_code' : 'xxxxxx',

+         *

+         *  'timestamp' : 'numeric timestamp',

+         *

+         * 'phone' : {

+         *  'theme'             : 1, // 0 means a custom theme

+         *  'color_scheme'      : 1,

+         *  'font_headlines'    : 1,

+         *  'font_subtitles'    : 1,

+         *  'font_paragraphs'   : 1,

+         *  'cover'             : '',

+         *  'theme_timestamp'   : '',

+         *  'custom_fonts''     : '',

+         *  'posts_per_page''   : 'auto|single|double',

+         *  'cover_text''       : '<strong>encoded html text</strong>'

+         * }

+         *

+         * 'tablet' : {

+         *  'theme'             : 1, // 0 means a custom theme

+         *  'color_scheme'      : 1,

+         *  'font_headlines'    : 1,

+         *  'font_subtitles'    : 1,

+         *  'font_paragraphs'   : 1,

+         *  'cover'             : '',

+         *  'theme_timestamp'   : '',

+         *  'custom_fonts''     : '',

+         *  'posts_per_page''   : 'auto|single|double',

+         *  'cover_text''       : '<strong>encoded html text</strong>'

+         * }

+         *

+         * }

+         *

+         * @param $arr_app_settings

+         * @return bool

+         */

+        protected function validateJSONWPMP($arr_app_settings){

+

+            if (isset($arr_app_settings['kit_version']) && ctype_alnum(str_replace('.', '', $arr_app_settings['kit_version'])) &&

+                isset($arr_app_settings['kit_type']) && $arr_app_settings['kit_type'] == 'wpmp' &&

+                isset($arr_app_settings['cdn_kits']) && filter_var($arr_app_settings['cdn_kits'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['cdn_kits_https']) && filter_var($arr_app_settings['cdn_kits_https'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['cdn_apps']) && filter_var($arr_app_settings['cdn_apps'], FILTER_VALIDATE_URL) &&

+                isset($arr_app_settings['cdn_apps_https']) && filter_var($arr_app_settings['cdn_apps_https'], FILTER_VALIDATE_URL) &&

+

+                isset($arr_app_settings['webapp']) && ctype_alnum($arr_app_settings['webapp']) &&

+                isset($arr_app_settings['shorten_url']) && ctype_alnum($arr_app_settings['shorten_url']) &&

+                isset($arr_app_settings['title']) && $arr_app_settings['title'] == strip_tags($arr_app_settings['title']) &&

+                isset($arr_app_settings['status']) && in_array($arr_app_settings['status'], array('visible', 'hidden')) &&

+

+                isset($arr_app_settings['has_phone_ads']) && is_numeric($arr_app_settings['has_phone_ads']) &&

+                isset($arr_app_settings['has_tablet_ads']) && is_numeric($arr_app_settings['has_tablet_ads']) &&

+

+                // validate optional fields

+                (!isset($arr_app_settings['domain_name']) || $arr_app_settings['domain_name'] == '' || filter_var('http://'.$arr_app_settings['domain_name'], FILTER_VALIDATE_URL)) &&

+                (!isset($arr_app_settings['website_url']) || $arr_app_settings['website_url'] == '' || filter_var($arr_app_settings['website_url'], FILTER_VALIDATE_URL)) &&

+                (!isset($arr_app_settings['deactivated']) || $arr_app_settings['deactivated'] == 0 || $arr_app_settings['deactivated'] == 1) &&

+                (!isset($arr_app_settings['logo_path']) || $arr_app_settings['logo_path'] == '' || $arr_app_settings['logo_path'] == strip_tags($arr_app_settings['logo_path'])) &&

+                (!isset($arr_app_settings['icon_path']) || $arr_app_settings['icon_path'] == '' || $arr_app_settings['icon_path'] == strip_tags($arr_app_settings['icon_path'])) &&

+                (!isset($arr_app_settings['locale']) || $arr_app_settings['locale'] == '' || ctype_alnum(str_replace('_','', $arr_app_settings['locale']))) &&

+

+                (!isset($arr_app_settings['google_analytics_id']) || $arr_app_settings['google_analytics_id'] == '' || ctype_alnum(str_replace('-','', $arr_app_settings['google_analytics_id']))) &&

+                (!isset($arr_app_settings['google_internal_id']) || $arr_app_settings['google_internal_id'] == '' || is_numeric($arr_app_settings['google_internal_id'])) &&

+                (!isset($arr_app_settings['google_webmasters_code']) || $arr_app_settings['google_webmasters_code'] == '' || $arr_app_settings['google_webmasters_code'] == strip_tags($arr_app_settings['google_webmasters_code'])) &&

+

+                (!isset($arr_app_settings['enable_facebook']) || $arr_app_settings['enable_facebook'] == '' || is_numeric($arr_app_settings['enable_facebook'])) &&

+                (!isset($arr_app_settings['enable_twitter']) || $arr_app_settings['enable_twitter'] == '' || is_numeric($arr_app_settings['enable_twitter'])) &&

+                (!isset($arr_app_settings['enable_google']) || $arr_app_settings['enable_google'] == '' || is_numeric($arr_app_settings['enable_google'])) &&

+

+                (!isset($arr_app_settings['phone_network_code']) || $arr_app_settings['phone_network_code'] == '' || is_numeric($arr_app_settings['phone_network_code'])) &&

+                (!isset($arr_app_settings['phone_unit_name']) || $arr_app_settings['phone_unit_name'] == '' || $arr_app_settings['phone_unit_name'] == strip_tags($arr_app_settings['phone_unit_name'])) &&

+                (!isset($arr_app_settings['phone_ad_interval']) || $arr_app_settings['phone_ad_interval'] == '' || is_numeric($arr_app_settings['phone_ad_interval'])) &&

+                (!isset($arr_app_settings['phone_ad_sizes']) || $arr_app_settings['phone_ad_sizes'] == '' || is_array($arr_app_settings['phone_ad_sizes'])) &&

+

+                (!isset($arr_app_settings['tablet_network_code']) || $arr_app_settings['tablet_network_code'] == '' || is_numeric($arr_app_settings['tablet_network_code'])) &&

+                (!isset($arr_app_settings['tablet_unit_name']) || $arr_app_settings['tablet_unit_name'] == '' || $arr_app_settings['tablet_unit_name'] == strip_tags($arr_app_settings['tablet_unit_name'])) &&

+                (!isset($arr_app_settings['tablet_ad_interval']) || $arr_app_settings['tablet_ad_interval'] == '' || is_numeric($arr_app_settings['tablet_ad_interval'])) &&

+                (!isset($arr_app_settings['tablet_ad_sizes']) || $arr_app_settings['tablet_ad_sizes'] == '' || is_array($arr_app_settings['tablet_ad_sizes'])) &&

+

+                (!isset($arr_app_settings['timestamp']) || is_numeric($arr_app_settings['timestamp']))

+            ) {

+

+                $valid_phone = false;

+                $valid_tablet = false;

+

+                // validate phone theme settings

+                if (isset($arr_app_settings['phone'])){

+

+                    if ($this->validateThemeSettings($arr_app_settings['phone']))

+                        $valid_phone = true;

+                }

+

+                // validate tablet theme settings

+                if (isset($arr_app_settings['tablet'])){

+

+                    if ($this->validateThemeSettings($arr_app_settings['tablet']))

+                        $valid_tablet = true;

+

+                } else {

+                    // tablet theme settings are not mandatory

+                    $valid_tablet = true;

+                }

+

+                if ($valid_phone && $valid_tablet) {

+                    return true;

                 }

             }

 

             return false;

         }

 

+

+        /**

+         * Validate array with theme settings

+         *

+         * @param $arr_theme_settings

+         * @return bool

+         *

+         */

+        protected function validateThemeSettings($arr_theme_settings){

+

+            // validate theme settings per device

+            if (is_array($arr_theme_settings)) {

+

+                if (isset($arr_theme_settings['theme']) && is_numeric($arr_theme_settings['theme']) &&

+                    (!isset($arr_theme_settings['color_scheme']) || $arr_theme_settings['color_scheme'] == '' || is_numeric($arr_theme_settings['color_scheme'])) &&

+                    (!isset($arr_theme_settings['font_headlines']) || $arr_theme_settings['font_headlines'] == '' || is_numeric($arr_theme_settings['font_headlines'])) &&

+                    (!isset($arr_theme_settings['font_subtitles']) || $arr_theme_settings['font_subtitles'] == '' || is_numeric($arr_theme_settings['font_subtitles'])) &&

+                    (!isset($arr_theme_settings['font_paragraphs']) || $arr_theme_settings['font_paragraphs'] == '' || is_numeric($arr_theme_settings['font_paragraphs'])) &&

+                    (!isset($arr_theme_settings['custom_fonts']) || $arr_theme_settings['custom_fonts'] == '' || $arr_theme_settings['custom_fonts'] == strip_tags($arr_theme_settings['custom_fonts'])) &&

+                    (!isset($arr_theme_settings['cover']) || $arr_theme_settings['cover'] == '' || $arr_theme_settings['cover'] == strip_tags($arr_theme_settings['cover'])) &&

+                    (!isset($arr_theme_settings['theme_timestamp']) || $arr_theme_settings['theme_timestamp'] == '' || is_numeric($arr_theme_settings['theme_timestamp'])) &&

+                    (!isset($arr_theme_settings['posts_per_page']) || in_array($arr_theme_settings['posts_per_page'], array('auto', 'single', 'double')))

+                ) {

+                    return true;

+                }

+            }

+

+            return false;

+        }

     }

 }
\ No newline at end of file
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-themes-compiler.php b/plugins/wordpress-mobile-pack/inc/class-wmp-themes-compiler.php
index d28abdee..d28abdee 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-themes-compiler.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-themes-compiler.php
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php b/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php
index e2914399..e2914399 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-themes-config.php
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-tokens.php b/plugins/wordpress-mobile-pack/inc/class-wmp-tokens.php
index 480113df..bc72281e 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-tokens.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-tokens.php
@@ -39,10 +39,11 @@ if ( ! class_exists( 'WMobilePack_Tokens' ) ) {
          * The method returns true if the token is valid and false otherwise.

          *

          * @param $token - string

+         * @param $webapp_id - The webapp's id (from Premium settings)

          * @return bool

          *

          */

-        public static function check_token($token)

+        public static function check_token($token, $webapp_id = false)

         {

 

             if (base64_decode($token,true)){

@@ -66,6 +67,15 @@ if ( ! class_exists( 'WMobilePack_Tokens' ) ) {
                             // check encoded domain

                             if ($arrParams[0] ==  $generated_url)

                                 return true;

+

+                            // get the generated encoded webappid

+                            if ($webapp_id !== false) {

+

+                                $generated_id = md5(md5($webapp_id));

+

+                                if ($arrParams[0] == $generated_id)

+                                    return true;

+                            }

                         }

                     }

                 }

diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-tracking.php b/plugins/wordpress-mobile-pack/inc/class-wmp-tracking.php
index 15e778e5..15e778e5 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-tracking.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-tracking.php
diff --git a/plugins/wordpress-mobile-pack/inc/class-wmp-uploads.php b/plugins/wordpress-mobile-pack/inc/class-wmp-uploads.php
index 5b97e2e0..5b97e2e0 100644..100755
--- a/plugins/wordpress-mobile-pack/inc/class-wmp-uploads.php
+++ b/plugins/wordpress-mobile-pack/inc/class-wmp-uploads.php