AMP for WP – Accelerated Mobile Pages

Version Description

(19th February 2019) = * Added: Mobile and tablets Detects separately for 'Mobile Redirection' option #2436 * Added: Scrolling bar for swift theme in chrome browser #2593 * Added: CSS condition when element markup is visible #2753 * Fixed: Pre tags not rendering properly on pages #2823 * Fixed: Logo resize should only apply when Resize setting is enable #2544 * Fixed: When /?amp is enabled "Visit AMP" is redirecting to dashboard #2363 * Fixed: ampforwp_wc_shortcode_title is loading globally #2756 * Fixed: Extra CSS is causing validation error of 50kb #2592 * Fixed: PHP warning issue in latest version of php #2895 * Fixed: Yoast analysis is giving false readings for the SEO When AMPforWP Pagebuilder is enabled #2435

Full changelog available in changelog.txt

Download this release

Release Info

Developer	ampforwp
Plugin	AMP for WP – Accelerated Mobile Pages
Version	0.9.97.36
Comparing to
See all releases

Code changes from version 0.9.97.35 to 0.9.97.36

Files changed (24) hide show

README.md +13 -1
accelerated-moblie-pages.php +2 -2
changelog.txt +12 -0
components/components-core.php +2 -1
components/logo/logo.php +1 -1
components/loop/loop.php +1 -0
components/related-posts/related-posts.php +1 -1
includes/admin-script.js +31 -0
includes/options/admin-config.php +9 -7
includes/redirect.php +25 -4
includes/vendor/Mobile_Detect.php +1474 -0
includes/vendor/vendor-changelog.txt +2 -1
pagebuilder/amp-page-builder.php +1 -0
pagebuilder/modules/contents-module.php +2 -1
readme.txt +13 -8
templates/category-widget.php +1 -1
templates/design-manager/design-1/elements/related-posts.php +1 -1
templates/design-manager/design-1/style.php +40 -1
templates/design-manager/design-2/elements/related-posts.php +1 -1
templates/design-manager/design-2/style.php +35 -2
templates/design-manager/design-3/elements/related-posts.php +1 -1
templates/design-manager/design-3/style.php +56 -3
templates/design-manager/swift/style.php +9 -15
templates/features.php +15 -14

README.md CHANGED Viewed

	@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.0.3
7	- Stable tag: 0.9.97.35
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -184,6 +184,18 @@ You can contact us from [here](https://ampforwp.com/contact/)
184
185	== Changelog ==
186












187	= 0.9.97.35 (16th February 2019) =
188	* Added: Levelup Compatability #2718
189	* Added: "Align Justify" Option in Page builder's text module #2665


4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.0.3
7	+ Stable tag: 0.9.97.36
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

184
185	== Changelog ==
186
187	+ = 0.9.97.36 (19th February 2019) =
188	+ * Added: Mobile and tablets Detects separately for 'Mobile Redirection' option #2436
189	+ * Added: Scrolling bar for swift theme in chrome browser #2593
190	+ * Added: CSS condition when element markup is visible #2753
191	+ * Fixed: Pre tags not rendering properly on pages #2823
192	+ * Fixed: Logo resize should only apply when Resize setting is enable #2544
193	+ * Fixed: When /?amp is enabled "Visit AMP" is redirecting to dashboard #2363
194	+ * Fixed: ampforwp_wc_shortcode_title is loading globally #2756
195	+ * Fixed: Extra CSS is causing validation error of 50kb #2592
196	+ * Fixed: PHP warning issue in latest version of php #2895
197	+ * Fixed: Yoast analysis is giving false readings for the SEO When AMPforWP Pagebuilder is enabled #2435
198	+
199	= 0.9.97.35 (16th February 2019) =
200	* Added: Levelup Compatability #2718
201	* Added: "Align Justify" Option in Page builder's text module #2665

accelerated-moblie-pages.php CHANGED Viewed

	@@ -3,7 +3,7 @@
3	Plugin Name: Accelerated Mobile Pages
4	Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5	Description: AMP for WP - Accelerated Mobile Pages for WordPress
6	- Version: 0.9.97.35
7	Author: Ahmed Kaludi, Mohammed Kaludi
8	Author URI: https://ampforwp.com/
9	Donate link: https://www.paypal.me/Kaludi/25
	@@ -20,7 +20,7 @@ define('AMPFORWP_PLUGIN_DIR_URI', plugin_dir_url(__FILE__));
20	define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21	define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22	define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23	- define('AMPFORWP_VERSION','0.9.97.35');
24	// any changes to AMP_QUERY_VAR should be refelected here
25	function ampforwp_generate_endpoint(){
26	$ampforwp_slug = '';


3	Plugin Name: Accelerated Mobile Pages
4	Plugin URI: https://wordpress.org/plugins/accelerated-mobile-pages/
5	Description: AMP for WP - Accelerated Mobile Pages for WordPress
6	+ Version: 0.9.97.36
7	Author: Ahmed Kaludi, Mohammed Kaludi
8	Author URI: https://ampforwp.com/
9	Donate link: https://www.paypal.me/Kaludi/25

20	define('AMPFORWP_DISQUS_URL',plugin_dir_url(__FILE__).'includes/disqus.html');
21	define('AMPFORWP_IMAGE_DIR',plugin_dir_url(__FILE__).'images');
22	define('AMPFORWP_MAIN_PLUGIN_DIR', plugin_dir_path( __DIR__ ) );
23	+ define('AMPFORWP_VERSION','0.9.97.36');
24	// any changes to AMP_QUERY_VAR should be refelected here
25	function ampforwp_generate_endpoint(){
26	$ampforwp_slug = '';

changelog.txt CHANGED Viewed

@@ -1,5 +1,17 @@
             == Changelog ==
             = 0.9.97.35 (16th February 2019) =
             * Added: Levelup Compatability #2718
             * Added: "Align Justify" Option in Page builder's text module #2665


1	== Changelog ==
2
3	+ = 0.9.97.36 (19th February 2019) =
4	+ * Added: Mobile and tablets Detects separately for 'Mobile Redirection' option #2436
5	+ * Added: Scrolling bar for swift theme in chrome browser #2593
6	+ * Added: CSS condition when element markup is visible #2753
7	+ * Fixed: Pre tags not rendering properly on pages #2823
8	+ * Fixed: Logo resize should only apply when Resize setting is enable #2544
9	+ * Fixed: When /?amp is enabled "Visit AMP" is redirecting to dashboard #2363
10	+ * Fixed: ampforwp_wc_shortcode_title is loading globally #2756
11	+ * Fixed: Extra CSS is causing validation error of 50kb #2592
12	+ * Fixed: PHP warning issue in latest version of php #2895
13	+ * Fixed: Yoast analysis is giving false readings for the SEO When AMPforWP Pagebuilder is enabled #2435
14	+
15	= 0.9.97.35 (16th February 2019) =
16	* Added: Levelup Compatability #2718
17	* Added: "Align Justify" Option in Page builder's text module #2665

components/components-core.php CHANGED Viewed

	@@ -125,6 +125,7 @@ function amp_title(){
125	function amp_excerpt( $no_of_words=15 ) {
126	global $redux_builder_amp, $post;
127	$post_id = '';

128
129	if ( ampforwp_is_front_page() ) {
130	$post_id = ampforwp_get_frontpage_id();
	@@ -637,7 +638,7 @@ function ampforwp_backtotop_global_css(){
637	if( true == ampforwp_get_setting('ampforwp-footer-top') ) { ?>
638	.btt{
639	position: fixed;
640	- <?php if( (is_single() && ~~$redux_builder_amp[~~'enable-single-social-icons']) \|\| (is_page() && true == ~~$redux_builder_amp[~~'ampforwp-page-sticky-social']) ){ ?>
641	bottom: 55px;
642	<?php } else { ?>
643	bottom: 20px;


125	function amp_excerpt( $no_of_words=15 ) {
126	global $redux_builder_amp, $post;
127	$post_id = '';
128	+ $no_of_words = (int) $no_of_words;
129
130	if ( ampforwp_is_front_page() ) {
131	$post_id = ampforwp_get_frontpage_id();

638	if( true == ampforwp_get_setting('ampforwp-footer-top') ) { ?>
639	.btt{
640	position: fixed;
641	+ <?php if( (is_single() && ampforwp_get_setting('enable-single-social-icons')) \|\| (is_page() && true == ampforwp_get_setting('ampforwp-page-sticky-social')) ){ ?>
642	bottom: 55px;
643	<?php } else { ?>
644	bottom: 20px;

components/logo/logo.php CHANGED Viewed

	@@ -40,7 +40,7 @@ if( !function_exists( 'amp_framework_logo_styles' ) ){
40	global $redux_builder_amp;
41	$max_width = '190px';
42	$width = (integer) ampforwp_default_logo('width');
43	- if ( true == ~~$redux_builder_amp[~~'ampforwp-custom-logo-dimensions~~-options~~'] && ~~isset~~(~~$redux_builder_amp[~~'ampforwp-custom-logo-dimensions-options']) && 'flexible' == ~~$redux_builder_amp[~~'ampforwp-custom-logo-dimensions-options'] ) {
44	$max_width = (integer) $redux_builder_amp['ampforwp-custom-logo-dimensions-slider'];
45	$width = (integer) ampforwp_default_logo('width');
46	$max_width = ceil(($width*$max_width)/100)."px";


40	global $redux_builder_amp;
41	$max_width = '190px';
42	$width = (integer) ampforwp_default_logo('width');
43	+ if ( true == ampforwp_get_setting('ampforwp-custom-logo-dimensions') && true == ampforwp_get_setting('ampforwp-custom-logo-dimensions-options') && 'flexible' == ampforwp_get_setting('ampforwp-custom-logo-dimensions-options') ) {
44	$max_width = (integer) $redux_builder_amp['ampforwp-custom-logo-dimensions-slider'];
45	$width = (integer) ampforwp_default_logo('width');
46	$max_width = ceil(($width*$max_width)/100)."px";

components/loop/loop.php CHANGED Viewed

	@@ -303,6 +303,7 @@ function amp_loop_date($args=array()){
303	function amp_loop_excerpt($excerpt_length = 15,$tag = 'p', $class = ''){
304	//excerpt
305	global $post,$redux_builder_amp;

306	if( has_excerpt() ) {
307	$content = get_the_excerpt();
308	} else {


303	function amp_loop_excerpt($excerpt_length = 15,$tag = 'p', $class = ''){
304	//excerpt
305	global $post,$redux_builder_amp;
306	+ $excerpt_length = (int) $excerpt_length;
307	if( has_excerpt() ) {
308	$content = get_the_excerpt();
309	} else {

components/related-posts/related-posts.php CHANGED Viewed

	@@ -180,7 +180,7 @@ function ampforwp_get_relatedpost_content($argsdata=array()){
180	$content = get_the_content();
181	}
182	?><p><?php
183	- echo (wp_trim_words( strip_shortcodes( $content ) , '15' ));
184	?></p><?php
185	}
186	$show_author = (isset($argsdata['show_author'])? $argsdata['show_author'] : true);


180	$content = get_the_content();
181	}
182	?><p><?php
183	+ echo (wp_trim_words( strip_shortcodes( $content ) , 15 ));
184	?></p><?php
185	}
186	$show_author = (isset($argsdata['show_author'])? $argsdata['show_author'] : true);

includes/admin-script.js CHANGED Viewed

@@ -575,3 +575,34 @@ function getQueryStringValue (key) {
               return decodeURIComponent(window.location.search.replace(new RegExp("^(?:.*[&\\?]" + encodeURIComponent(key).replace(/[\.\+\*]/g, "\\$&") + "(?:\\=([^&]*))?)?.*$", "i"), "$1"));
+            }


575	return decodeURIComponent(window.location.search.replace(new RegExp("^(?:.[&\\?]" + encodeURIComponent(key).replace(/[\.\+\]/g, "\\$&") + "(?:\\=([^&]))?)?.$", "i"), "$1"));
576	}
577
578	+ jQuery(window).on("YoastSEO:ready",function(){
579	+ AmpForWpYoastAnalysis = function() {
580	+ YoastSEO.app.registerPlugin( 'ampForWpYoastAnalysis', {status: 'ready'} );
581	+
582	+ /**
583	+ * @param modification {string} The name of the filter
584	+ * @param callable {function} The callable
585	+ * @param pluginName {string} The plugin that is registering the modification.
586	+ * @param priority {number} (optional) Used to specify the order in which the callables
587	+ * associated with a particular filter are called. Lower numbers
588	+ * correspond with earlier execution.
589	+ */
590	+ YoastSEO.app.registerModification( 'content', this.myContentModification, 'ampForWpYoastAnalysis', 5 );
591	+ }
592	+
593	+ /**
594	+ * Adds some text to the data...
595	+ *
596	+ * @param data The data to modify
597	+ */
598	+ AmpForWpYoastAnalysis.prototype.myContentModification = function(data) {
599	+ var pbdata = $('#amp-page-builder-ready').val();
600	+ var takeover = redux_data['ampforwp-amp-takeover'];
601	+ var pb2 = $('input[name="ampforwp_page_builder_enable"]').val();
602	+ if ( takeover == 1 && 'yes' == pb2 ) {
603	+ data = pbdata;
604	+ }
605	+ return data;
606	+ };
607	+ new AmpForWpYoastAnalysis();
608	+ });

includes/options/admin-config.php CHANGED Viewed

	@@ -3603,6 +3603,15 @@ Redux::setSection( $opt_name, array(
3603	'default' => 0,
3604
3605	),









3606	array(
3607	'id' => 'convert-internal-nonamplinks-to-amp',
3608	'type' => 'switch',
	@@ -4673,13 +4682,6 @@ Redux::setSection( $opt_name, array(
4673	'required' => array('gnrl-sidebar', '=' , '1'),
4674
4675	),
4676	- array(
4677	- 'id' => 'gnrl-dark-view',
4678	- 'type' => 'switch',
4679	- 'title' => esc_html__('Darkview', 'accelerated-mobile-pages'),
4680	- 'default' => 0,
4681	- 'required' => array( array('amp-design-selector', '=' , '4') ),
4682	- ),
4683	array(
4684	'id' => 'design-advanced',
4685	'type' => 'section',


3603	'default' => 0,
3604
3605	),
3606	+ array(
3607	+ 'id' => 'amp-tablet-redirection',
3608	+ 'class' => 'child_opt child_opt_arrow',
3609	+ 'type' => 'switch',
3610	+ 'title' => __('Tablets', 'accelerated-mobile-pages'),
3611	+ 'tooltip-subtitle' => __('Enable/Disable Mobile redirection for Tablets.','accelerated-mobile-pages'),
3612	+ 'default' => 1,
3613	+ 'required' => array( 'amp-mobile-redirection', '=' , 1 )
3614	+ ),
3615	array(
3616	'id' => 'convert-internal-nonamplinks-to-amp',
3617	'type' => 'switch',

4682	'required' => array('gnrl-sidebar', '=' , '1'),
4683
4684	),







4685	array(
4686	'id' => 'design-advanced',
4687	'type' => 'section',

includes/redirect.php CHANGED Viewed

	@@ -6,11 +6,17 @@ if ( ! defined( 'ABSPATH' ) ) {
6	// Redirection for Homepage and Archive Pages when Turned Off from options panel
7	function ampforwp_check_amp_page_status() {
8	global $redux_builder_amp, $wp;
9	- $hide_cats_amp = '';
10	$hide_cats_amp = is_category_amp_disabled();
11	if ( ampforwp_is_amp_endpoint() ) {
12	if ( (is_archive() && 0 == $redux_builder_amp['ampforwp-archive-support']) \|\| true == $hide_cats_amp \|\| ((ampforwp_is_home() \|\| ampforwp_is_front_page()) && 0 == $redux_builder_amp['ampforwp-homepage-on-off-support']) ) {
13	- ~~$redirection_location = add_query_arg( '', '', home_url( $wp->request ) );~~






14
15	$redirection_location = trailingslashit($redirection_location );
16
	@@ -147,6 +153,21 @@ function ampforwp_page_template_redirect() {
147
148
149	if ( isset($redux_builder_amp['amp-mobile-redirection']) && $redux_builder_amp['amp-mobile-redirection'] ) {















150	// Return if Dev mode is enabled
151	if ( isset($redux_builder_amp['ampforwp-development-mode']) && $redux_builder_amp['ampforwp-development-mode'] ) {
152	return;
	@@ -230,7 +251,7 @@ function ampforwp_page_template_redirect() {
230	return;
231	}
232
233	- if ( ~~wp_is_mobile()~~ && 'mobile-on' == $_SESSION['ampforwp_amp_mode'] && 1 == $_GET['nonamp'] ) {
234	// non mobile session variable creation
235	session_start();
236	$_SESSION['ampforwp_mobile'] = 'exit';
	@@ -243,7 +264,7 @@ function ampforwp_page_template_redirect() {
243	$url_to_redirect = ampforwp_url_controller($url_to_redirect);
244	}
245	// Check if we are on Mobile phones then start redirection process
246	- if ( ~~wp_is_mobile()~~ ) {
247
248	if ( ! isset($_SESSION['ampforwp_amp_mode']) \|\| ! isset($_GET['nonamp']) ) {
249


6	// Redirection for Homepage and Archive Pages when Turned Off from options panel
7	function ampforwp_check_amp_page_status() {
8	global $redux_builder_amp, $wp;
9	+ $hide_cats_amp = $url = '';
10	$hide_cats_amp = is_category_amp_disabled();
11	if ( ampforwp_is_amp_endpoint() ) {
12	if ( (is_archive() && 0 == $redux_builder_amp['ampforwp-archive-support']) \|\| true == $hide_cats_amp \|\| ((ampforwp_is_home() \|\| ampforwp_is_front_page()) && 0 == $redux_builder_amp['ampforwp-homepage-on-off-support']) ) {
13	+
14	+ $url = $wp->request;
15	+ if( ampforwp_is_home() && get_query_var('amp') ) {
16	+ $url = 'amp';
17	+ }
18	+
19	+ $redirection_location = add_query_arg( '', '', home_url( $url ) );
20
21	$redirection_location = trailingslashit($redirection_location );
22

153
154
155	if ( isset($redux_builder_amp['amp-mobile-redirection']) && $redux_builder_amp['amp-mobile-redirection'] ) {
156	+ $mobile_detect = $isTablet = '';
157	+ require_once AMPFORWP_PLUGIN_DIR.'/includes/vendor/Mobile_Detect.php';
158	+ // instantiate the Mobile detect class
159	+ $mobile_detect = new AMPforWP_Mobile_Detect;
160	+ $isMobile = $mobile_detect->isMobile();
161	+ $isTablet = $mobile_detect->isTablet();
162	+ $isTabletUserAction = ampforwp_get_setting('amp-tablet-redirection');
163	+
164	+ $redirectToAMP = false;
165	+ if( $isMobile && $isTabletUserAction && $isTablet ){ //Only For tablet
166	+ $redirectToAMP = true;
167	+ }else if($isMobile && !$isTablet){ // Only for mobile
168	+ $redirectToAMP = true;
169	+ }
170	+
171	// Return if Dev mode is enabled
172	if ( isset($redux_builder_amp['ampforwp-development-mode']) && $redux_builder_amp['ampforwp-development-mode'] ) {
173	return;

251	return;
252	}
253
254	+ if ( $isMobile && 'mobile-on' == $_SESSION['ampforwp_amp_mode'] && 1 == $_GET['nonamp'] ) {
255	// non mobile session variable creation
256	session_start();
257	$_SESSION['ampforwp_mobile'] = 'exit';

264	$url_to_redirect = ampforwp_url_controller($url_to_redirect);
265	}
266	// Check if we are on Mobile phones then start redirection process
267	+ if ( $redirectToAMP ) {
268
269	if ( ! isset($_SESSION['ampforwp_amp_mode']) \|\| ! isset($_GET['nonamp']) ) {
270

includes/vendor/Mobile_Detect.php ADDED Viewed

	@@ -0,0 +1,1474 @@


1	+ <?php
2	+ /**
3	+ * Mobile Detect Library
4	+ * Motto: "Every business should have a mobile detection script to detect mobile readers"
5	+ *
6	+ * Mobile_Detect is a lightweight PHP class for detecting mobile devices (including tablets).
7	+ * It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.
8	+ *
9	+ * Homepage: http://mobiledetect.net
10	+ * GitHub: https://github.com/serbanghita/Mobile-Detect
11	+ * README: https://github.com/serbanghita/Mobile-Detect/blob/master/README.md
12	+ * CONTRIBUTING: https://github.com/serbanghita/Mobile-Detect/blob/master/docs/CONTRIBUTING.md
13	+ * KNOWN LIMITATIONS: https://github.com/serbanghita/Mobile-Detect/blob/master/docs/KNOWN_LIMITATIONS.md
14	+ * EXAMPLES: https://github.com/serbanghita/Mobile-Detect/wiki/Code-examples
15	+ *
16	+ * @license https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt MIT License
17	+ * @author Serban Ghita <serbanghita@gmail.com>
18	+ * @author Nick Ilyin <nick.ilyin@gmail.com>
19	+ * Original author: Victor Stanciu <vic.stanciu@gmail.com>
20	+ *
21	+ * @version 2.8.33
22	+ */
23	+ class AMPforWP_Mobile_Detect
24	+ {
25	+ /**
26	+ * Mobile detection type.
27	+ *
28	+ * @deprecated since version 2.6.9
29	+ */
30	+ const DETECTION_TYPE_MOBILE = 'mobile';
31	+
32	+ /**
33	+ * Extended detection type.
34	+ *
35	+ * @deprecated since version 2.6.9
36	+ */
37	+ const DETECTION_TYPE_EXTENDED = 'extended';
38	+
39	+ /**
40	+ * A frequently used regular expression to extract version #s.
41	+ *
42	+ * @deprecated since version 2.6.9
43	+ */
44	+ const VER = '([\w._\+]+)';
45	+
46	+ /**
47	+ * Top-level device.
48	+ */
49	+ const MOBILE_GRADE_A = 'A';
50	+
51	+ /**
52	+ * Mid-level device.
53	+ */
54	+ const MOBILE_GRADE_B = 'B';
55	+
56	+ /**
57	+ * Low-level device.
58	+ */
59	+ const MOBILE_GRADE_C = 'C';
60	+
61	+ /**
62	+ * Stores the version number of the current release.
63	+ */
64	+ const VERSION = '2.8.33';
65	+
66	+ /**
67	+ * A type for the version() method indicating a string return value.
68	+ */
69	+ const VERSION_TYPE_STRING = 'text';
70	+
71	+ /**
72	+ * A type for the version() method indicating a float return value.
73	+ */
74	+ const VERSION_TYPE_FLOAT = 'float';
75	+
76	+ /**
77	+ * A cache for resolved matches
78	+ * @var array
79	+ */
80	+ protected $cache = array();
81	+
82	+ /**
83	+ * The User-Agent HTTP header is stored in here.
84	+ * @var string
85	+ */
86	+ protected $userAgent = null;
87	+
88	+ /**
89	+ * HTTP headers in the PHP-flavor. So HTTP_USER_AGENT and SERVER_SOFTWARE.
90	+ * @var array
91	+ */
92	+ protected $httpHeaders = array();
93	+
94	+ /**
95	+ * CloudFront headers. E.g. CloudFront-Is-Desktop-Viewer, CloudFront-Is-Mobile-Viewer & CloudFront-Is-Tablet-Viewer.
96	+ * @var array
97	+ */
98	+ protected $cloudfrontHeaders = array();
99	+
100	+ /**
101	+ * The matching Regex.
102	+ * This is good for debug.
103	+ * @var string
104	+ */
105	+ protected $matchingRegex = null;
106	+
107	+ /**
108	+ * The matches extracted from the regex expression.
109	+ * This is good for debug.
110	+ *
111	+ * @var string
112	+ */
113	+ protected $matchesArray = null;
114	+
115	+ /**
116	+ * The detection type, using self::DETECTION_TYPE_MOBILE or self::DETECTION_TYPE_EXTENDED.
117	+ *
118	+ * @deprecated since version 2.6.9
119	+ *
120	+ * @var string
121	+ */
122	+ protected $detectionType = self::DETECTION_TYPE_MOBILE;
123	+
124	+ /**
125	+ * HTTP headers that trigger the 'isMobile' detection
126	+ * to be true.
127	+ *
128	+ * @var array
129	+ */
130	+ protected static $mobileHeaders = array(
131	+
132	+ 'HTTP_ACCEPT' => array('matches' => array(
133	+ // Opera Mini; @reference: http://dev.opera.com/articles/view/opera-binary-markup-language/
134	+ 'application/x-obml2d',
135	+ // BlackBerry devices.
136	+ 'application/vnd.rim.html',
137	+ 'text/vnd.wap.wml',
138	+ 'application/vnd.wap.xhtml+xml'
139	+ )),
140	+ 'HTTP_X_WAP_PROFILE' => null,
141	+ 'HTTP_X_WAP_CLIENTID' => null,
142	+ 'HTTP_WAP_CONNECTION' => null,
143	+ 'HTTP_PROFILE' => null,
144	+ // Reported by Opera on Nokia devices (eg. C3).
145	+ 'HTTP_X_OPERAMINI_PHONE_UA' => null,
146	+ 'HTTP_X_NOKIA_GATEWAY_ID' => null,
147	+ 'HTTP_X_ORANGE_ID' => null,
148	+ 'HTTP_X_VODAFONE_3GPDPCONTEXT' => null,
149	+ 'HTTP_X_HUAWEI_USERID' => null,
150	+ // Reported by Windows Smartphones.
151	+ 'HTTP_UA_OS' => null,
152	+ // Reported by Verizon, Vodafone proxy system.
153	+ 'HTTP_X_MOBILE_GATEWAY' => null,
154	+ // Seen this on HTC Sensation. SensationXE_Beats_Z715e.
155	+ 'HTTP_X_ATT_DEVICEID' => null,
156	+ // Seen this on a HTC.
157	+ 'HTTP_UA_CPU' => array('matches' => array('ARM')),
158	+ );
159	+
160	+ /**
161	+ * List of mobile devices (phones).
162	+ *
163	+ * @var array
164	+ */
165	+ protected static $phoneDevices = array(
166	+ 'iPhone' => '\biPhone\b\|\biPod\b', // \|\biTunes
167	+ 'BlackBerry' => 'BlackBerry\|\bBB10\b\|rim[0-9]+',
168	+ 'HTC' => 'HTC\|HTC.(Sensation\|Evo\|Vision\|Explorer\|6800\|8100\|8900\|A7272\|S510e\|C110e\|Legend\|Desire\|T8282)\|APX515CKT\|Qtek9090\|APA9292KT\|HD_mini\|Sensation.Z710e\|PG86100\|Z715e\|Desire.(A8181\|HD)\|ADR6200\|ADR6400L\|ADR6425\|001HT\|Inspire 4G\|Android.\bEVO\b\|T-Mobile G1\|Z520m\|Android [0-9.]+; Pixel',
169	+ 'Nexus' => 'Nexus One\|Nexus S\|Galaxy.Nexus\|Android.Nexus.*Mobile\|Nexus 4\|Nexus 5\|Nexus 6',
170	+ // @todo: Is 'Dell Streak' a tablet or a phone? ;)
171	+ 'Dell' => 'Dell[;]? (Streak\|Aero\|Venue\|Venue Pro\|Flash\|Smoke\|Mini 3iX)\|XCD28\|XCD35\|\b001DL\b\|\b101DL\b\|\bGS01\b',
172	+ 'Motorola' => 'Motorola\|DROIDX\|DROID BIONIC\|\bDroid\b.Build\|Android.Xoom\|HRI39\|MOT-\|A1260\|A1680\|A555\|A853\|A855\|A953\|A955\|A956\|Motorola.ELECTRIFY\|Motorola.i1\|i867\|i940\|MB200\|MB300\|MB501\|MB502\|MB508\|MB511\|MB520\|MB525\|MB526\|MB611\|MB612\|MB632\|MB810\|MB855\|MB860\|MB861\|MB865\|MB870\|ME501\|ME502\|ME511\|ME525\|ME600\|ME632\|ME722\|ME811\|ME860\|ME863\|ME865\|MT620\|MT710\|MT716\|MT720\|MT810\|MT870\|MT917\|Motorola.*TITANIUM\|WX435\|WX445\|XT300\|XT301\|XT311\|XT316\|XT317\|XT319\|XT320\|XT390\|XT502\|XT530\|XT531\|XT532\|XT535\|XT603\|XT610\|XT611\|XT615\|XT681\|XT701\|XT702\|XT711\|XT720\|XT800\|XT806\|XT860\|XT862\|XT875\|XT882\|XT883\|XT894\|XT901\|XT907\|XT909\|XT910\|XT912\|XT928\|XT926\|XT915\|XT919\|XT925\|XT1021\|\bMoto E\b\|XT1068\|XT1092\|XT1052',
173	+ 'Samsung' => '\bSamsung\b\|SM-G950F\|SM-G955F\|SM-G9250\|GT-19300\|SGH-I337\|BGT-S5230\|GT-B2100\|GT-B2700\|GT-B2710\|GT-B3210\|GT-B3310\|GT-B3410\|GT-B3730\|GT-B3740\|GT-B5510\|GT-B5512\|GT-B5722\|GT-B6520\|GT-B7300\|GT-B7320\|GT-B7330\|GT-B7350\|GT-B7510\|GT-B7722\|GT-B7800\|GT-C3010\|GT-C3011\|GT-C3060\|GT-C3200\|GT-C3212\|GT-C3212I\|GT-C3262\|GT-C3222\|GT-C3300\|GT-C3300K\|GT-C3303\|GT-C3303K\|GT-C3310\|GT-C3322\|GT-C3330\|GT-C3350\|GT-C3500\|GT-C3510\|GT-C3530\|GT-C3630\|GT-C3780\|GT-C5010\|GT-C5212\|GT-C6620\|GT-C6625\|GT-C6712\|GT-E1050\|GT-E1070\|GT-E1075\|GT-E1080\|GT-E1081\|GT-E1085\|GT-E1087\|GT-E1100\|GT-E1107\|GT-E1110\|GT-E1120\|GT-E1125\|GT-E1130\|GT-E1160\|GT-E1170\|GT-E1175\|GT-E1180\|GT-E1182\|GT-E1200\|GT-E1210\|GT-E1225\|GT-E1230\|GT-E1390\|GT-E2100\|GT-E2120\|GT-E2121\|GT-E2152\|GT-E2220\|GT-E2222\|GT-E2230\|GT-E2232\|GT-E2250\|GT-E2370\|GT-E2550\|GT-E2652\|GT-E3210\|GT-E3213\|GT-I5500\|GT-I5503\|GT-I5700\|GT-I5800\|GT-I5801\|GT-I6410\|GT-I6420\|GT-I7110\|GT-I7410\|GT-I7500\|GT-I8000\|GT-I8150\|GT-I8160\|GT-I8190\|GT-I8320\|GT-I8330\|GT-I8350\|GT-I8530\|GT-I8700\|GT-I8703\|GT-I8910\|GT-I9000\|GT-I9001\|GT-I9003\|GT-I9010\|GT-I9020\|GT-I9023\|GT-I9070\|GT-I9082\|GT-I9100\|GT-I9103\|GT-I9220\|GT-I9250\|GT-I9300\|GT-I9305\|GT-I9500\|GT-I9505\|GT-M3510\|GT-M5650\|GT-M7500\|GT-M7600\|GT-M7603\|GT-M8800\|GT-M8910\|GT-N7000\|GT-S3110\|GT-S3310\|GT-S3350\|GT-S3353\|GT-S3370\|GT-S3650\|GT-S3653\|GT-S3770\|GT-S3850\|GT-S5210\|GT-S5220\|GT-S5229\|GT-S5230\|GT-S5233\|GT-S5250\|GT-S5253\|GT-S5260\|GT-S5263\|GT-S5270\|GT-S5300\|GT-S5330\|GT-S5350\|GT-S5360\|GT-S5363\|GT-S5369\|GT-S5380\|GT-S5380D\|GT-S5560\|GT-S5570\|GT-S5600\|GT-S5603\|GT-S5610\|GT-S5620\|GT-S5660\|GT-S5670\|GT-S5690\|GT-S5750\|GT-S5780\|GT-S5830\|GT-S5839\|GT-S6102\|GT-S6500\|GT-S7070\|GT-S7200\|GT-S7220\|GT-S7230\|GT-S7233\|GT-S7250\|GT-S7500\|GT-S7530\|GT-S7550\|GT-S7562\|GT-S7710\|GT-S8000\|GT-S8003\|GT-S8500\|GT-S8530\|GT-S8600\|SCH-A310\|SCH-A530\|SCH-A570\|SCH-A610\|SCH-A630\|SCH-A650\|SCH-A790\|SCH-A795\|SCH-A850\|SCH-A870\|SCH-A890\|SCH-A930\|SCH-A950\|SCH-A970\|SCH-A990\|SCH-I100\|SCH-I110\|SCH-I400\|SCH-I405\|SCH-I500\|SCH-I510\|SCH-I515\|SCH-I600\|SCH-I730\|SCH-I760\|SCH-I770\|SCH-I830\|SCH-I910\|SCH-I920\|SCH-I959\|SCH-LC11\|SCH-N150\|SCH-N300\|SCH-R100\|SCH-R300\|SCH-R351\|SCH-R400\|SCH-R410\|SCH-T300\|SCH-U310\|SCH-U320\|SCH-U350\|SCH-U360\|SCH-U365\|SCH-U370\|SCH-U380\|SCH-U410\|SCH-U430\|SCH-U450\|SCH-U460\|SCH-U470\|SCH-U490\|SCH-U540\|SCH-U550\|SCH-U620\|SCH-U640\|SCH-U650\|SCH-U660\|SCH-U700\|SCH-U740\|SCH-U750\|SCH-U810\|SCH-U820\|SCH-U900\|SCH-U940\|SCH-U960\|SCS-26UC\|SGH-A107\|SGH-A117\|SGH-A127\|SGH-A137\|SGH-A157\|SGH-A167\|SGH-A177\|SGH-A187\|SGH-A197\|SGH-A227\|SGH-A237\|SGH-A257\|SGH-A437\|SGH-A517\|SGH-A597\|SGH-A637\|SGH-A657\|SGH-A667\|SGH-A687\|SGH-A697\|SGH-A707\|SGH-A717\|SGH-A727\|SGH-A737\|SGH-A747\|SGH-A767\|SGH-A777\|SGH-A797\|SGH-A817\|SGH-A827\|SGH-A837\|SGH-A847\|SGH-A867\|SGH-A877\|SGH-A887\|SGH-A897\|SGH-A927\|SGH-B100\|SGH-B130\|SGH-B200\|SGH-B220\|SGH-C100\|SGH-C110\|SGH-C120\|SGH-C130\|SGH-C140\|SGH-C160\|SGH-C170\|SGH-C180\|SGH-C200\|SGH-C207\|SGH-C210\|SGH-C225\|SGH-C230\|SGH-C417\|SGH-C450\|SGH-D307\|SGH-D347\|SGH-D357\|SGH-D407\|SGH-D415\|SGH-D780\|SGH-D807\|SGH-D980\|SGH-E105\|SGH-E200\|SGH-E315\|SGH-E316\|SGH-E317\|SGH-E335\|SGH-E590\|SGH-E635\|SGH-E715\|SGH-E890\|SGH-F300\|SGH-F480\|SGH-I200\|SGH-I300\|SGH-I320\|SGH-I550\|SGH-I577\|SGH-I600\|SGH-I607\|SGH-I617\|SGH-I627\|SGH-I637\|SGH-I677\|SGH-I700\|SGH-I717\|SGH-I727\|SGH-i747M\|SGH-I777\|SGH-I780\|SGH-I827\|SGH-I847\|SGH-I857\|SGH-I896\|SGH-I897\|SGH-I900\|SGH-I907\|SGH-I917\|SGH-I927\|SGH-I937\|SGH-I997\|SGH-J150\|SGH-J200\|SGH-L170\|SGH-L700\|SGH-M110\|SGH-M150\|SGH-M200\|SGH-N105\|SGH-N500\|SGH-N600\|SGH-N620\|SGH-N625\|SGH-N700\|SGH-N710\|SGH-P107\|SGH-P207\|SGH-P300\|SGH-P310\|SGH-P520\|SGH-P735\|SGH-P777\|SGH-Q105\|SGH-R210\|SGH-R220\|SGH-R225\|SGH-S105\|SGH-S307\|SGH-T109\|SGH-T119\|SGH-T139\|SGH-T209\|SGH-T219\|SGH-T229\|SGH-T239\|SGH-T249\|SGH-T259\|SGH-T309\|SGH-T319\|SGH-T329\|SGH-T339\|SGH-T349\|SGH-T359\|SGH-T369\|SGH-T379\|SGH-T409\|SGH-T429\|SGH-T439\|SGH-T459\|SGH-T469\|SGH-T479\|SGH-T499\|SGH-T509\|SGH-T519\|SGH-T539\|SGH-T559\|SGH-T589\|SGH-T609\|SGH-T619\|SGH-T629\|SGH-T639\|SGH-T659\|SGH-T669\|SGH-T679\|SGH-T709\|SGH-T719\|SGH-T729\|SGH-T739\|SGH-T746\|SGH-T749\|SGH-T759\|SGH-T769\|SGH-T809\|SGH-T819\|SGH-T839\|SGH-T919\|SGH-T929\|SGH-T939\|SGH-T959\|SGH-T989\|SGH-U100\|SGH-U200\|SGH-U800\|SGH-V205\|SGH-V206\|SGH-X100\|SGH-X105\|SGH-X120\|SGH-X140\|SGH-X426\|SGH-X427\|SGH-X475\|SGH-X495\|SGH-X497\|SGH-X507\|SGH-X600\|SGH-X610\|SGH-X620\|SGH-X630\|SGH-X700\|SGH-X820\|SGH-X890\|SGH-Z130\|SGH-Z150\|SGH-Z170\|SGH-ZX10\|SGH-ZX20\|SHW-M110\|SPH-A120\|SPH-A400\|SPH-A420\|SPH-A460\|SPH-A500\|SPH-A560\|SPH-A600\|SPH-A620\|SPH-A660\|SPH-A700\|SPH-A740\|SPH-A760\|SPH-A790\|SPH-A800\|SPH-A820\|SPH-A840\|SPH-A880\|SPH-A900\|SPH-A940\|SPH-A960\|SPH-D600\|SPH-D700\|SPH-D710\|SPH-D720\|SPH-I300\|SPH-I325\|SPH-I330\|SPH-I350\|SPH-I500\|SPH-I600\|SPH-I700\|SPH-L700\|SPH-M100\|SPH-M220\|SPH-M240\|SPH-M300\|SPH-M305\|SPH-M320\|SPH-M330\|SPH-M350\|SPH-M360\|SPH-M370\|SPH-M380\|SPH-M510\|SPH-M540\|SPH-M550\|SPH-M560\|SPH-M570\|SPH-M580\|SPH-M610\|SPH-M620\|SPH-M630\|SPH-M800\|SPH-M810\|SPH-M850\|SPH-M900\|SPH-M910\|SPH-M920\|SPH-M930\|SPH-N100\|SPH-N200\|SPH-N240\|SPH-N300\|SPH-N400\|SPH-Z400\|SWC-E100\|SCH-i909\|GT-N7100\|GT-N7105\|SCH-I535\|SM-N900A\|SGH-I317\|SGH-T999L\|GT-S5360B\|GT-I8262\|GT-S6802\|GT-S6312\|GT-S6310\|GT-S5312\|GT-S5310\|GT-I9105\|GT-I8510\|GT-S6790N\|SM-G7105\|SM-N9005\|GT-S5301\|GT-I9295\|GT-I9195\|SM-C101\|GT-S7392\|GT-S7560\|GT-B7610\|GT-I5510\|GT-S7582\|GT-S7530E\|GT-I8750\|SM-G9006V\|SM-G9008V\|SM-G9009D\|SM-G900A\|SM-G900D\|SM-G900F\|SM-G900H\|SM-G900I\|SM-G900J\|SM-G900K\|SM-G900L\|SM-G900M\|SM-G900P\|SM-G900R4\|SM-G900S\|SM-G900T\|SM-G900V\|SM-G900W8\|SHV-E160K\|SCH-P709\|SCH-P729\|SM-T2558\|GT-I9205\|SM-G9350\|SM-J120F\|SM-G920F\|SM-G920V\|SM-G930F\|SM-N910C\|SM-A310F\|GT-I9190\|SM-J500FN\|SM-G903F\|SM-J330F',
174	+ 'LG' => '\bLG\b;\|LG[- ]?(C800\|C900\|E400\|E610\|E900\|E-900\|F160\|F180K\|F180L\|F180S\|730\|855\|L160\|LS740\|LS840\|LS970\|LU6200\|MS690\|MS695\|MS770\|MS840\|MS870\|MS910\|P500\|P700\|P705\|VM696\|AS680\|AS695\|AX840\|C729\|E970\|GS505\|272\|C395\|E739BK\|E960\|L55C\|L75C\|LS696\|LS860\|P769BK\|P350\|P500\|P509\|P870\|UN272\|US730\|VS840\|VS950\|LN272\|LN510\|LS670\|LS855\|LW690\|MN270\|MN510\|P509\|P769\|P930\|UN200\|UN270\|UN510\|UN610\|US670\|US740\|US760\|UX265\|UX840\|VN271\|VN530\|VS660\|VS700\|VS740\|VS750\|VS910\|VS920\|VS930\|VX9200\|VX11000\|AX840A\|LW770\|P506\|P925\|P999\|E612\|D955\|D802\|MS323\|M257)',
175	+ 'Sony' => 'SonyST\|SonyLT\|SonyEricsson\|SonyEricssonLT15iv\|LT18i\|E10i\|LT28h\|LT26w\|SonyEricssonMT27i\|C5303\|C6902\|C6903\|C6906\|C6943\|D2533',
176	+ 'Asus' => 'Asus.Galaxy\|PadFone.Mobile',
177	+ 'NokiaLumia' => 'Lumia [0-9]{3,4}',
178	+ // http://www.micromaxinfo.com/mobiles/smartphones
179	+ // Added because the codes might conflict with Acer Tablets.
180	+ 'Micromax' => 'Micromax.*\b(A210\|A92\|A88\|A72\|A111\|A110Q\|A115\|A116\|A110\|A90S\|A26\|A51\|A35\|A54\|A25\|A27\|A89\|A68\|A65\|A57\|A90)\b',
181	+ // @todo Complete the regex.
182	+ 'Palm' => 'PalmSource\|Palm', // avantgo\|blazer\|elaine\|hiptop\|plucker\|xiino ;
183	+ 'Vertu' => 'Vertu\|Vertu.Ltd\|Vertu.Ascent\|Vertu.Ayxta\|Vertu.Constellation(F\|Quest)?\|Vertu.Monika\|Vertu.Signature', // Just for fun ;)
184	+ // http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA (PANTECH)
185	+ // Most of the VEGA devices are legacy. PANTECH seem to be newer devices based on Android.
186	+ 'Pantech' => 'PANTECH\|IM-A850S\|IM-A840S\|IM-A830L\|IM-A830K\|IM-A830S\|IM-A820L\|IM-A810K\|IM-A810S\|IM-A800S\|IM-T100K\|IM-A725L\|IM-A780L\|IM-A775C\|IM-A770K\|IM-A760S\|IM-A750K\|IM-A740S\|IM-A730S\|IM-A720L\|IM-A710K\|IM-A690L\|IM-A690S\|IM-A650S\|IM-A630K\|IM-A600S\|VEGA PTL21\|PT003\|P8010\|ADR910L\|P6030\|P6020\|P9070\|P4100\|P9060\|P5000\|CDM8992\|TXT8045\|ADR8995\|IS11PT\|P2030\|P6010\|P8000\|PT002\|IS06\|CDM8999\|P9050\|PT001\|TXT8040\|P2020\|P9020\|P2000\|P7040\|P7000\|C790',
187	+ // http://www.fly-phone.com/devices/smartphones/ ; Included only smartphones.
188	+ 'Fly' => 'IQ230\|IQ444\|IQ450\|IQ440\|IQ442\|IQ441\|IQ245\|IQ256\|IQ236\|IQ255\|IQ235\|IQ245\|IQ275\|IQ240\|IQ285\|IQ280\|IQ270\|IQ260\|IQ250',
189	+ // http://fr.wikomobile.com
190	+ 'Wiko' => 'KITE 4G\|HIGHWAY\|GETAWAY\|STAIRWAY\|DARKSIDE\|DARKFULL\|DARKNIGHT\|DARKMOON\|SLIDE\|WAX 4G\|RAINBOW\|BLOOM\|SUNSET\|GOA(?!nna)\|LENNY\|BARRY\|IGGY\|OZZY\|CINK FIVE\|CINK PEAX\|CINK PEAX 2\|CINK SLIM\|CINK SLIM 2\|CINK +\|CINK KING\|CINK PEAX\|CINK SLIM\|SUBLIM',
191	+ 'iMobile' => 'i-mobile (IQ\|i-STYLE\|idea\|ZAA\|Hitz)',
192	+ // Added simvalley mobile just for fun. They have some interesting devices.
193	+ // http://www.simvalley.fr/telephonie---gps-_22_telephonie-mobile_telephones_.html
194	+ 'SimValley' => '\b(SP-80\|XT-930\|SX-340\|XT-930\|SX-310\|SP-360\|SP60\|SPT-800\|SP-120\|SPT-800\|SP-140\|SPX-5\|SPX-8\|SP-100\|SPX-8\|SPX-12)\b',
195	+ // Wolfgang - a brand that is sold by Aldi supermarkets.
196	+ // http://www.wolfgangmobile.com/
197	+ 'Wolfgang' => 'AT-B24D\|AT-AS50HD\|AT-AS40W\|AT-AS55HD\|AT-AS45q2\|AT-B26D\|AT-AS50Q',
198	+ 'Alcatel' => 'Alcatel',
199	+ 'Nintendo' => 'Nintendo (3DS\|Switch)',
200	+ // http://en.wikipedia.org/wiki/Amoi
201	+ 'Amoi' => 'Amoi',
202	+ // http://en.wikipedia.org/wiki/INQ
203	+ 'INQ' => 'INQ',
204	+ 'OnePlus' => 'ONEPLUS',
205	+ // @Tapatalk is a mobile app; http://support.tapatalk.com/threads/smf-2-0-2-os-and-browser-detection-plugin-and-tapatalk.15565/#post-79039
206	+ 'GenericPhone' => 'Tapatalk\|PDA;\|SAGEM\|\bmmp\b\|pocket\|\bpsp\b\|symbian\|Smartphone\|smartfon\|treo\|up.browser\|up.link\|vodafone\|\bwap\b\|nokia\|Series40\|Series60\|S60\|SonyEricsson\|N900\|MAUI.WAP.Browser',
207	+ );
208	+
209	+ /**
210	+ * List of tablet devices.
211	+ *
212	+ * @var array
213	+ */
214	+ protected static $tabletDevices = array(
215	+ // @todo: check for mobile friendly emails topic.
216	+ 'iPad' => 'iPad\|iPad.*Mobile',
217	+ // Removed \|^.Android.Nexus(?!(?:Mobile).)*$
218	+ // @see #442
219	+ // @todo Merge NexusTablet into GoogleTablet.
220	+ 'NexusTablet' => 'Android.*Nexus[\s]+(7\|9\|10)',
221	+ // https://en.wikipedia.org/wiki/Pixel_C
222	+ 'GoogleTablet' => 'Android.*Pixel C',
223	+ 'SamsungTablet' => 'SAMSUNG.Tablet\|Galaxy.Tab\|SC-01C\|GT-P1000\|GT-P1003\|GT-P1010\|GT-P3105\|GT-P6210\|GT-P6800\|GT-P6810\|GT-P7100\|GT-P7300\|GT-P7310\|GT-P7500\|GT-P7510\|SCH-I800\|SCH-I815\|SCH-I905\|SGH-I957\|SGH-I987\|SGH-T849\|SGH-T859\|SGH-T869\|SPH-P100\|GT-P3100\|GT-P3108\|GT-P3110\|GT-P5100\|GT-P5110\|GT-P6200\|GT-P7320\|GT-P7511\|GT-N8000\|GT-P8510\|SGH-I497\|SPH-P500\|SGH-T779\|SCH-I705\|SCH-I915\|GT-N8013\|GT-P3113\|GT-P5113\|GT-P8110\|GT-N8010\|GT-N8005\|GT-N8020\|GT-P1013\|GT-P6201\|GT-P7501\|GT-N5100\|GT-N5105\|GT-N5110\|SHV-E140K\|SHV-E140L\|SHV-E140S\|SHV-E150S\|SHV-E230K\|SHV-E230L\|SHV-E230S\|SHW-M180K\|SHW-M180L\|SHW-M180S\|SHW-M180W\|SHW-M300W\|SHW-M305W\|SHW-M380K\|SHW-M380S\|SHW-M380W\|SHW-M430W\|SHW-M480K\|SHW-M480S\|SHW-M480W\|SHW-M485W\|SHW-M486W\|SHW-M500W\|GT-I9228\|SCH-P739\|SCH-I925\|GT-I9200\|GT-P5200\|GT-P5210\|GT-P5210X\|SM-T311\|SM-T310\|SM-T310X\|SM-T210\|SM-T210R\|SM-T211\|SM-P600\|SM-P601\|SM-P605\|SM-P900\|SM-P901\|SM-T217\|SM-T217A\|SM-T217S\|SM-P6000\|SM-T3100\|SGH-I467\|XE500\|SM-T110\|GT-P5220\|GT-I9200X\|GT-N5110X\|GT-N5120\|SM-P905\|SM-T111\|SM-T2105\|SM-T315\|SM-T320\|SM-T320X\|SM-T321\|SM-T520\|SM-T525\|SM-T530NU\|SM-T230NU\|SM-T330NU\|SM-T900\|XE500T1C\|SM-P605V\|SM-P905V\|SM-T337V\|SM-T537V\|SM-T707V\|SM-T807V\|SM-P600X\|SM-P900X\|SM-T210X\|SM-T230\|SM-T230X\|SM-T325\|GT-P7503\|SM-T531\|SM-T330\|SM-T530\|SM-T705\|SM-T705C\|SM-T535\|SM-T331\|SM-T800\|SM-T700\|SM-T537\|SM-T807\|SM-P907A\|SM-T337A\|SM-T537A\|SM-T707A\|SM-T807A\|SM-T237\|SM-T807P\|SM-P607T\|SM-T217T\|SM-T337T\|SM-T807T\|SM-T116NQ\|SM-T116BU\|SM-P550\|SM-T350\|SM-T550\|SM-T9000\|SM-P9000\|SM-T705Y\|SM-T805\|GT-P3113\|SM-T710\|SM-T810\|SM-T815\|SM-T360\|SM-T533\|SM-T113\|SM-T335\|SM-T715\|SM-T560\|SM-T670\|SM-T677\|SM-T377\|SM-T567\|SM-T357T\|SM-T555\|SM-T561\|SM-T713\|SM-T719\|SM-T813\|SM-T819\|SM-T580\|SM-T355Y?\|SM-T280\|SM-T817A\|SM-T820\|SM-W700\|SM-P580\|SM-T587\|SM-P350\|SM-P555M\|SM-P355M\|SM-T113NU\|SM-T815Y\|SM-T585\|SM-T285\|SM-T825\|SM-W708\|SM-T835', // SCH-P709\|SCH-P729\|SM-T2558\|GT-I9205 - Samsung Mega - treat them like a regular phone.
224	+ // http://docs.aws.amazon.com/silk/latest/developerguide/user-agent.html
225	+ 'Kindle' => 'Kindle\|Silk.Accelerated\|Android.\b(KFOT\|KFTT\|KFJWI\|KFJWA\|KFOTE\|KFSOWI\|KFTHWI\|KFTHWA\|KFAPWI\|KFAPWA\|WFJWAE\|KFSAWA\|KFSAWI\|KFASWI\|KFARWI\|KFFOWI\|KFGIWI\|KFMEWI)\b\|Android.*Silk/[0-9.]+ like Chrome/[0-9.]+ (?!Mobile)',
226	+ // Only the Surface tablets with Windows RT are considered mobile.
227	+ // http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx
228	+ 'SurfaceTablet' => 'Windows NT [0-9.]+; ARM;.*(Tablet\|ARMBJS)',
229	+ // http://shopping1.hp.com/is-bin/INTERSHOP.enfinity/WFS/WW-USSMBPublicStore-Site/en_US/-/USD/ViewStandardCatalog-Browse?CatalogCategoryID=JfIQ7EN5lqMAAAEyDcJUDwMT
230	+ 'HPTablet' => 'HP Slate (7\|8\|10)\|HP ElitePad 900\|hp-tablet\|EliteBook.*Touch\|HP 8\|Slate 21\|HP SlateBook 10',
231	+ // Watch out for PadFone, see #132.
232	+ // http://www.asus.com/de/Tablets_Mobile/Memo_Pad_Products/
233	+ 'AsusTablet' => '^.PadFone((?!Mobile).)$\|Transformer\|TF101\|TF101G\|TF300T\|TF300TG\|TF300TL\|TF700T\|TF700KL\|TF701T\|TF810C\|ME171\|ME301T\|ME302C\|ME371MG\|ME370T\|ME372MG\|ME172V\|ME173X\|ME400C\|Slider SL101\|\bK00F\b\|\bK00C\b\|\bK00E\b\|\bK00L\b\|TX201LA\|ME176C\|ME102A\|\bM80TA\b\|ME372CL\|ME560CG\|ME372CG\|ME302KL\| K010 \| K011 \| K017 \| K01E \|ME572C\|ME103K\|ME170C\|ME171C\|\bME70C\b\|ME581C\|ME581CL\|ME8510C\|ME181C\|P01Y\|PO1MA\|P01Z\|\bP027\b\|\bP024\b\|\bP00C\b',
234	+ 'BlackBerryTablet' => 'PlayBook\|RIM Tablet',
235	+ 'HTCtablet' => 'HTC_Flyer_P512\|HTC Flyer\|HTC Jetstream\|HTC-P715a\|HTC EVO View 4G\|PG41200\|PG09410',
236	+ 'MotorolaTablet' => 'xoom\|sholest\|MZ615\|MZ605\|MZ505\|MZ601\|MZ602\|MZ603\|MZ604\|MZ606\|MZ607\|MZ608\|MZ609\|MZ615\|MZ616\|MZ617',
237	+ 'NookTablet' => 'Android.*Nook\|NookColor\|nook browser\|BNRV200\|BNRV200A\|BNTV250\|BNTV250A\|BNTV400\|BNTV600\|LogicPD Zoom2',
238	+ // http://www.acer.ro/ac/ro/RO/content/drivers
239	+ // http://www.packardbell.co.uk/pb/en/GB/content/download (Packard Bell is part of Acer)
240	+ // http://us.acer.com/ac/en/US/content/group/tablets
241	+ // http://www.acer.de/ac/de/DE/content/models/tablets/
242	+ // Can conflict with Micromax and Motorola phones codes.
243	+ 'AcerTablet' => 'Android.*; \b(A100\|A101\|A110\|A200\|A210\|A211\|A500\|A501\|A510\|A511\|A700\|A701\|W500\|W500P\|W501\|W501P\|W510\|W511\|W700\|G100\|G100W\|B1-A71\|B1-710\|B1-711\|A1-810\|A1-811\|A1-830)\b\|W3-810\|\bA3-A10\b\|\bA3-A11\b\|\bA3-A20\b\|\bA3-A30',
244	+ // http://eu.computers.toshiba-europe.com/innovation/family/Tablets/1098744/banner_id/tablet_footerlink/
245	+ // http://us.toshiba.com/tablets/tablet-finder
246	+ // http://www.toshiba.co.jp/regza/tablet/
247	+ 'ToshibaTablet' => 'Android.(AT100\|AT105\|AT200\|AT205\|AT270\|AT275\|AT300\|AT305\|AT1S5\|AT500\|AT570\|AT700\|AT830)\|TOSHIBA.FOLIO',
248	+ // http://www.nttdocomo.co.jp/english/service/developer/smart_phone/technical_info/spec/index.html
249	+ // http://www.lg.com/us/tablets
250	+ 'LGTablet' => '\bL-06C\|LG-V909\|LG-V900\|LG-V700\|LG-V510\|LG-V500\|LG-V410\|LG-V400\|LG-VK810\b',
251	+ 'FujitsuTablet' => 'Android.*\b(F-01D\|F-02F\|F-05E\|F-10D\|M532\|Q572)\b',
252	+ // Prestigio Tablets http://www.prestigio.com/support
253	+ 'PrestigioTablet' => 'PMP3170B\|PMP3270B\|PMP3470B\|PMP7170B\|PMP3370B\|PMP3570C\|PMP5870C\|PMP3670B\|PMP5570C\|PMP5770D\|PMP3970B\|PMP3870C\|PMP5580C\|PMP5880D\|PMP5780D\|PMP5588C\|PMP7280C\|PMP7280C3G\|PMP7280\|PMP7880D\|PMP5597D\|PMP5597\|PMP7100D\|PER3464\|PER3274\|PER3574\|PER3884\|PER5274\|PER5474\|PMP5097CPRO\|PMP5097\|PMP7380D\|PMP5297C\|PMP5297C_QUAD\|PMP812E\|PMP812E3G\|PMP812F\|PMP810E\|PMP880TD\|PMT3017\|PMT3037\|PMT3047\|PMT3057\|PMT7008\|PMT5887\|PMT5001\|PMT5002',
254	+ // http://support.lenovo.com/en_GB/downloads/default.page?#
255	+ 'LenovoTablet' => 'Lenovo TAB\|Idea(Tab\|Pad)( A1\|A10\| K1\|)\|ThinkPad([ ]+)?Tablet\|YT3-850M\|YT3-X90L\|YT3-X90F\|YT3-X90X\|Lenovo.*(S2109\|S2110\|S5000\|S6000\|K3011\|A3000\|A3500\|A1000\|A2107\|A2109\|A1107\|A5500\|A7600\|B6000\|B8000\|B8080)(-\|)(FL\|F\|HV\|H\|)\|TB-X103F\|TB-X304F\|TB-X304L\|TB-8703F\|Tab2A7-10F\|TB2-X30L',
256	+ // http://www.dell.com/support/home/us/en/04/Products/tab_mob/tablets
257	+ 'DellTablet' => 'Venue 11\|Venue 8\|Venue 7\|Dell Streak 10\|Dell Streak 7',
258	+ // http://www.yarvik.com/en/matrix/tablets/
259	+ 'YarvikTablet' => 'Android.*\b(TAB210\|TAB211\|TAB224\|TAB250\|TAB260\|TAB264\|TAB310\|TAB360\|TAB364\|TAB410\|TAB411\|TAB420\|TAB424\|TAB450\|TAB460\|TAB461\|TAB464\|TAB465\|TAB467\|TAB468\|TAB07-100\|TAB07-101\|TAB07-150\|TAB07-151\|TAB07-152\|TAB07-200\|TAB07-201-3G\|TAB07-210\|TAB07-211\|TAB07-212\|TAB07-214\|TAB07-220\|TAB07-400\|TAB07-485\|TAB08-150\|TAB08-200\|TAB08-201-3G\|TAB08-201-30\|TAB09-100\|TAB09-211\|TAB09-410\|TAB10-150\|TAB10-201\|TAB10-211\|TAB10-400\|TAB10-410\|TAB13-201\|TAB274EUK\|TAB275EUK\|TAB374EUK\|TAB462EUK\|TAB474EUK\|TAB9-200)\b',
260	+ 'MedionTablet' => 'Android.\bOYO\b\|LIFE.(P9212\|P9514\|P9516\|S9512)\|LIFETAB',
261	+ 'ArnovaTablet' => '97G4\|AN10G2\|AN7bG3\|AN7fG3\|AN8G3\|AN8cG3\|AN7G3\|AN9G3\|AN7dG3\|AN7dG3ST\|AN7dG3ChildPad\|AN10bG3\|AN10bG3DT\|AN9G2',
262	+ // http://www.intenso.de/kategorie_en.php?kategorie=33
263	+ // @todo: http://www.nbhkdz.com/read/b8e64202f92a2df129126bff.html - investigate
264	+ 'IntensoTablet' => 'INM8002KP\|INM1010FP\|INM805ND\|Intenso Tab\|TAB1004',
265	+ // IRU.ru Tablets http://www.iru.ru/catalog/soho/planetable/
266	+ 'IRUTablet' => 'M702pro',
267	+ 'MegafonTablet' => 'MegaFon V9\|\bZTE V9\b\|Android.*\bMT7A\b',
268	+ // http://www.e-boda.ro/tablete-pc.html
269	+ 'EbodaTablet' => 'E-Boda (Supreme\|Impresspeed\|Izzycomm\|Essential)',
270	+ // http://www.allview.ro/produse/droseries/lista-tablete-pc/
271	+ 'AllViewTablet' => 'Allview.*(Viva\|Alldro\|City\|Speed\|All TV\|Frenzy\|Quasar\|Shine\|TX1\|AX1\|AX2)',
272	+ // http://wiki.archosfans.com/index.php?title=Main_Page
273	+ // @note Rewrite the regex format after we add more UAs.
274	+ 'ArchosTablet' => '\b(101G9\|80G9\|A101IT)\b\|Qilive 97R\|Archos5\|\bARCHOS (70\|79\|80\|90\|97\|101\|FAMILYPAD\|)(b\|c\|)(G10\| Cobalt\| TITANIUM(HD\|)\| Xenon\| Neon\|XSK\| 2\| XS 2\| PLATINUM\| CARBON\|GAMEPAD)\b',
275	+ // http://www.ainol.com/plugin.php?identifier=ainol&module=product
276	+ 'AinolTablet' => 'NOVO7\|NOVO8\|NOVO10\|Novo7Aurora\|Novo7Basic\|NOVO7PALADIN\|novo9-Spark',
277	+ 'NokiaLumiaTablet' => 'Lumia 2520',
278	+ // @todo: inspect http://esupport.sony.com/US/p/select-system.pl?DIRECTOR=DRIVER
279	+ // Readers http://www.atsuhiro-me.net/ebook/sony-reader/sony-reader-web-browser
280	+ // http://www.sony.jp/support/tablet/
281	+ 'SonyTablet' => 'Sony.*Tablet\|Xperia Tablet\|Sony Tablet S\|SO-03E\|SGPT12\|SGPT13\|SGPT114\|SGPT121\|SGPT122\|SGPT123\|SGPT111\|SGPT112\|SGPT113\|SGPT131\|SGPT132\|SGPT133\|SGPT211\|SGPT212\|SGPT213\|SGP311\|SGP312\|SGP321\|EBRD1101\|EBRD1102\|EBRD1201\|SGP351\|SGP341\|SGP511\|SGP512\|SGP521\|SGP541\|SGP551\|SGP621\|SGP641\|SGP612\|SOT31\|SGP771\|SGP611\|SGP612\|SGP712',
282	+ // http://www.support.philips.com/support/catalog/worldproducts.jsp?userLanguage=en&userCountry=cn&categoryid=3G_LTE_TABLET_SU_CN_CARE&title=3G%20tablets%20/%20LTE%20range&_dyncharset=UTF-8
283	+ 'PhilipsTablet' => '\b(PI2010\|PI3000\|PI3100\|PI3105\|PI3110\|PI3205\|PI3210\|PI3900\|PI4010\|PI7000\|PI7100)\b',
284	+ // db + http://www.cube-tablet.com/buy-products.html
285	+ 'CubeTablet' => 'Android.*(K8GT\|U9GT\|U10GT\|U16GT\|U17GT\|U18GT\|U19GT\|U20GT\|U23GT\|U30GT)\|CUBE U8GT',
286	+ // http://www.cobyusa.com/?p=pcat&pcat_id=3001
287	+ 'CobyTablet' => 'MID1042\|MID1045\|MID1125\|MID1126\|MID7012\|MID7014\|MID7015\|MID7034\|MID7035\|MID7036\|MID7042\|MID7048\|MID7127\|MID8042\|MID8048\|MID8127\|MID9042\|MID9740\|MID9742\|MID7022\|MID7010',
288	+ // http://www.match.net.cn/products.asp
289	+ 'MIDTablet' => 'M9701\|M9000\|M9100\|M806\|M1052\|M806\|T703\|MID701\|MID713\|MID710\|MID727\|MID760\|MID830\|MID728\|MID933\|MID125\|MID810\|MID732\|MID120\|MID930\|MID800\|MID731\|MID900\|MID100\|MID820\|MID735\|MID980\|MID130\|MID833\|MID737\|MID960\|MID135\|MID860\|MID736\|MID140\|MID930\|MID835\|MID733\|MID4X10',
290	+ // http://www.msi.com/support
291	+ // @todo Research the Windows Tablets.
292	+ 'MSITablet' => 'MSI \b(Primo 73K\|Primo 73L\|Primo 81L\|Primo 77\|Primo 93\|Primo 75\|Primo 76\|Primo 73\|Primo 81\|Primo 91\|Primo 90\|Enjoy 71\|Enjoy 7\|Enjoy 10)\b',
293	+ // @todo http://www.kyoceramobile.com/support/drivers/
294	+ // 'KyoceraTablet' => null,
295	+ // @todo http://intexuae.com/index.php/category/mobile-devices/tablets-products/
296	+ // 'IntextTablet' => null,
297	+ // http://pdadb.net/index.php?m=pdalist&list=SMiT (NoName Chinese Tablets)
298	+ // http://www.imp3.net/14/show.php?itemid=20454
299	+ 'SMiTTablet' => 'Android.*(\bMID\b\|MID-560\|MTV-T1200\|MTV-PND531\|MTV-P1101\|MTV-PND530)',
300	+ // http://www.rock-chips.com/index.php?do=prod&pid=2
301	+ 'RockChipTablet' => 'Android.*(RK2818\|RK2808A\|RK2918\|RK3066)\|RK2738\|RK2808A',
302	+ // http://www.fly-phone.com/devices/tablets/ ; http://www.fly-phone.com/service/
303	+ 'FlyTablet' => 'IQ310\|Fly Vision',
304	+ // http://www.bqreaders.com/gb/tablets-prices-sale.html
305	+ 'bqTablet' => 'Android.(bq)?.(Elcano\|Curie\|Edison\|Maxwell\|Kepler\|Pascal\|Tesla\|Hypatia\|Platon\|Newton\|Livingstone\|Cervantes\|Avant\|Aquaris ([E\|M]10\|M8))\|Maxwell.Lite\|Maxwell.Plus',
306	+ // http://www.huaweidevice.com/worldwide/productFamily.do?method=index&directoryId=5011&treeId=3290
307	+ // http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index&directoryId=3372&treeId=0&tb=1&type=software (including legacy tablets)
308	+ 'HuaweiTablet' => 'MediaPad\|MediaPad 7 Youth\|IDEOS S7\|S7-201c\|S7-202u\|S7-101\|S7-103\|S7-104\|S7-105\|S7-106\|S7-201\|S7-Slim\|M2-A01L\|BAH-L09\|BAH-W09',
309	+ // Nec or Medias Tab
310	+ 'NecTablet' => '\bN-06D\|\bN-08D',
311	+ // Pantech Tablets: http://www.pantechusa.com/phones/
312	+ 'PantechTablet' => 'Pantech.*P4100',
313	+ // Broncho Tablets: http://www.broncho.cn/ (hard to find)
314	+ 'BronchoTablet' => 'Broncho.*(N701\|N708\|N802\|a710)',
315	+ // http://versusuk.com/support.html
316	+ 'VersusTablet' => 'TOUCHPAD.*[78910]\|\bTOUCHTAB\b',
317	+ // http://www.zync.in/index.php/our-products/tablet-phablets
318	+ 'ZyncTablet' => 'z1000\|Z99 2G\|z99\|z930\|z999\|z990\|z909\|Z919\|z900',
319	+ // http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/
320	+ 'PositivoTablet' => 'TB07STA\|TB10STA\|TB07FTA\|TB10FTA',
321	+ // https://www.nabitablet.com/
322	+ 'NabiTablet' => 'Android.*\bNabi',
323	+ 'KoboTablet' => 'Kobo Touch\|\bK080\b\|\bVox\b Build\|\bArc\b Build',
324	+ // French Danew Tablets http://www.danew.com/produits-tablette.php
325	+ 'DanewTablet' => 'DSlide.*\b(700\|701R\|702\|703R\|704\|802\|970\|971\|972\|973\|974\|1010\|1012)\b',
326	+ // Texet Tablets and Readers http://www.texet.ru/tablet/
327	+ 'TexetTablet' => 'NaviPad\|TB-772A\|TM-7045\|TM-7055\|TM-9750\|TM-7016\|TM-7024\|TM-7026\|TM-7041\|TM-7043\|TM-7047\|TM-8041\|TM-9741\|TM-9747\|TM-9748\|TM-9751\|TM-7022\|TM-7021\|TM-7020\|TM-7011\|TM-7010\|TM-7023\|TM-7025\|TM-7037W\|TM-7038W\|TM-7027W\|TM-9720\|TM-9725\|TM-9737W\|TM-1020\|TM-9738W\|TM-9740\|TM-9743W\|TB-807A\|TB-771A\|TB-727A\|TB-725A\|TB-719A\|TB-823A\|TB-805A\|TB-723A\|TB-715A\|TB-707A\|TB-705A\|TB-709A\|TB-711A\|TB-890HD\|TB-880HD\|TB-790HD\|TB-780HD\|TB-770HD\|TB-721HD\|TB-710HD\|TB-434HD\|TB-860HD\|TB-840HD\|TB-760HD\|TB-750HD\|TB-740HD\|TB-730HD\|TB-722HD\|TB-720HD\|TB-700HD\|TB-500HD\|TB-470HD\|TB-431HD\|TB-430HD\|TB-506\|TB-504\|TB-446\|TB-436\|TB-416\|TB-146SE\|TB-126SE',
328	+ // Avoid detecting 'PLAYSTATION 3' as mobile.
329	+ 'PlaystationTablet' => 'Playstation.*(Portable\|Vita)',
330	+ // http://www.trekstor.de/surftabs.html
331	+ 'TrekstorTablet' => 'ST10416-1\|VT10416-1\|ST70408-1\|ST702xx-1\|ST702xx-2\|ST80208\|ST97216\|ST70104-2\|VT10416-2\|ST10216-2A\|SurfTab',
332	+ // http://www.pyleaudio.com/Products.aspx?%2fproducts%2fPersonal-Electronics%2fTablets
333	+ 'PyleAudioTablet' => '\b(PTBL10CEU\|PTBL10C\|PTBL72BC\|PTBL72BCEU\|PTBL7CEU\|PTBL7C\|PTBL92BC\|PTBL92BCEU\|PTBL9CEU\|PTBL9CUK\|PTBL9C)\b',
334	+ // http://www.advandigital.com/index.php?link=content-product&jns=JP001
335	+ // because of the short codenames we have to include whitespaces to reduce the possible conflicts.
336	+ 'AdvanTablet' => 'Android.* \b(E3A\|T3X\|T5C\|T5B\|T3E\|T3C\|T3B\|T1J\|T1F\|T2A\|T1H\|T1i\|E1C\|T1-E\|T5-A\|T4\|E1-B\|T2Ci\|T1-B\|T1-D\|O1-A\|E1-A\|T1-A\|T3A\|T4i)\b ',
337	+ // http://www.danytech.com/category/tablet-pc
338	+ 'DanyTechTablet' => 'Genius Tab G3\|Genius Tab S2\|Genius Tab Q3\|Genius Tab G4\|Genius Tab Q4\|Genius Tab G-II\|Genius TAB GII\|Genius TAB GIII\|Genius Tab S1',
339	+ // http://www.galapad.net/product.html
340	+ 'GalapadTablet' => 'Android.*\bG1\b(?!\))',
341	+ // http://www.micromaxinfo.com/tablet/funbook
342	+ 'MicromaxTablet' => 'Funbook\|Micromax.*\b(P250\|P560\|P360\|P362\|P600\|P300\|P350\|P500\|P275)\b',
343	+ // http://www.karbonnmobiles.com/products_tablet.php
344	+ 'KarbonnTablet' => 'Android.*\b(A39\|A37\|A34\|ST8\|ST10\|ST7\|Smart Tab3\|Smart Tab2)\b',
345	+ // http://www.myallfine.com/Products.asp
346	+ 'AllFineTablet' => 'Fine7 Genius\|Fine7 Shine\|Fine7 Air\|Fine8 Style\|Fine9 More\|Fine10 Joy\|Fine11 Wide',
347	+ // http://www.proscanvideo.com/products-search.asp?itemClass=TABLET&itemnmbr=
348	+ 'PROSCANTablet' => '\b(PEM63\|PLT1023G\|PLT1041\|PLT1044\|PLT1044G\|PLT1091\|PLT4311\|PLT4311PL\|PLT4315\|PLT7030\|PLT7033\|PLT7033D\|PLT7035\|PLT7035D\|PLT7044K\|PLT7045K\|PLT7045KB\|PLT7071KG\|PLT7072\|PLT7223G\|PLT7225G\|PLT7777G\|PLT7810K\|PLT7849G\|PLT7851G\|PLT7852G\|PLT8015\|PLT8031\|PLT8034\|PLT8036\|PLT8080K\|PLT8082\|PLT8088\|PLT8223G\|PLT8234G\|PLT8235G\|PLT8816K\|PLT9011\|PLT9045K\|PLT9233G\|PLT9735\|PLT9760G\|PLT9770G)\b',
349	+ // http://www.yonesnav.com/products/products.php
350	+ 'YONESTablet' => 'BQ1078\|BC1003\|BC1077\|RK9702\|BC9730\|BC9001\|IT9001\|BC7008\|BC7010\|BC708\|BC728\|BC7012\|BC7030\|BC7027\|BC7026',
351	+ // http://www.cjshowroom.com/eproducts.aspx?classcode=004001001
352	+ // China manufacturer makes tablets for different small brands (eg. http://www.zeepad.net/index.html)
353	+ 'ChangJiaTablet' => 'TPC7102\|TPC7103\|TPC7105\|TPC7106\|TPC7107\|TPC7201\|TPC7203\|TPC7205\|TPC7210\|TPC7708\|TPC7709\|TPC7712\|TPC7110\|TPC8101\|TPC8103\|TPC8105\|TPC8106\|TPC8203\|TPC8205\|TPC8503\|TPC9106\|TPC9701\|TPC97101\|TPC97103\|TPC97105\|TPC97106\|TPC97111\|TPC97113\|TPC97203\|TPC97603\|TPC97809\|TPC97205\|TPC10101\|TPC10103\|TPC10106\|TPC10111\|TPC10203\|TPC10205\|TPC10503',
354	+ // http://www.gloryunion.cn/products.asp
355	+ // http://www.allwinnertech.com/en/apply/mobile.html
356	+ // http://www.ptcl.com.pk/pd_content.php?pd_id=284 (EVOTAB)
357	+ // @todo: Softwiner tablets?
358	+ // aka. Cute or Cool tablets. Not sure yet, must research to avoid collisions.
359	+ 'GUTablet' => 'TX-A1301\|TX-M9002\|Q702\|kf026', // A12R\|D75A\|D77\|D79\|R83\|A95\|A106C\|R15\|A75\|A76\|D71\|D72\|R71\|R73\|R77\|D82\|R85\|D92\|A97\|D92\|R91\|A10F\|A77F\|W71F\|A78F\|W78F\|W81F\|A97F\|W91F\|W97F\|R16G\|C72\|C73E\|K72\|K73\|R96G
360	+ // http://www.pointofview-online.com/showroom.php?shop_mode=product_listing&category_id=118
361	+ 'PointOfViewTablet' => 'TAB-P506\|TAB-navi-7-3G-M\|TAB-P517\|TAB-P-527\|TAB-P701\|TAB-P703\|TAB-P721\|TAB-P731N\|TAB-P741\|TAB-P825\|TAB-P905\|TAB-P925\|TAB-PR945\|TAB-PL1015\|TAB-P1025\|TAB-PI1045\|TAB-P1325\|TAB-PROTAB[0-9]+\|TAB-PROTAB25\|TAB-PROTAB26\|TAB-PROTAB27\|TAB-PROTAB26XL\|TAB-PROTAB2-IPS9\|TAB-PROTAB30-IPS9\|TAB-PROTAB25XXL\|TAB-PROTAB26-IPS10\|TAB-PROTAB30-IPS10',
362	+ // http://www.overmax.pl/pl/katalog-produktow,p8/tablety,c14/
363	+ // @todo: add more tests.
364	+ 'OvermaxTablet' => 'OV-(SteelCore\|NewBase\|Basecore\|Baseone\|Exellen\|Quattor\|EduTab\|Solution\|ACTION\|BasicTab\|TeddyTab\|MagicTab\|Stream\|TB-08\|TB-09)\|Qualcore 1027',
365	+ // http://hclmetablet.com/India/index.php
366	+ 'HCLTablet' => 'HCL.*Tablet\|Connect-3G-2.0\|Connect-2G-2.0\|ME Tablet U1\|ME Tablet U2\|ME Tablet G1\|ME Tablet X1\|ME Tablet Y2\|ME Tablet Sync',
367	+ // http://www.edigital.hu/Tablet_es_e-book_olvaso/Tablet-c18385.html
368	+ 'DPSTablet' => 'DPS Dream 9\|DPS Dual 7',
369	+ // http://www.visture.com/index.asp
370	+ 'VistureTablet' => 'V97 HD\|i75 3G\|Visture V4( HD)?\|Visture V5( HD)?\|Visture V10',
371	+ // http://www.mijncresta.nl/tablet
372	+ 'CrestaTablet' => 'CTP(-)?810\|CTP(-)?818\|CTP(-)?828\|CTP(-)?838\|CTP(-)?888\|CTP(-)?978\|CTP(-)?980\|CTP(-)?987\|CTP(-)?988\|CTP(-)?989',
373	+ // MediaTek - http://www.mediatek.com/_en/01_products/02_proSys.php?cata_sn=1&cata1_sn=1&cata2_sn=309
374	+ 'MediatekTablet' => '\bMT8125\|MT8389\|MT8135\|MT8377\b',
375	+ // Concorde tab
376	+ 'ConcordeTablet' => 'Concorde([ ]+)?Tab\|ConCorde ReadMan',
377	+ // GoClever Tablets - http://www.goclever.com/uk/products,c1/tablet,c5/
378	+ 'GoCleverTablet' => 'GOCLEVER TAB\|A7GOCLEVER\|M1042\|M7841\|M742\|R1042BK\|R1041\|TAB A975\|TAB A7842\|TAB A741\|TAB A741L\|TAB M723G\|TAB M721\|TAB A1021\|TAB I921\|TAB R721\|TAB I720\|TAB T76\|TAB R70\|TAB R76.2\|TAB R106\|TAB R83.2\|TAB M813G\|TAB I721\|GCTA722\|TAB I70\|TAB I71\|TAB S73\|TAB R73\|TAB R74\|TAB R93\|TAB R75\|TAB R76.1\|TAB A73\|TAB A93\|TAB A93.2\|TAB T72\|TAB R83\|TAB R974\|TAB R973\|TAB A101\|TAB A103\|TAB A104\|TAB A104.2\|R105BK\|M713G\|A972BK\|TAB A971\|TAB R974.2\|TAB R104\|TAB R83.3\|TAB A1042',
379	+ // Modecom Tablets - http://www.modecom.eu/tablets/portal/
380	+ 'ModecomTablet' => 'FreeTAB 9000\|FreeTAB 7.4\|FreeTAB 7004\|FreeTAB 7800\|FreeTAB 2096\|FreeTAB 7.5\|FreeTAB 1014\|FreeTAB 1001 \|FreeTAB 8001\|FreeTAB 9706\|FreeTAB 9702\|FreeTAB 7003\|FreeTAB 7002\|FreeTAB 1002\|FreeTAB 7801\|FreeTAB 1331\|FreeTAB 1004\|FreeTAB 8002\|FreeTAB 8014\|FreeTAB 9704\|FreeTAB 1003',
381	+ // Vonino Tablets - http://www.vonino.eu/tablets
382	+ 'VoninoTablet' => '\b(Argus[ _]?S\|Diamond[ _]?79HD\|Emerald[ _]?78E\|Luna[ _]?70C\|Onyx[ _]?S\|Onyx[ _]?Z\|Orin[ _]?HD\|Orin[ _]?S\|Otis[ _]?S\|SpeedStar[ _]?S\|Magnet[ _]?M9\|Primus[ _]?94[ _]?3G\|Primus[ _]?94HD\|Primus[ _]?QS\|Android.*\bQ8\b\|Sirius[ _]?EVO[ _]?QS\|Sirius[ _]?QS\|Spirit[ _]?S)\b',
383	+ // ECS Tablets - http://www.ecs.com.tw/ECSWebSite/Product/Product_Tablet_List.aspx?CategoryID=14&MenuID=107&childid=M_107&LanID=0
384	+ 'ECSTablet' => 'V07OT2\|TM105A\|S10OT1\|TR10CS1',
385	+ // Storex Tablets - http://storex.fr/espace_client/support.html
386	+ // @note: no need to add all the tablet codes since they are guided by the first regex.
387	+ 'StorexTablet' => 'eZee[_\']?(Tab\|Go)[0-9]+\|TabLC7\|Looney Tunes Tab',
388	+ // Generic Vodafone tablets.
389	+ 'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+\|SmartTabII10\|SmartTabII7\|VF-1497',
390	+ // French tablets - Essentiel B http://www.boulanger.fr/tablette_tactile_e-book/tablette_tactile_essentiel_b/cl_68908.htm?multiChoiceToDelete=brand&mc_brand=essentielb
391	+ // Aka: http://www.essentielb.fr/
392	+ 'EssentielBTablet' => 'Smart[ \']?TAB[ ]+?[0-9]+\|Family[ \']?TAB2',
393	+ // Ross & Moor - http://ross-moor.ru/
394	+ 'RossMoorTablet' => 'RM-790\|RM-997\|RMD-878G\|RMD-974R\|RMT-705A\|RMT-701\|RME-601\|RMT-501\|RMT-711',
395	+ // i-mobile http://product.i-mobilephone.com/Mobile_Device
396	+ 'iMobileTablet' => 'i-mobile i-note',
397	+ // http://www.tolino.de/de/vergleichen/
398	+ 'TolinoTablet' => 'tolino tab [0-9.]+\|tolino shine',
399	+ // AudioSonic - a Kmart brand
400	+ // http://www.kmart.com.au/webapp/wcs/stores/servlet/Search?langId=-1&storeId=10701&catalogId=10001&categoryId=193001&pageSize=72&currentPage=1&searchCategory=193001%2b4294965664&sortBy=p_MaxPrice%7c1
401	+ 'AudioSonicTablet' => '\bC-22Q\|T7-QC\|T-17B\|T-17P\b',
402	+ // AMPE Tablets - http://www.ampe.com.my/product-category/tablets/
403	+ // @todo: add them gradually to avoid conflicts.
404	+ 'AMPETablet' => 'Android.* A78 ',
405	+ // Skk Mobile - http://skkmobile.com.ph/product_tablets.php
406	+ 'SkkTablet' => 'Android.* (SKYPAD\|PHOENIX\|CYCLOPS)',
407	+ // Tecno Mobile (only tablet) - http://www.tecno-mobile.com/index.php/product?filterby=smart&list_order=all&page=1
408	+ 'TecnoTablet' => 'TECNO P9\|TECNO DP8D',
409	+ // JXD (consoles & tablets) - http://jxd.hk/products.asp?selectclassid=009008&clsid=3
410	+ 'JXDTablet' => 'Android.* \b(F3000\|A3300\|JXD5000\|JXD3000\|JXD2000\|JXD300B\|JXD300\|S5800\|S7800\|S602b\|S5110b\|S7300\|S5300\|S602\|S603\|S5100\|S5110\|S601\|S7100a\|P3000F\|P3000s\|P101\|P200s\|P1000m\|P200m\|P9100\|P1000s\|S6600b\|S908\|P1000\|P300\|S18\|S6600\|S9100)\b',
411	+ // i-Joy tablets - http://www.i-joy.es/en/cat/products/tablets/
412	+ 'iJoyTablet' => 'Tablet (Spirit 7\|Essentia\|Galatea\|Fusion\|Onix 7\|Landa\|Titan\|Scooby\|Deox\|Stella\|Themis\|Argon\|Unique 7\|Sygnus\|Hexen\|Finity 7\|Cream\|Cream X2\|Jade\|Neon 7\|Neron 7\|Kandy\|Scape\|Saphyr 7\|Rebel\|Biox\|Rebel\|Rebel 8GB\|Myst\|Draco 7\|Myst\|Tab7-004\|Myst\|Tadeo Jones\|Tablet Boing\|Arrow\|Draco Dual Cam\|Aurix\|Mint\|Amity\|Revolution\|Finity 9\|Neon 9\|T9w\|Amity 4GB Dual Cam\|Stone 4GB\|Stone 8GB\|Andromeda\|Silken\|X2\|Andromeda II\|Halley\|Flame\|Saphyr 9,7\|Touch 8\|Planet\|Triton\|Unique 10\|Hexen 10\|Memphis 4GB\|Memphis 8GB\|Onix 10)',
413	+ // http://www.intracon.eu/tablet
414	+ 'FX2Tablet' => 'FX2 PAD7\|FX2 PAD10',
415	+ // http://www.xoro.de/produkte/
416	+ // @note: Might be the same brand with 'Simply tablets'
417	+ 'XoroTablet' => 'KidsPAD 701\|PAD[ ]?712\|PAD[ ]?714\|PAD[ ]?716\|PAD[ ]?717\|PAD[ ]?718\|PAD[ ]?720\|PAD[ ]?721\|PAD[ ]?722\|PAD[ ]?790\|PAD[ ]?792\|PAD[ ]?900\|PAD[ ]?9715D\|PAD[ ]?9716DR\|PAD[ ]?9718DR\|PAD[ ]?9719QR\|PAD[ ]?9720QR\|TelePAD1030\|Telepad1032\|TelePAD730\|TelePAD731\|TelePAD732\|TelePAD735Q\|TelePAD830\|TelePAD9730\|TelePAD795\|MegaPAD 1331\|MegaPAD 1851\|MegaPAD 2151',
418	+ // http://www1.viewsonic.com/products/computing/tablets/
419	+ 'ViewsonicTablet' => 'ViewPad 10pi\|ViewPad 10e\|ViewPad 10s\|ViewPad E72\|ViewPad7\|ViewPad E100\|ViewPad 7e\|ViewSonic VB733\|VB100a',
420	+ // https://www.verizonwireless.com/tablets/verizon/
421	+ 'VerizonTablet' => 'QTAQZ3\|QTAIR7\|QTAQTZ3\|QTASUN1\|QTASUN2\|QTAXIA1',
422	+ // http://www.odys.de/web/internet-tablet_en.html
423	+ 'OdysTablet' => 'LOOX\|XENO10\|ODYS[ -](Space\|EVO\|Xpress\|NOON)\|\bXELIO\b\|Xelio10Pro\|XELIO7PHONETAB\|XELIO10EXTREME\|XELIOPT2\|NEO_QUAD10',
424	+ // http://www.captiva-power.de/products.html#tablets-en
425	+ 'CaptivaTablet' => 'CAPTIVA PAD',
426	+ // IconBIT - http://www.iconbit.com/products/tablets/
427	+ 'IconbitTablet' => 'NetTAB\|NT-3702\|NT-3702S\|NT-3702S\|NT-3603P\|NT-3603P\|NT-0704S\|NT-0704S\|NT-3805C\|NT-3805C\|NT-0806C\|NT-0806C\|NT-0909T\|NT-0909T\|NT-0907S\|NT-0907S\|NT-0902S\|NT-0902S',
428	+ // http://www.teclast.com/topic.php?channelID=70&topicID=140&pid=63
429	+ 'TeclastTablet' => 'T98 4G\|\bP80\b\|\bX90HD\b\|X98 Air\|X98 Air 3G\|\bX89\b\|P80 3G\|\bX80h\b\|P98 Air\|\bX89HD\b\|P98 3G\|\bP90HD\b\|P89 3G\|X98 3G\|\bP70h\b\|P79HD 3G\|G18d 3G\|\bP79HD\b\|\bP89s\b\|\bA88\b\|\bP10HD\b\|\bP19HD\b\|G18 3G\|\bP78HD\b\|\bA78\b\|\bP75\b\|G17s 3G\|G17h 3G\|\bP85t\b\|\bP90\b\|\bP11\b\|\bP98t\b\|\bP98HD\b\|\bG18d\b\|\bP85s\b\|\bP11HD\b\|\bP88s\b\|\bA80HD\b\|\bA80se\b\|\bA10h\b\|\bP89\b\|\bP78s\b\|\bG18\b\|\bP85\b\|\bA70h\b\|\bA70\b\|\bG17\b\|\bP18\b\|\bA80s\b\|\bA11s\b\|\bP88HD\b\|\bA80h\b\|\bP76s\b\|\bP76h\b\|\bP98\b\|\bA10HD\b\|\bP78\b\|\bP88\b\|\bA11\b\|\bA10t\b\|\bP76a\b\|\bP76t\b\|\bP76e\b\|\bP85HD\b\|\bP85a\b\|\bP86\b\|\bP75HD\b\|\bP76v\b\|\bA12\b\|\bP75a\b\|\bA15\b\|\bP76Ti\b\|\bP81HD\b\|\bA10\b\|\bT760VE\b\|\bT720HD\b\|\bP76\b\|\bP73\b\|\bP71\b\|\bP72\b\|\bT720SE\b\|\bC520Ti\b\|\bT760\b\|\bT720VE\b\|T720-3GE\|T720-WiFi',
430	+ // Onda - http://www.onda-tablet.com/buy-android-onda.html?dir=desc&limit=all&order=price
431	+ 'OndaTablet' => '\b(V975i\|Vi30\|VX530\|V701\|Vi60\|V701s\|Vi50\|V801s\|V719\|Vx610w\|VX610W\|V819i\|Vi10\|VX580W\|Vi10\|V711s\|V813\|V811\|V820w\|V820\|Vi20\|V711\|VI30W\|V712\|V891w\|V972\|V819w\|V820w\|Vi60\|V820w\|V711\|V813s\|V801\|V819\|V975s\|V801\|V819\|V819\|V818\|V811\|V712\|V975m\|V101w\|V961w\|V812\|V818\|V971\|V971s\|V919\|V989\|V116w\|V102w\|V973\|Vi40)\b[\s]+\|V10 \b4G\b',
432	+ 'JaytechTablet' => 'TPC-PA762',
433	+ 'BlaupunktTablet' => 'Endeavour 800NG\|Endeavour 1010',
434	+ // http://www.digma.ru/support/download/
435	+ // @todo: Ebooks also (if requested)
436	+ 'DigmaTablet' => '\b(iDx10\|iDx9\|iDx8\|iDx7\|iDxD7\|iDxD8\|iDsQ8\|iDsQ7\|iDsQ8\|iDsD10\|iDnD7\|3TS804H\|iDsQ11\|iDj7\|iDs10)\b',
437	+ // http://www.evolioshop.com/ro/tablete-pc.html
438	+ // http://www.evolio.ro/support/downloads_static.html?cat=2
439	+ // @todo: Research some more
440	+ 'EvolioTablet' => 'ARIA_Mini_wifi\|Aria[ _]Mini\|Evolio X10\|Evolio X7\|Evolio X8\|\bEvotab\b\|\bNeura\b',
441	+ // @todo http://www.lavamobiles.com/tablets-data-cards
442	+ 'LavaTablet' => 'QPAD E704\|\bIvoryS\b\|E-TAB IVORY\|\bE-TAB\b',
443	+ // http://www.breezetablet.com/
444	+ 'AocTablet' => 'MW0811\|MW0812\|MW0922\|MTK8382\|MW1031\|MW0831\|MW0821\|MW0931\|MW0712',
445	+ // http://www.mpmaneurope.com/en/products/internet-tablets-14/android-tablets-14/
446	+ 'MpmanTablet' => 'MP11 OCTA\|MP10 OCTA\|MPQC1114\|MPQC1004\|MPQC994\|MPQC974\|MPQC973\|MPQC804\|MPQC784\|MPQC780\|\bMPG7\b\|MPDCG75\|MPDCG71\|MPDC1006\|MP101DC\|MPDC9000\|MPDC905\|MPDC706HD\|MPDC706\|MPDC705\|MPDC110\|MPDC100\|MPDC99\|MPDC97\|MPDC88\|MPDC8\|MPDC77\|MP709\|MID701\|MID711\|MID170\|MPDC703\|MPQC1010',
447	+ // https://www.celkonmobiles.com/?_a=categoryphones&sid=2
448	+ 'CelkonTablet' => 'CT695\|CT888\|CT[\s]?910\|CT7 Tab\|CT9 Tab\|CT3 Tab\|CT2 Tab\|CT1 Tab\|C820\|C720\|\bCT-1\b',
449	+ // http://www.wolderelectronics.com/productos/manuales-y-guias-rapidas/categoria-2-miTab
450	+ 'WolderTablet' => 'miTab \b(DIAMOND\|SPACE\|BROOKLYN\|NEO\|FLY\|MANHATTAN\|FUNK\|EVOLUTION\|SKY\|GOCAR\|IRON\|GENIUS\|POP\|MINT\|EPSILON\|BROADWAY\|JUMP\|HOP\|LEGEND\|NEW AGE\|LINE\|ADVANCE\|FEEL\|FOLLOW\|LIKE\|LINK\|LIVE\|THINK\|FREEDOM\|CHICAGO\|CLEVELAND\|BALTIMORE-GH\|IOWA\|BOSTON\|SEATTLE\|PHOENIX\|DALLAS\|IN 101\|MasterChef)\b',
451	+ 'MediacomTablet' => 'M-MPI10C3G\|M-SP10EG\|M-SP10EGP\|M-SP10HXAH\|M-SP7HXAH\|M-SP10HXBH\|M-SP8HXAH\|M-SP8MXA',
452	+ // http://www.mi.com/en
453	+ 'MiTablet' => '\bMI PAD\b\|\bHM NOTE 1W\b',
454	+ // http://www.nbru.cn/index.html
455	+ 'NibiruTablet' => 'Nibiru M1\|Nibiru Jupiter One',
456	+ // http://navroad.com/products/produkty/tablety/
457	+ // http://navroad.com/products/produkty/tablety/
458	+ 'NexoTablet' => 'NEXO NOVA\|NEXO 10\|NEXO AVIO\|NEXO FREE\|NEXO GO\|NEXO EVO\|NEXO 3G\|NEXO SMART\|NEXO KIDDO\|NEXO MOBI',
459	+ // http://leader-online.com/new_site/product-category/tablets/
460	+ // http://www.leader-online.net.au/List/Tablet
461	+ 'LeaderTablet' => 'TBLT10Q\|TBLT10I\|TBL-10WDKB\|TBL-10WDKBO2013\|TBL-W230V2\|TBL-W450\|TBL-W500\|SV572\|TBLT7I\|TBA-AC7-8G\|TBLT79\|TBL-8W16\|TBL-10W32\|TBL-10WKB\|TBL-W100',
462	+ // http://www.datawind.com/ubislate/
463	+ 'UbislateTablet' => 'UbiSlate[\s]?7C',
464	+ // http://www.pocketbook-int.com/ru/support
465	+ 'PocketBookTablet' => 'Pocketbook',
466	+ // http://www.kocaso.com/product_tablet.html
467	+ 'KocasoTablet' => '\b(TB-1207)\b',
468	+ // http://global.hisense.com/product/asia/tablet/Sero7/201412/t20141215_91832.htm
469	+ 'HisenseTablet' => '\b(F5281\|E2371)\b',
470	+ // http://www.tesco.com/direct/hudl/
471	+ 'Hudl' => 'Hudl HT7S3\|Hudl 2',
472	+ // http://www.telstra.com.au/home-phone/thub-2/
473	+ 'TelstraTablet' => 'T-Hub2',
474	+ 'GenericTablet' => 'Android.\b97D\b\|Tablet(?!.PC)\|BNTV250A\|MID-WCDMA\|LogicPD Zoom2\|\bA7EB\b\|CatNova8\|A1_07\|CT704\|CT1002\|\bM721\b\|rk30sdk\|\bEVOTAB\b\|M758A\|ET904\|ALUMIUM10\|Smartfren Tab\|Endeavour 1010\|Tablet-PC-4\|Tagi Tab\|\bM6pro\b\|CT1020W\|arc 10HD\|\bTP750\b\|\bQTAQZ3\b\|WVT101\|TM1088\|KT107'
475	+ );
476	+
477	+ /**
478	+ * List of mobile Operating Systems.
479	+ *
480	+ * @var array
481	+ */
482	+ protected static $operatingSystems = array(
483	+ 'AndroidOS' => 'Android',
484	+ 'BlackBerryOS' => 'blackberry\|\bBB10\b\|rim tablet os',
485	+ 'PalmOS' => 'PalmOS\|avantgo\|blazer\|elaine\|hiptop\|palm\|plucker\|xiino',
486	+ 'SymbianOS' => 'Symbian\|SymbOS\|Series60\|Series40\|SYB-[0-9]+\|\bS60\b',
487	+ // @reference: http://en.wikipedia.org/wiki/Windows_Mobile
488	+ 'WindowsMobileOS' => 'Windows CE.*(PPC\|Smartphone\|Mobile\|[0-9]{3}x[0-9]{3})\|Window Mobile\|Windows Phone [0-9.]+\|WCE;',
489	+ // @reference: http://en.wikipedia.org/wiki/Windows_Phone
490	+ // http://wifeng.cn/?r=blog&a=view&id=106
491	+ // http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx
492	+ // http://msdn.microsoft.com/library/ms537503.aspx
493	+ // https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx
494	+ 'WindowsPhoneOS' => 'Windows Phone 10.0\|Windows Phone 8.1\|Windows Phone 8.0\|Windows Phone OS\|XBLWP7\|ZuneWP7\|Windows NT 6.[23]; ARM;',
495	+ 'iOS' => '\biPhone.*Mobile\|\biPod\|\biPad\|AppleCoreMedia',
496	+ // http://en.wikipedia.org/wiki/MeeGo
497	+ // @todo: research MeeGo in UAs
498	+ 'MeeGoOS' => 'MeeGo',
499	+ // http://en.wikipedia.org/wiki/Maemo
500	+ // @todo: research Maemo in UAs
501	+ 'MaemoOS' => 'Maemo',
502	+ 'JavaOS' => 'J2ME/\|\bMIDP\b\|\bCLDC\b', // '\|Java/' produces bug #135
503	+ 'webOS' => 'webOS\|hpwOS',
504	+ 'badaOS' => '\bBada\b',
505	+ 'BREWOS' => 'BREW',
506	+ );
507	+
508	+ /**
509	+ * List of mobile User Agents.
510	+ *
511	+ * IMPORTANT: This is a list of only mobile browsers.
512	+ * Mobile Detect 2.x supports only mobile browsers,
513	+ * it was never designed to detect all browsers.
514	+ * The change will come in 2017 in the 3.x release for PHP7.
515	+ *
516	+ * @var array
517	+ */
518	+ protected static $browsers = array(
519	+ //'Vivaldi' => 'Vivaldi',
520	+ // @reference: https://developers.google.com/chrome/mobile/docs/user-agent
521	+ 'Chrome' => '\bCrMo\b\|CriOS\|Android.Chrome/[.0-9] (Mobile)?',
522	+ 'Dolfin' => '\bDolfin\b',
523	+ 'Opera' => 'Opera.Mini\|Opera.Mobi\|Android.Opera\|Mobile.OPR/[0-9.]+$\|Coast/[0-9.]+',
524	+ 'Skyfire' => 'Skyfire',
525	+ 'Edge' => 'Mobile Safari/[.0-9]* Edge',
526	+ 'IE' => 'IEMobile\|MSIEMobile', // \|Trident/[.0-9]+
527	+ 'Firefox' => 'fennec\|firefox.maemo\|(Mobile\|Tablet).Firefox\|Firefox.*Mobile\|FxiOS',
528	+ 'Bolt' => 'bolt',
529	+ 'TeaShark' => 'teashark',
530	+ 'Blazer' => 'Blazer',
531	+ // @reference: http://developer.apple.com/library/safari/#documentation/AppleApplications/Reference/SafariWebContent/OptimizingforSafarioniPhone/OptimizingforSafarioniPhone.html#//apple_ref/doc/uid/TP40006517-SW3
532	+ 'Safari' => 'Version.Mobile.Safari\|Safari.*Mobile\|MobileSafari',
533	+ // http://en.wikipedia.org/wiki/Midori_(web_browser)
534	+ //'Midori' => 'midori',
535	+ //'Tizen' => 'Tizen',
536	+ 'WeChat' => '\bMicroMessenger\b',
537	+ 'UCBrowser' => 'UC.*Browser\|UCWEB',
538	+ 'baiduboxapp' => 'baiduboxapp',
539	+ 'baidubrowser' => 'baidubrowser',
540	+ // https://github.com/serbanghita/Mobile-Detect/issues/7
541	+ 'DiigoBrowser' => 'DiigoBrowser',
542	+ // http://www.puffinbrowser.com/index.php
543	+ 'Puffin' => 'Puffin',
544	+ // http://mercury-browser.com/index.html
545	+ 'Mercury' => '\bMercury\b',
546	+ // http://en.wikipedia.org/wiki/Obigo_Browser
547	+ 'ObigoBrowser' => 'Obigo',
548	+ // http://en.wikipedia.org/wiki/NetFront
549	+ 'NetFront' => 'NF-Browser',
550	+ // @reference: http://en.wikipedia.org/wiki/Minimo
551	+ // http://en.wikipedia.org/wiki/Vision_Mobile_Browser
552	+ 'GenericBrowser' => 'NokiaBrowser\|OviBrowser\|OneBrowser\|TwonkyBeamBrowser\|SEMC.*Browser\|FlyFlow\|Minimo\|NetFront\|Novarra-Vision\|MQQBrowser\|MicroMessenger',
553	+ // @reference: https://en.wikipedia.org/wiki/Pale_Moon_(web_browser)
554	+ 'PaleMoon' => 'Android.PaleMoon\|Mobile.PaleMoon',
555	+ );
556	+
557	+ /**
558	+ * Utilities.
559	+ *
560	+ * @var array
561	+ */
562	+ protected static $utilities = array(
563	+ // Experimental. When a mobile device wants to switch to 'Desktop Mode'.
564	+ // http://scottcate.com/technology/windows-phone-8-ie10-desktop-or-mobile/
565	+ // https://github.com/serbanghita/Mobile-Detect/issues/57#issuecomment-15024011
566	+ // https://developers.facebook.com/docs/sharing/best-practices
567	+ 'Bot' => 'Googlebot\|facebookexternalhit\|AdsBot-Google\|Google Keyword Suggestion\|Facebot\|YandexBot\|YandexMobileBot\|bingbot\|ia_archiver\|AhrefsBot\|Ezooms\|GSLFbot\|WBSearchBot\|Twitterbot\|TweetmemeBot\|Twikle\|PaperLiBot\|Wotbox\|UnwindFetchor\|Exabot\|MJ12bot\|YandexImages\|TurnitinBot\|Pingdom',
568	+ 'MobileBot' => 'Googlebot-Mobile\|AdsBot-Google-Mobile\|YahooSeeker/M1A1-R2D2',
569	+ 'DesktopMode' => 'WPDesktop',
570	+ 'TV' => 'SonyDTV\|HbbTV', // experimental
571	+ 'WebKit' => '(webkit)[ /]([\w.]+)',
572	+ // @todo: Include JXD consoles.
573	+ 'Console' => '\b(Nintendo\|Nintendo WiiU\|Nintendo 3DS\|Nintendo Switch\|PLAYSTATION\|Xbox)\b',
574	+ 'Watch' => 'SM-V700',
575	+ );
576	+
577	+ /**
578	+ * All possible HTTP headers that represent the
579	+ * User-Agent string.
580	+ *
581	+ * @var array
582	+ */
583	+ protected static $uaHttpHeaders = array(
584	+ // The default User-Agent string.
585	+ 'HTTP_USER_AGENT',
586	+ // Header can occur on devices using Opera Mini.
587	+ 'HTTP_X_OPERAMINI_PHONE_UA',
588	+ // Vodafone specific header: http://www.seoprinciple.com/mobile-web-community-still-angry-at-vodafone/24/
589	+ 'HTTP_X_DEVICE_USER_AGENT',
590	+ 'HTTP_X_ORIGINAL_USER_AGENT',
591	+ 'HTTP_X_SKYFIRE_PHONE',
592	+ 'HTTP_X_BOLT_PHONE_UA',
593	+ 'HTTP_DEVICE_STOCK_UA',
594	+ 'HTTP_X_UCBROWSER_DEVICE_UA'
595	+ );
596	+
597	+ /**
598	+ * The individual segments that could exist in a User-Agent string. VER refers to the regular
599	+ * expression defined in the constant self::VER.
600	+ *
601	+ * @var array
602	+ */
603	+ protected static $properties = array(
604	+
605	+ // Build
606	+ 'Mobile' => 'Mobile/[VER]',
607	+ 'Build' => 'Build/[VER]',
608	+ 'Version' => 'Version/[VER]',
609	+ 'VendorID' => 'VendorID/[VER]',
610	+
611	+ // Devices
612	+ 'iPad' => 'iPad.*CPU[a-z ]+[VER]',
613	+ 'iPhone' => 'iPhone.*CPU[a-z ]+[VER]',
614	+ 'iPod' => 'iPod.*CPU[a-z ]+[VER]',
615	+ //'BlackBerry' => array('BlackBerry[VER]', 'BlackBerry [VER];'),
616	+ 'Kindle' => 'Kindle/[VER]',
617	+
618	+ // Browser
619	+ 'Chrome' => array('Chrome/[VER]', 'CriOS/[VER]', 'CrMo/[VER]'),
620	+ 'Coast' => array('Coast/[VER]'),
621	+ 'Dolfin' => 'Dolfin/[VER]',
622	+ // @reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent/Firefox
623	+ 'Firefox' => array('Firefox/[VER]', 'FxiOS/[VER]'),
624	+ 'Fennec' => 'Fennec/[VER]',
625	+ // http://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx
626	+ // https://msdn.microsoft.com/en-us/library/ie/hh869301(v=vs.85).aspx
627	+ 'Edge' => 'Edge/[VER]',
628	+ 'IE' => array('IEMobile/[VER];', 'IEMobile [VER]', 'MSIE [VER];', 'Trident/[0-9.]+;.*rv:[VER]'),
629	+ // http://en.wikipedia.org/wiki/NetFront
630	+ 'NetFront' => 'NetFront/[VER]',
631	+ 'NokiaBrowser' => 'NokiaBrowser/[VER]',
632	+ 'Opera' => array( ' OPR/[VER]', 'Opera Mini/[VER]', 'Version/[VER]' ),
633	+ 'Opera Mini' => 'Opera Mini/[VER]',
634	+ 'Opera Mobi' => 'Version/[VER]',
635	+ 'UCBrowser' => array( 'UCWEB[VER]', 'UC.*Browser/[VER]' ),
636	+ 'MQQBrowser' => 'MQQBrowser/[VER]',
637	+ 'MicroMessenger' => 'MicroMessenger/[VER]',
638	+ 'baiduboxapp' => 'baiduboxapp/[VER]',
639	+ 'baidubrowser' => 'baidubrowser/[VER]',
640	+ 'SamsungBrowser' => 'SamsungBrowser/[VER]',
641	+ 'Iron' => 'Iron/[VER]',
642	+ // @note: Safari 7534.48.3 is actually Version 5.1.
643	+ // @note: On BlackBerry the Version is overwriten by the OS.
644	+ 'Safari' => array( 'Version/[VER]', 'Safari/[VER]' ),
645	+ 'Skyfire' => 'Skyfire/[VER]',
646	+ 'Tizen' => 'Tizen/[VER]',
647	+ 'Webkit' => 'webkit[ /][VER]',
648	+ 'PaleMoon' => 'PaleMoon/[VER]',
649	+
650	+ // Engine
651	+ 'Gecko' => 'Gecko/[VER]',
652	+ 'Trident' => 'Trident/[VER]',
653	+ 'Presto' => 'Presto/[VER]',
654	+ 'Goanna' => 'Goanna/[VER]',
655	+
656	+ // OS
657	+ 'iOS' => ' \bi?OS\b [VER][ ;]{1}',
658	+ 'Android' => 'Android [VER]',
659	+ 'BlackBerry' => array('BlackBerry[\w]+/[VER]', 'BlackBerry.*Version/[VER]', 'Version/[VER]'),
660	+ 'BREW' => 'BREW [VER]',
661	+ 'Java' => 'Java/[VER]',
662	+ // @reference: http://windowsteamblog.com/windows_phone/b/wpdev/archive/2011/08/29/introducing-the-ie9-on-windows-phone-mango-user-agent-string.aspx
663	+ // @reference: http://en.wikipedia.org/wiki/Windows_NT#Releases
664	+ 'Windows Phone OS' => array( 'Windows Phone OS [VER]', 'Windows Phone [VER]'),
665	+ 'Windows Phone' => 'Windows Phone [VER]',
666	+ 'Windows CE' => 'Windows CE/[VER]',
667	+ // http://social.msdn.microsoft.com/Forums/en-US/windowsdeveloperpreviewgeneral/thread/6be392da-4d2f-41b4-8354-8dcee20c85cd
668	+ 'Windows NT' => 'Windows NT [VER]',
669	+ 'Symbian' => array('SymbianOS/[VER]', 'Symbian/[VER]'),
670	+ 'webOS' => array('webOS/[VER]', 'hpwOS/[VER];'),
671	+ );
672	+
673	+ /**
674	+ * Construct an instance of this class.
675	+ *
676	+ * @param array $headers Specify the headers as injection. Should be PHP _SERVER flavored.
677	+ * If left empty, will use the global _SERVER['HTTP_*'] vars instead.
678	+ * @param string $userAgent Inject the User-Agent header. If null, will use HTTP_USER_AGENT
679	+ * from the $headers array instead.
680	+ */
681	+ public function __construct(
682	+ array $headers = null,
683	+ $userAgent = null
684	+ ) {
685	+ $this->setHttpHeaders($headers);
686	+ $this->setUserAgent($userAgent);
687	+ }
688	+
689	+ /**
690	+ * Get the current script version.
691	+ * This is useful for the demo.php file,
692	+ * so people can check on what version they are testing
693	+ * for mobile devices.
694	+ *
695	+ * @return string The version number in semantic version format.
696	+ */
697	+ public static function getScriptVersion()
698	+ {
699	+ return self::VERSION;
700	+ }
701	+
702	+ /**
703	+ * Set the HTTP Headers. Must be PHP-flavored. This method will reset existing headers.
704	+ *
705	+ * @param array $httpHeaders The headers to set. If null, then using PHP's _SERVER to extract
706	+ * the headers. The default null is left for backwards compatibility.
707	+ */
708	+ public function setHttpHeaders($httpHeaders = null)
709	+ {
710	+ // use global _SERVER if $httpHeaders aren't defined
711	+ if (!is_array($httpHeaders) \|\| !count($httpHeaders)) {
712	+ $httpHeaders = $_SERVER;
713	+ }
714	+
715	+ // clear existing headers
716	+ $this->httpHeaders = array();
717	+
718	+ // Only save HTTP headers. In PHP land, that means only _SERVER vars that
719	+ // start with HTTP_.
720	+ foreach ($httpHeaders as $key => $value) {
721	+ if (substr($key, 0, 5) === 'HTTP_') {
722	+ $this->httpHeaders[$key] = $value;
723	+ }
724	+ }
725	+
726	+ // In case we're dealing with CloudFront, we need to know.
727	+ $this->setCfHeaders($httpHeaders);
728	+ }
729	+
730	+ /**
731	+ * Retrieves the HTTP headers.
732	+ *
733	+ * @return array
734	+ */
735	+ public function getHttpHeaders()
736	+ {
737	+ return $this->httpHeaders;
738	+ }
739	+
740	+ /**
741	+ * Retrieves a particular header. If it doesn't exist, no exception/error is caused.
742	+ * Simply null is returned.
743	+ *
744	+ * @param string $header The name of the header to retrieve. Can be HTTP compliant such as
745	+ * "User-Agent" or "X-Device-User-Agent" or can be php-esque with the
746	+ * all-caps, HTTP_ prefixed, underscore seperated awesomeness.
747	+ *
748	+ * @return string\|null The value of the header.
749	+ */
750	+ public function getHttpHeader($header)
751	+ {
752	+ // are we using PHP-flavored headers?
753	+ if (strpos($header, '_') === false) {
754	+ $header = str_replace('-', '_', $header);
755	+ $header = strtoupper($header);
756	+ }
757	+
758	+ // test the alternate, too
759	+ $altHeader = 'HTTP_' . $header;
760	+
761	+ //Test both the regular and the HTTP_ prefix
762	+ if (isset($this->httpHeaders[$header])) {
763	+ return $this->httpHeaders[$header];
764	+ } elseif (isset($this->httpHeaders[$altHeader])) {
765	+ return $this->httpHeaders[$altHeader];
766	+ }
767	+
768	+ return null;
769	+ }
770	+
771	+ public function getMobileHeaders()
772	+ {
773	+ return self::$mobileHeaders;
774	+ }
775	+
776	+ /**
777	+ * Get all possible HTTP headers that
778	+ * can contain the User-Agent string.
779	+ *
780	+ * @return array List of HTTP headers.
781	+ */
782	+ public function getUaHttpHeaders()
783	+ {
784	+ return self::$uaHttpHeaders;
785	+ }
786	+
787	+
788	+ /**
789	+ * Set CloudFront headers
790	+ * http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/header-caching.html#header-caching-web-device
791	+ *
792	+ * @param array $cfHeaders List of HTTP headers
793	+ *
794	+ * @return boolean If there were CloudFront headers to be set
795	+ */
796	+ public function setCfHeaders($cfHeaders = null) {
797	+ // use global _SERVER if $cfHeaders aren't defined
798	+ if (!is_array($cfHeaders) \|\| !count($cfHeaders)) {
799	+ $cfHeaders = $_SERVER;
800	+ }
801	+
802	+ // clear existing headers
803	+ $this->cloudfrontHeaders = array();
804	+
805	+ // Only save CLOUDFRONT headers. In PHP land, that means only _SERVER vars that
806	+ // start with cloudfront-.
807	+ $response = false;
808	+ foreach ($cfHeaders as $key => $value) {
809	+ if (substr(strtolower($key), 0, 16) === 'http_cloudfront_') {
810	+ $this->cloudfrontHeaders[strtoupper($key)] = $value;
811	+ $response = true;
812	+ }
813	+ }
814	+
815	+ return $response;
816	+ }
817	+
818	+ /**
819	+ * Retrieves the cloudfront headers.
820	+ *
821	+ * @return array
822	+ */
823	+ public function getCfHeaders()
824	+ {
825	+ return $this->cloudfrontHeaders;
826	+ }
827	+
828	+ /**
829	+ * @param string $userAgent
830	+ * @return string
831	+ */
832	+ private function prepareUserAgent($userAgent) {
833	+ $userAgent = trim($userAgent);
834	+ $userAgent = substr($userAgent, 0, 500);
835	+ return $userAgent;
836	+ }
837	+
838	+ /**
839	+ * Set the User-Agent to be used.
840	+ *
841	+ * @param string $userAgent The user agent string to set.
842	+ *
843	+ * @return string\|null
844	+ */
845	+ public function setUserAgent($userAgent = null)
846	+ {
847	+ // Invalidate cache due to #375
848	+ $this->cache = array();
849	+
850	+ if (false === empty($userAgent)) {
851	+ return $this->userAgent = $this->prepareUserAgent($userAgent);
852	+ } else {
853	+ $this->userAgent = null;
854	+ foreach ($this->getUaHttpHeaders() as $altHeader) {
855	+ if (false === empty($this->httpHeaders[$altHeader])) { // @todo: should use getHttpHeader(), but it would be slow. (Serban)
856	+ $this->userAgent .= $this->httpHeaders[$altHeader] . " ";
857	+ }
858	+ }
859	+
860	+ if (!empty($this->userAgent)) {
861	+ return $this->userAgent = $this->prepareUserAgent($this->userAgent);
862	+ }
863	+ }
864	+
865	+ if (count($this->getCfHeaders()) > 0) {
866	+ return $this->userAgent = 'Amazon CloudFront';
867	+ }
868	+ return $this->userAgent = null;
869	+ }
870	+
871	+ /**
872	+ * Retrieve the User-Agent.
873	+ *
874	+ * @return string\|null The user agent if it's set.
875	+ */
876	+ public function getUserAgent()
877	+ {
878	+ return $this->userAgent;
879	+ }
880	+
881	+ /**
882	+ * Set the detection type. Must be one of self::DETECTION_TYPE_MOBILE or
883	+ * self::DETECTION_TYPE_EXTENDED. Otherwise, nothing is set.
884	+ *
885	+ * @deprecated since version 2.6.9
886	+ *
887	+ * @param string $type The type. Must be a self::DETECTION_TYPE_* constant. The default
888	+ * parameter is null which will default to self::DETECTION_TYPE_MOBILE.
889	+ */
890	+ public function setDetectionType($type = null)
891	+ {
892	+ if ($type === null) {
893	+ $type = self::DETECTION_TYPE_MOBILE;
894	+ }
895	+
896	+ if ($type !== self::DETECTION_TYPE_MOBILE && $type !== self::DETECTION_TYPE_EXTENDED) {
897	+ return;
898	+ }
899	+
900	+ $this->detectionType = $type;
901	+ }
902	+
903	+ public function getMatchingRegex()
904	+ {
905	+ return $this->matchingRegex;
906	+ }
907	+
908	+ public function getMatchesArray()
909	+ {
910	+ return $this->matchesArray;
911	+ }
912	+
913	+ /**
914	+ * Retrieve the list of known phone devices.
915	+ *
916	+ * @return array List of phone devices.
917	+ */
918	+ public static function getPhoneDevices()
919	+ {
920	+ return self::$phoneDevices;
921	+ }
922	+
923	+ /**
924	+ * Retrieve the list of known tablet devices.
925	+ *
926	+ * @return array List of tablet devices.
927	+ */
928	+ public static function getTabletDevices()
929	+ {
930	+ return self::$tabletDevices;
931	+ }
932	+
933	+ /**
934	+ * Alias for getBrowsers() method.
935	+ *
936	+ * @return array List of user agents.
937	+ */
938	+ public static function getUserAgents()
939	+ {
940	+ return self::getBrowsers();
941	+ }
942	+
943	+ /**
944	+ * Retrieve the list of known browsers. Specifically, the user agents.
945	+ *
946	+ * @return array List of browsers / user agents.
947	+ */
948	+ public static function getBrowsers()
949	+ {
950	+ return self::$browsers;
951	+ }
952	+
953	+ /**
954	+ * Retrieve the list of known utilities.
955	+ *
956	+ * @return array List of utilities.
957	+ */
958	+ public static function getUtilities()
959	+ {
960	+ return self::$utilities;
961	+ }
962	+
963	+ /**
964	+ * Method gets the mobile detection rules. This method is used for the magic methods $detect->is*().
965	+ *
966	+ * @deprecated since version 2.6.9
967	+ *
968	+ * @return array All the rules (but not extended).
969	+ */
970	+ public static function getMobileDetectionRules()
971	+ {
972	+ static $rules;
973	+
974	+ if (!$rules) {
975	+ $rules = array_merge(
976	+ self::$phoneDevices,
977	+ self::$tabletDevices,
978	+ self::$operatingSystems,
979	+ self::$browsers
980	+ );
981	+ }
982	+
983	+ return $rules;
984	+
985	+ }
986	+
987	+ /**
988	+ * Method gets the mobile detection rules + utilities.
989	+ * The reason this is separate is because utilities rules
990	+ * don't necessary imply mobile. This method is used inside
991	+ * the new $detect->is('stuff') method.
992	+ *
993	+ * @deprecated since version 2.6.9
994	+ *
995	+ * @return array All the rules + extended.
996	+ */
997	+ public function getMobileDetectionRulesExtended()
998	+ {
999	+ static $rules;
1000	+
1001	+ if (!$rules) {
1002	+ // Merge all rules together.
1003	+ $rules = array_merge(
1004	+ self::$phoneDevices,
1005	+ self::$tabletDevices,
1006	+ self::$operatingSystems,
1007	+ self::$browsers,
1008	+ self::$utilities
1009	+ );
1010	+ }
1011	+
1012	+ return $rules;
1013	+ }
1014	+
1015	+ /**
1016	+ * Retrieve the current set of rules.
1017	+ *
1018	+ * @deprecated since version 2.6.9
1019	+ *
1020	+ * @return array
1021	+ */
1022	+ public function getRules()
1023	+ {
1024	+ if ($this->detectionType == self::DETECTION_TYPE_EXTENDED) {
1025	+ return self::getMobileDetectionRulesExtended();
1026	+ } else {
1027	+ return self::getMobileDetectionRules();
1028	+ }
1029	+ }
1030	+
1031	+ /**
1032	+ * Retrieve the list of mobile operating systems.
1033	+ *
1034	+ * @return array The list of mobile operating systems.
1035	+ */
1036	+ public static function getOperatingSystems()
1037	+ {
1038	+ return self::$operatingSystems;
1039	+ }
1040	+
1041	+ /**
1042	+ * Check the HTTP headers for signs of mobile.
1043	+ * This is the fastest mobile check possible; it's used
1044	+ * inside isMobile() method.
1045	+ *
1046	+ * @return bool
1047	+ */
1048	+ public function checkHttpHeadersForMobile()
1049	+ {
1050	+
1051	+ foreach ($this->getMobileHeaders() as $mobileHeader => $matchType) {
1052	+ if (isset($this->httpHeaders[$mobileHeader])) {
1053	+ if (is_array($matchType['matches'])) {
1054	+ foreach ($matchType['matches'] as $_match) {
1055	+ if (strpos($this->httpHeaders[$mobileHeader], $_match) !== false) {
1056	+ return true;
1057	+ }
1058	+ }
1059	+
1060	+ return false;
1061	+ } else {
1062	+ return true;
1063	+ }
1064	+ }
1065	+ }
1066	+
1067	+ return false;
1068	+
1069	+ }
1070	+
1071	+ /**
1072	+ * Magic overloading method.
1073	+ *
1074	+ * @method boolean is[...]()
1075	+ * @param string $name
1076	+ * @param array $arguments
1077	+ * @return mixed
1078	+ * @throws BadMethodCallException when the method doesn't exist and doesn't start with 'is'
1079	+ */
1080	+ public function __call($name, $arguments)
1081	+ {
1082	+ // make sure the name starts with 'is', otherwise
1083	+ if (substr($name, 0, 2) !== 'is') {
1084	+ throw new BadMethodCallException("No such method exists: $name");
1085	+ }
1086	+
1087	+ $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
1088	+
1089	+ $key = substr($name, 2);
1090	+
1091	+ return $this->matchUAAgainstKey($key);
1092	+ }
1093	+
1094	+ /**
1095	+ * Find a detection rule that matches the current User-agent.
1096	+ *
1097	+ * @param null $userAgent deprecated
1098	+ * @return boolean
1099	+ */
1100	+ protected function matchDetectionRulesAgainstUA($userAgent = null)
1101	+ {
1102	+ // Begin general search.
1103	+ foreach ($this->getRules() as $_regex) {
1104	+ if (empty($_regex)) {
1105	+ continue;
1106	+ }
1107	+
1108	+ if ($this->match($_regex, $userAgent)) {
1109	+ return true;
1110	+ }
1111	+ }
1112	+
1113	+ return false;
1114	+ }
1115	+
1116	+ /**
1117	+ * Search for a certain key in the rules array.
1118	+ * If the key is found then try to match the corresponding
1119	+ * regex against the User-Agent.
1120	+ *
1121	+ * @param string $key
1122	+ *
1123	+ * @return boolean
1124	+ */
1125	+ protected function matchUAAgainstKey($key)
1126	+ {
1127	+ // Make the keys lowercase so we can match: isIphone(), isiPhone(), isiphone(), etc.
1128	+ $key = strtolower($key);
1129	+ if (false === isset($this->cache[$key])) {
1130	+
1131	+ // change the keys to lower case
1132	+ $_rules = array_change_key_case($this->getRules());
1133	+
1134	+ if (false === empty($_rules[$key])) {
1135	+ $this->cache[$key] = $this->match($_rules[$key]);
1136	+ }
1137	+
1138	+ if (false === isset($this->cache[$key])) {
1139	+ $this->cache[$key] = false;
1140	+ }
1141	+ }
1142	+
1143	+ return $this->cache[$key];
1144	+ }
1145	+
1146	+ /**
1147	+ * Check if the device is mobile.
1148	+ * Returns true if any type of mobile device detected, including special ones
1149	+ * @param null $userAgent deprecated
1150	+ * @param null $httpHeaders deprecated
1151	+ * @return bool
1152	+ */
1153	+ public function isMobile($userAgent = null, $httpHeaders = null)
1154	+ {
1155	+
1156	+ if ($httpHeaders) {
1157	+ $this->setHttpHeaders($httpHeaders);
1158	+ }
1159	+
1160	+ if ($userAgent) {
1161	+ $this->setUserAgent($userAgent);
1162	+ }
1163	+
1164	+ // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
1165	+ if ($this->getUserAgent() === 'Amazon CloudFront') {
1166	+ $cfHeaders = $this->getCfHeaders();
1167	+ if(array_key_exists('HTTP_CLOUDFRONT_IS_MOBILE_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_MOBILE_VIEWER'] === 'true') {
1168	+ return true;
1169	+ }
1170	+ }
1171	+
1172	+ $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
1173	+
1174	+ if ($this->checkHttpHeadersForMobile()) {
1175	+ return true;
1176	+ } else {
1177	+ return $this->matchDetectionRulesAgainstUA();
1178	+ }
1179	+
1180	+ }
1181	+
1182	+ /**
1183	+ * Check if the device is a tablet.
1184	+ * Return true if any type of tablet device is detected.
1185	+ *
1186	+ * @param string $userAgent deprecated
1187	+ * @param array $httpHeaders deprecated
1188	+ * @return bool
1189	+ */
1190	+ public function isTablet($userAgent = null, $httpHeaders = null)
1191	+ {
1192	+ // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
1193	+ if ($this->getUserAgent() === 'Amazon CloudFront') {
1194	+ $cfHeaders = $this->getCfHeaders();
1195	+ if(array_key_exists('HTTP_CLOUDFRONT_IS_TABLET_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_TABLET_VIEWER'] === 'true') {
1196	+ return true;
1197	+ }
1198	+ }
1199	+
1200	+ $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
1201	+
1202	+ foreach (self::$tabletDevices as $_regex) {
1203	+ if ($this->match($_regex, $userAgent)) {
1204	+ return true;
1205	+ }
1206	+ }
1207	+
1208	+ return false;
1209	+ }
1210	+
1211	+ /**
1212	+ * This method checks for a certain property in the
1213	+ * userAgent.
1214	+ * @todo: The httpHeaders part is not yet used.
1215	+ *
1216	+ * @param string $key
1217	+ * @param string $userAgent deprecated
1218	+ * @param string $httpHeaders deprecated
1219	+ * @return bool\|int\|null
1220	+ */
1221	+ public function is($key, $userAgent = null, $httpHeaders = null)
1222	+ {
1223	+ // Set the UA and HTTP headers only if needed (eg. batch mode).
1224	+ if ($httpHeaders) {
1225	+ $this->setHttpHeaders($httpHeaders);
1226	+ }
1227	+
1228	+ if ($userAgent) {
1229	+ $this->setUserAgent($userAgent);
1230	+ }
1231	+
1232	+ $this->setDetectionType(self::DETECTION_TYPE_EXTENDED);
1233	+
1234	+ return $this->matchUAAgainstKey($key);
1235	+ }
1236	+
1237	+ /**
1238	+ * Some detection rules are relative (not standard),
1239	+ * because of the diversity of devices, vendors and
1240	+ * their conventions in representing the User-Agent or
1241	+ * the HTTP headers.
1242	+ *
1243	+ * This method will be used to check custom regexes against
1244	+ * the User-Agent string.
1245	+ *
1246	+ * @param $regex
1247	+ * @param string $userAgent
1248	+ * @return bool
1249	+ *
1250	+ * @todo: search in the HTTP headers too.
1251	+ */
1252	+ public function match($regex, $userAgent = null)
1253	+ {
1254	+ $match = (bool) preg_match(sprintf('#%s#is', $regex), (false === empty($userAgent) ? $userAgent : $this->userAgent), $matches);
1255	+ // If positive match is found, store the results for debug.
1256	+ if ($match) {
1257	+ $this->matchingRegex = $regex;
1258	+ $this->matchesArray = $matches;
1259	+ }
1260	+
1261	+ return $match;
1262	+ }
1263	+
1264	+ /**
1265	+ * Get the properties array.
1266	+ *
1267	+ * @return array
1268	+ */
1269	+ public static function getProperties()
1270	+ {
1271	+ return self::$properties;
1272	+ }
1273	+
1274	+ /**
1275	+ * Prepare the version number.
1276	+ *
1277	+ * @todo Remove the error supression from str_replace() call.
1278	+ *
1279	+ * @param string $ver The string version, like "2.6.21.2152";
1280	+ *
1281	+ * @return float
1282	+ */
1283	+ public function prepareVersionNo($ver)
1284	+ {
1285	+ $ver = str_replace(array('_', ' ', '/'), '.', $ver);
1286	+ $arrVer = explode('.', $ver, 2);
1287	+
1288	+ if (isset($arrVer[1])) {
1289	+ $arrVer[1] = @str_replace('.', '', $arrVer[1]); // @todo: treat strings versions.
1290	+ }
1291	+
1292	+ return (float) implode('.', $arrVer);
1293	+ }
1294	+
1295	+ /**
1296	+ * Check the version of the given property in the User-Agent.
1297	+ * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
1298	+ *
1299	+ * @param string $propertyName The name of the property. See self::getProperties() array
1300	+ * keys for all possible properties.
1301	+ * @param string $type Either self::VERSION_TYPE_STRING to get a string value or
1302	+ * self::VERSION_TYPE_FLOAT indicating a float value. This parameter
1303	+ * is optional and defaults to self::VERSION_TYPE_STRING. Passing an
1304	+ * invalid parameter will default to the this type as well.
1305	+ *
1306	+ * @return string\|float The version of the property we are trying to extract.
1307	+ */
1308	+ public function version($propertyName, $type = self::VERSION_TYPE_STRING)
1309	+ {
1310	+ if (empty($propertyName)) {
1311	+ return false;
1312	+ }
1313	+
1314	+ // set the $type to the default if we don't recognize the type
1315	+ if ($type !== self::VERSION_TYPE_STRING && $type !== self::VERSION_TYPE_FLOAT) {
1316	+ $type = self::VERSION_TYPE_STRING;
1317	+ }
1318	+
1319	+ $properties = self::getProperties();
1320	+
1321	+ // Check if the property exists in the properties array.
1322	+ if (true === isset($properties[$propertyName])) {
1323	+
1324	+ // Prepare the pattern to be matched.
1325	+ // Make sure we always deal with an array (string is converted).
1326	+ $properties[$propertyName] = (array) $properties[$propertyName];
1327	+
1328	+ foreach ($properties[$propertyName] as $propertyMatchString) {
1329	+
1330	+ $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
1331	+
1332	+ // Identify and extract the version.
1333	+ preg_match(sprintf('#%s#is', $propertyPattern), $this->userAgent, $match);
1334	+
1335	+ if (false === empty($match[1])) {
1336	+ $version = ($type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1]);
1337	+
1338	+ return $version;
1339	+ }
1340	+
1341	+ }
1342	+
1343	+ }
1344	+
1345	+ return false;
1346	+ }
1347	+
1348	+ /**
1349	+ * Retrieve the mobile grading, using self::MOBILE_GRADE_* constants.
1350	+ *
1351	+ * @return string One of the self::MOBILE_GRADE_* constants.
1352	+ */
1353	+ public function mobileGrade()
1354	+ {
1355	+ $isMobile = $this->isMobile();
1356	+
1357	+ if (
1358	+ // Apple iOS 4-7.0 – Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3 / 5.1 / 6.1), iPad 3 (5.1 / 6.0), iPad Mini (6.1), iPad Retina (7.0), iPhone 3GS (4.3), iPhone 4 (4.3 / 5.1), iPhone 4S (5.1 / 6.0), iPhone 5 (6.0), and iPhone 5S (7.0)
1359	+ $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) >= 4.3 \|\|
1360	+ $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) >= 4.3 \|\|
1361	+ $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) >= 4.3 \|\|
1362	+
1363	+ // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
1364	+ // Android 3.1 (Honeycomb) - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
1365	+ // Android 4.0 (ICS) - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
1366	+ // Android 4.1 (Jelly Bean) - Tested on a Galaxy Nexus and Galaxy 7
1367	+ ( $this->version('Android', self::VERSION_TYPE_FLOAT)>2.1 && $this->is('Webkit') ) \|\|
1368	+
1369	+ // Windows Phone 7.5-8 - Tested on the HTC Surround (7.5), HTC Trophy (7.5), LG-E900 (7.5), Nokia 800 (7.8), HTC Mazaa (7.8), Nokia Lumia 520 (8), Nokia Lumia 920 (8), HTC 8x (8)
1370	+ $this->version('Windows Phone OS', self::VERSION_TYPE_FLOAT) >= 7.5 \|\|
1371	+
1372	+ // Tested on the Torch 9800 (6) and Style 9670 (6), BlackBerry® Torch 9810 (7), BlackBerry Z10 (10)
1373	+ $this->is('BlackBerry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 6.0 \|\|
1374	+ // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
1375	+ $this->match('Playbook.*Tablet') \|\|
1376	+
1377	+ // Palm WebOS (1.4-3.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0), HP TouchPad (3.0)
1378	+ ( $this->version('webOS', self::VERSION_TYPE_FLOAT) >= 1.4 && $this->match('Palm\|Pre\|Pixi') ) \|\|
1379	+ // Palm WebOS 3.0 - Tested on HP TouchPad
1380	+ $this->match('hp.*TouchPad') \|\|
1381	+
1382	+ // Firefox Mobile 18 - Tested on Android 2.3 and 4.1 devices
1383	+ ( $this->is('Firefox') && $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 18 ) \|\|
1384	+
1385	+ // Chrome for Android - Tested on Android 4.0, 4.1 device
1386	+ ( $this->is('Chrome') && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 4.0 ) \|\|
1387	+
1388	+ // Skyfire 4.1 - Tested on Android 2.3 device
1389	+ ( $this->is('Skyfire') && $this->version('Skyfire', self::VERSION_TYPE_FLOAT) >= 4.1 && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) \|\|
1390	+
1391	+ // Opera Mobile 11.5-12: Tested on Android 2.3
1392	+ ( $this->is('Opera') && $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11.5 && $this->is('AndroidOS') ) \|\|
1393	+
1394	+ // Meego 1.2 - Tested on Nokia 950 and N9
1395	+ $this->is('MeeGoOS') \|\|
1396	+
1397	+ // Tizen (pre-release) - Tested on early hardware
1398	+ $this->is('Tizen') \|\|
1399	+
1400	+ // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
1401	+ // @todo: more tests here!
1402	+ $this->is('Dolfin') && $this->version('Bada', self::VERSION_TYPE_FLOAT) >= 2.0 \|\|
1403	+
1404	+ // UC Browser - Tested on Android 2.3 device
1405	+ ( ($this->is('UC Browser') \|\| $this->is('Dolfin')) && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) \|\|
1406	+
1407	+ // Kindle 3 and Fire - Tested on the built-in WebKit browser for each
1408	+ ( $this->match('Kindle Fire') \|\|
1409	+ $this->is('Kindle') && $this->version('Kindle', self::VERSION_TYPE_FLOAT) >= 3.0 ) \|\|
1410	+
1411	+ // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
1412	+ $this->is('AndroidOS') && $this->is('NookTablet') \|\|
1413	+
1414	+ // Chrome Desktop 16-24 - Tested on OS X 10.7 and Windows 7
1415	+ $this->version('Chrome', self::VERSION_TYPE_FLOAT) >= 16 && !$isMobile \|\|
1416	+
1417	+ // Safari Desktop 5-6 - Tested on OS X 10.7 and Windows 7
1418	+ $this->version('Safari', self::VERSION_TYPE_FLOAT) >= 5.0 && !$isMobile \|\|
1419	+
1420	+ // Firefox Desktop 10-18 - Tested on OS X 10.7 and Windows 7
1421	+ $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 10.0 && !$isMobile \|\|
1422	+
1423	+ // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
1424	+ $this->version('IE', self::VERSION_TYPE_FLOAT) >= 7.0 && !$isMobile \|\|
1425	+
1426	+ // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
1427	+ $this->version('Opera', self::VERSION_TYPE_FLOAT) >= 10 && !$isMobile
1428	+ ){
1429	+ return self::MOBILE_GRADE_A;
1430	+ }
1431	+
1432	+ if (
1433	+ $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT)<4.3 \|\|
1434	+ $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<4.3 \|\|
1435	+ $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT)<4.3 \|\|
1436	+
1437	+ // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
1438	+ $this->is('Blackberry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 5 && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<6 \|\|
1439	+
1440	+ //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
1441	+ ($this->version('Opera Mini', self::VERSION_TYPE_FLOAT) >= 5.0 && $this->version('Opera Mini', self::VERSION_TYPE_FLOAT) <= 7.0 &&
1442	+ ($this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 \|\| $this->is('iOS')) ) \|\|
1443	+
1444	+ // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
1445	+ $this->match('NokiaN8\|NokiaC7\|N97.*Series60\|Symbian/3') \|\|
1446	+
1447	+ // @todo: report this (tested on Nokia N71)
1448	+ $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11 && $this->is('SymbianOS')
1449	+ ){
1450	+ return self::MOBILE_GRADE_B;
1451	+ }
1452	+
1453	+ if (
1454	+ // Blackberry 4.x - Tested on the Curve 8330
1455	+ $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) <= 5.0 \|\|
1456	+ // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
1457	+ $this->match('MSIEMobile\|Windows CE.*Mobile') \|\| $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT) <= 5.2 \|\|
1458	+
1459	+ // Tested on original iPhone (3.1), iPhone 3 (3.2)
1460	+ $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) <= 3.2 \|\|
1461	+ $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) <= 3.2 \|\|
1462	+ $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) <= 3.2 \|\|
1463	+
1464	+ // Internet Explorer 7 and older - Tested on Windows XP
1465	+ $this->version('IE', self::VERSION_TYPE_FLOAT) <= 7.0 && !$isMobile
1466	+ ){
1467	+ return self::MOBILE_GRADE_C;
1468	+ }
1469	+
1470	+ // All older smartphone platforms and featurephones - Any device that doesn't support media queries
1471	+ // will receive the basic, C grade experience.
1472	+ return self::MOBILE_GRADE_C;
1473	+ }
1474	+ }

includes/vendor/vendor-changelog.txt CHANGED Viewed

	@@ -59,4 +59,5 @@ Reason: To extend the functionality of sidebars and Pagebuilder
59	32. Widgets folder added in Vendor amp/includes #1400
60	33. Class AMP_Blacklist_Sanitizer updated #2835
61	34. class-amp-style-sanitizer.php updated #2745
62	- 35. Class AMP_Blacklist_Sanitizer updated for inernal links #2391


59	32. Widgets folder added in Vendor amp/includes #1400
60	33. Class AMP_Blacklist_Sanitizer updated #2835
61	34. class-amp-style-sanitizer.php updated #2745
62	+ 35. Class AMP_Blacklist_Sanitizer updated for inernal links #2391
63	+ 36. Mobile detect library added from https://github.com/serbanghita/Mobile-Detect

pagebuilder/amp-page-builder.php CHANGED Viewed

	@@ -140,6 +140,7 @@ function ampforwp_call_page_builder(){
140	<div id="amp-page-builder" v-if="startPagebuilder==1">
141	<?php wp_nonce_field( "amppb_nonce_action", "amppb_nonce" ) ?>
142	<input type="hidden" name="amp-page-builder" id="amp-page-builder-data" class="amp-data" v-model="JSON.stringify(mainContent)" value='<?php echo $previousData; ?>'>

143	<?php /* This is where we gonna add & manage rows */ ?>
144	<div id="sorted_rows" class="amppb-rows drop" >
145	<drop class="drop" :class="{'row-dropping':rowOverDrop}" @drop="handleDrop" @dragover="rowOverDrop = true"


140	<div id="amp-page-builder" v-if="startPagebuilder==1">
141	<?php wp_nonce_field( "amppb_nonce_action", "amppb_nonce" ) ?>
142	<input type="hidden" name="amp-page-builder" id="amp-page-builder-data" class="amp-data" v-model="JSON.stringify(mainContent)" value='<?php echo $previousData; ?>'>
143	+ <textarea class="hide" id="amp-page-builder-ready"> <?php echo stripcslashes( amppb_post_content('') ); ?></textarea>
144	<?php /* This is where we gonna add & manage rows */ ?>
145	<div id="sorted_rows" class="amppb-rows drop" >
146	<drop class="drop" :class="{'row-dropping':rowOverDrop}" @drop="handleDrop" @dragover="rowOverDrop = true"

pagebuilder/modules/contents-module.php CHANGED Viewed

	@@ -209,7 +209,8 @@ require_once ABSPATH . WPINC . '/category.php';
209	function ampforwp_contentHtml($the_query,$fieldValues,$loopHtml){
210	$contenthtml = '';
211	$ampforwp_show_excerpt = (isset($fieldValues['ampforwp_show_excerpt'])? $fieldValues['ampforwp_show_excerpt']: 'yes');
212	- $ampforwp_excerpt_length = (isset($fieldValues['ampforwp_excerpt_length'])? $fieldValues['ampforwp_excerpt_length']: '15');

213	$ampforwp_show_excerpt = (isset($fieldValues['ampforwp_show_excerpt'])? $fieldValues['ampforwp_show_excerpt']: 'yes');
214	if ( $the_query->have_posts() ) {
215	while ( $the_query->have_posts() ) {


209	function ampforwp_contentHtml($the_query,$fieldValues,$loopHtml){
210	$contenthtml = '';
211	$ampforwp_show_excerpt = (isset($fieldValues['ampforwp_show_excerpt'])? $fieldValues['ampforwp_show_excerpt']: 'yes');
212	+ $ampforwp_excerpt_length = (isset($fieldValues['ampforwp_excerpt_length'])? $fieldValues['ampforwp_excerpt_length']: 15);
213	+ $ampforwp_excerpt_length = (int) $ampforwp_excerpt_length;
214	$ampforwp_show_excerpt = (isset($fieldValues['ampforwp_show_excerpt'])? $fieldValues['ampforwp_show_excerpt']: 'yes');
215	if ( $the_query->have_posts() ) {
216	while ( $the_query->have_posts() ) {

readme.txt CHANGED Viewed

	@@ -4,7 +4,7 @@ Tags: AMP, accelerated mobile pages, mobile, amp project, google amp, amp wp, go
4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.0.3
7	- Stable tag: 0.9.97.35
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
	@@ -121,6 +121,7 @@ Bug reports for AMP for WP are [welcomed on GitHub](https://github.com/ahmedkalu
121
122	== Credits ==
123	Some code used in this plugin was forked from 'AMP for WordPress' plugin https://wordpress.org/plugins/amp/ - License URI: http://www.gnu.org/licenses/gpl-2.0.html.

124
125	== Installation ==
126	[Visit Help area for the Documentation:](https://ampforwp.com/help/)
	@@ -185,12 +186,16 @@ You can contact us from [here](https://ampforwp.com/contact/)
185
186	== Changelog ==
187
188	- = 0.9.97.35 (~~16th~~ February 2019) =
189	- * Added: ~~Levelup~~ ~~Compatability~~ #~~2718~~
190	- * Added: ~~"Align~~ ~~Justify"~~ ~~Option~~ in ~~Page~~ ~~builder's~~ ~~text~~ ~~module~~ #~~2665~~
191	- * Added: ~~Default~~ ~~value~~ ~~for~~ ~~Swift~~ ~~Color~~ ~~Scheme~~ #~~2793~~
192	- * Fixed: ~~ampforwp~~ ~~prefix~~ in ~~the~~ ~~analytics~~ ~~function~~ ~~#2886~~ #~~2890~~
193	- * Fixed: ~~"Below~~ ~~the~~ ~~Footer"~~ ~~ads~~ ~~option~~ ~~showing~~ ~~above~~ ~~and~~ ~~below~~ ~~the~~ ~~footer~~ #~~2778~~
194	- * Fixed: ~~Debug~~ ~~error~~ ~~undefined~~ ~~index~~ ~~comments~~ #~~2887~~




195
196	Full changelog available in changelog.txt


4	Donate link: https://www.paypal.me/Kaludi/25
5	Requires at least: 3.0
6	Tested up to: 5.0.3
7	+ Stable tag: 0.9.97.36
8	License: GPLv2 or later
9	License URI: http://www.gnu.org/licenses/gpl-2.0.html
10

121
122	== Credits ==
123	Some code used in this plugin was forked from 'AMP for WordPress' plugin https://wordpress.org/plugins/amp/ - License URI: http://www.gnu.org/licenses/gpl-2.0.html.
124	+ Mobile & Tablet detection library used https://github.com/serbanghita/Mobile-Detect - License URI: https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt
125
126	== Installation ==
127	[Visit Help area for the Documentation:](https://ampforwp.com/help/)

186
187	== Changelog ==
188
189	+ = 0.9.97.36 (19th February 2019) =
190	+ * Added: Mobile and tablets Detects separately for 'Mobile Redirection' option #2436
191	+ * Added: Scrolling bar for swift theme in chrome browser #2593
192	+ * Added: CSS condition when element markup is visible #2753
193	+ * Fixed: Pre tags not rendering properly on pages #2823
194	+ * Fixed: Logo resize should only apply when Resize setting is enable #2544
195	+ * Fixed: When /?amp is enabled "Visit AMP" is redirecting to dashboard #2363
196	+ * Fixed: ampforwp_wc_shortcode_title is loading globally #2756
197	+ * Fixed: Extra CSS is causing validation error of 50kb #2592
198	+ * Fixed: PHP warning issue in latest version of php #2895
199	+ * Fixed: Yoast analysis is giving false readings for the SEO When AMPforWP Pagebuilder is enabled #2435
200
201	Full changelog available in changelog.txt

templates/category-widget.php CHANGED Viewed

	@@ -76,7 +76,7 @@ class AMPFORWP_Categories_Widget extends WP_Widget {
76	} else {
77	$content = get_the_content();
78	} ?>
79	- <span class="ampforwp_cat_wdgt_excerpt_text"><?php echo wp_trim_words( strip_tags( strip_shortcodes( $content ) ) , '15' ); ?></span>
80	</div> <?php
81	} ?>
82


76	} else {
77	$content = get_the_content();
78	} ?>
79	+ <span class="ampforwp_cat_wdgt_excerpt_text"><?php echo wp_trim_words( strip_tags( strip_shortcodes( $content ) ) , 15 ); ?></span>
80	</div> <?php
81	} ?>
82

templates/design-manager/design-1/elements/related-posts.php CHANGED Viewed

	@@ -107,7 +107,7 @@ if( isset($redux_builder_amp['ampforwp-single-related-posts-switch']) && $redux_
107	}else{
108	$content = get_the_content();
109	} ?>
110	- <p><?php echo wp_trim_words( strip_shortcodes( $content ) , '15' ); ?></p>
111	<?php } ?>
112	</div>
113	</li>


107	}else{
108	$content = get_the_content();
109	} ?>
110	+ <p><?php echo wp_trim_words( strip_shortcodes( $content ) , 15 ); ?></p>
111	<?php } ?>
112	</div>
113	</li>

templates/design-manager/design-1/style.php CHANGED Viewed

@@ -73,7 +73,46 @@ blockquote {color: <?php echo sanitize_hex_color( $text_color ); ?>;background:
             .amp-wp-footer p {color: <?php echo sanitize_hex_color( $muted_text_color ); ?>;font-size: .8em;line-height: 1.5em;margin: 0 15px 0 0;}
             .amp-wp-footer a{text-decoration:none}.copyright_txt{float:left}.back-to-top{float:right}.amp-wp-header .nav_container{float: right;top: 16px;line-height: 1;   right: 65px; position: absolute}.toggle-text{position:absolute;right:0;height:22px;width:28px}.toggle-text span{display:block;position:absolute;height:2px;width:25px;background:#fff;border-radius:19px;opacity:1;left:0}.toggle-text span:nth-child(2){top:9px}.toggle-text span:nth-child(3){top:18px}.amp-wp-home .amp-wp-meta{margin:5px 0}.amp-wp-home .amp-wp-content p{display:inline-block;width:100%}.ampforwp-custom-index .amp-wp-title a {text-decoration: none;color: <?php echo sanitize_hex_color( $text_color ); ?>;}.comment-button-wrapper a,.related_posts ol{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif}.amp-wp-meta{display:flex}.amp-wp-posted-on{display:initial}#pagination .next,#pagination .prev{display:inline-block}.ampforwp-custom-index .amp-wp-content{margin-bottom:30px}.pagination-holder{margin:1.5em 16px}#pagination .next{float:right}.amp-wp-home .amp-wp-content p{display:inline}.home-post-image{float:right;margin:0 0 10px 20px}.amp-wp-article-content amp-img{max-width:100%}.amp-wp-meta.amp-wp-tax-category,.amp-wp-meta.amp-wp-tax-tag{margin:0}.amp-wp-meta.amp-wp-tax-tag{display:initial}.ampforwp-social-icons{margin:1.5em 16px}.amp-social-icon{ width: 50px; height: 28px; display: inline-block; background: #5cbe4a;position: relative; top: -8px; padding-top: 0px; margin-bottom:5px; }
             .amp-social-icon amp-img{ top: 4px; }
-            -
            .custom-amp-socialsharing-line{background:#00b900}.custom-amp-socialsharing-vk{background:#45668e}.amp-social-odnoklassniki{background:#ed812b}.amp-social-reddit{background:#ff4500}.amp-social-telegram{background:#0088cc}.amp-social-tumblr{background:#35465c}.amp-social-digg{background:#005be2}.amp-social-stumbleupon{background:#eb4924}.amp-social-wechat{background:#7bb32e}.amp-social-viber{background:#8f5db7}.amp-social-hatena{background:#00a4de}.amp-social-pocket{background:#e8e8e8}.comment-button-wrapper a{border-style:solid;border-color:#c2c2c2;border-width:1px 1px 2px;border-radius:4px;background-color:transparent;color:#0a89c0;cursor:pointer;display:block;font-size:14px;font-weight:600;text-align:center;line-height:18px;margin:0 auto;max-width:200px;padding:11px 16px;text-decoration:none;width:50%;-webkit-transition:background-color .2s ease;transition:background-color .2s ease}.close-nav,.comments_list div,.related_posts ol li,.toggle-navigation ul,.toggle-navigationv2 ul li a{display:inline-block}main .amp-wp-content.comments_list{background:0 0;box-shadow:none;max-width:1030px}.comments_list h3{font-size:14px;font-weight:700;letter-spacing:.4px;margin:25px 0 10px;color:#333}.comments_list{margin:2.5em 16px}.comments_list ul{margin:0;padding:0}.comments_list ul.children{padding-bottom:10px;margin-left:4%;width:96%}
             .comments_list ul li p{margin:0;font-size:14px;clear:both;padding-top:5px; word-break:break-word;}
             .comments_list ul li{font-family:sans-serif;font-size:11px;list-style-type:none;margin-bottom:12px;background:#fefefe;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 2px 3px rgba(0,0,0,.05);-webkit-box-shadow:0 2px 3px rgba(0,0,0,.05);box-shadow:0 2px 3px rgba(0,0,0,.05);padding:0;max-width:1000px;width:96%}.comments_list ul li .says{margin-right:4px}.comments_list li li,.comments_list li li li{margin:20px 20px 10px}.comments_list ul li p{font-family:Merriweather,'Times New Roman',Times,Serif}.comments_list ul li .comment-body{padding:10px 0 15px}.comment-author{float:left}.single-post footer.comment-meta{padding-bottom:0;     line-height: 1.9;}.comments_list li li{background:#f7f7f7;box-shadow:none;border:1px solid #eee} .page-numbers{ padding: 9px 10px; background: #fff; font-size: 14px; } .comment-author-img{float: left; margin-right: 5px; border-radius: 60px;} .comment-content amp-img{max-width: 300px;} amp-sidebar{width:250px}.amp-sidebar-image{line-height:100px;vertical-align:middle}.amp-close-image{top:15px;left:225px;cursor:pointer}.toggle-navigationv2 ul{list-style-type:none;margin:0;font-family:sans-serif;padding:0}.toggle-navigationv2 ul ul li a{padding-left:35px;background:#fff;display:inline-block}.toggle-navigationv2 ul li a{padding:10px 15px 10px 25px;width:88%;text-decoration:none;background:#fafafa;font-size:13px;border-bottom:1px solid #efefef}.close-nav{font-size:12px;font-family:sans-serif;background:rgba(0,0,0,.25);letter-spacing:1px;padding:10px;border-radius:100px;line-height:8px;margin:14px;left:191px;color:#fff}.close-nav:hover{background:rgba(0,0,0,.45)}.toggle-navigation ul{list-style-type:none;margin:0;padding:0;width:100%}.menu-all-pages-container:after{content:"";clear:both}.toggle-navigation ul li{font-size:13px;border-bottom:1px solid rgba(0,0,0,.11);padding:11px 0;width:25%;float:left;text-align:center;margin-top:6px}.toggle-navigation ul ul{display:none}.toggle-navigation ul li a{color:#eee;padding:15px}.toggle-navigation{display:none;background:#444}.nav_container:hover+.toggle-navigation,.toggle-navigation:active,.toggle-navigation:focus,.toggle-navigation:hover{display:inline-block;width:100%}#amp-user-notification1 p{display:inline-block}amp-user-notification{padding:5px;text-align:center;background:#fff;border-top:1px solid} amp-user-notification button {padding: 8px 10px;background:  <?php echo sanitize_hex_color( $header_background_color ); ?>;color: <?php echo sanitize_hex_color( $header_color ); ?>;margin-left: 5px;border: 0;}amp-user-notification button:hover {cursor: pointer} .amp-ad-wrapper {text-align: center} <?php if( $redux_builder_amp['enable-single-social-icons'] == true && is_single() )  { ?>body {padding-bottom: 43px;}<?php } ?> .sticky_social a{text-decoration:none}.sticky_social{width:100%;bottom:0;display:block;left:0;box-shadow:0 4px 7px #000;background:#fff;padding:7px 0 0;position:fixed;margin:0;z-index:10;text-align:center}.whatsapp-share-icon{width:50px;height:28px;display:inline-block;background:#5cbe4a;padding:4px 0;position:relative;top:-4px}.amp-wp-tax-category span:first-child:after{content:' '}.amp-wp-tax-category span:after,.amp-wp-tax-tag span:after{content:', '}.amp-wp-tax-category span:last-child:after,.amp-wp-tax-tag span:last-child:after{content:' '}pre{white-space:pre-wrap}.amp-ad-wrapper.amp_ad_1{padding-top:20px}
             .amp-wp-content-loop{width:100%}


73	.amp-wp-footer p {color: <?php echo sanitize_hex_color( $muted_text_color ); ?>;font-size: .8em;line-height: 1.5em;margin: 0 15px 0 0;}
74	.amp-wp-footer a{text-decoration:none}.copyright_txt{float:left}.back-to-top{float:right}.amp-wp-header .nav_container{float: right;top: 16px;line-height: 1; right: 65px; position: absolute}.toggle-text{position:absolute;right:0;height:22px;width:28px}.toggle-text span{display:block;position:absolute;height:2px;width:25px;background:#fff;border-radius:19px;opacity:1;left:0}.toggle-text span:nth-child(2){top:9px}.toggle-text span:nth-child(3){top:18px}.amp-wp-home .amp-wp-meta{margin:5px 0}.amp-wp-home .amp-wp-content p{display:inline-block;width:100%}.ampforwp-custom-index .amp-wp-title a {text-decoration: none;color: <?php echo sanitize_hex_color( $text_color ); ?>;}.comment-button-wrapper a,.related_posts ol{font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif}.amp-wp-meta{display:flex}.amp-wp-posted-on{display:initial}#pagination .next,#pagination .prev{display:inline-block}.ampforwp-custom-index .amp-wp-content{margin-bottom:30px}.pagination-holder{margin:1.5em 16px}#pagination .next{float:right}.amp-wp-home .amp-wp-content p{display:inline}.home-post-image{float:right;margin:0 0 10px 20px}.amp-wp-article-content amp-img{max-width:100%}.amp-wp-meta.amp-wp-tax-category,.amp-wp-meta.amp-wp-tax-tag{margin:0}.amp-wp-meta.amp-wp-tax-tag{display:initial}.ampforwp-social-icons{margin:1.5em 16px}.amp-social-icon{ width: 50px; height: 28px; display: inline-block; background: #5cbe4a;position: relative; top: -8px; padding-top: 0px; margin-bottom:5px; }
75	.amp-social-icon amp-img{ top: 4px; }
76	+
77	+ <?php if ( true == ampforwp_get_setting('enable-single-line-share') ) { ?>
78	+ .custom-amp-socialsharing-line{background:#00b900}
79	+ <?php } ?>
80	+ <?php if ( true == ampforwp_get_setting('enable-single-vk-share') ) { ?>
81	+ .custom-amp-socialsharing-vk{background:#45668e}
82	+ <?php } ?>
83	+ <?php if ( true == ampforwp_get_setting('enable-single-odnoklassniki-share') ) { ?>
84	+ .amp-social-odnoklassniki{background:#ed812b}
85	+ <?php } ?>
86	+ <?php if ( true == ampforwp_get_setting('enable-single-reddit-share') ) { ?>
87	+ .amp-social-reddit{background:#ff4500}
88	+ <?php } ?>
89	+ <?php if ( true == ampforwp_get_setting('enable-single-telegram-share') ) { ?>
90	+ .amp-social-telegram{background:#61A8DE}
91	+ <?php } ?>
92	+ <?php if ( true == ampforwp_get_setting('enable-single-tumblr-share') ) { ?>
93	+ .amp-social-tumblr{background:#35465c}
94	+ <?php } ?>
95	+ <?php if ( true == ampforwp_get_setting('enable-single-digg-share') ) { ?>
96	+ .amp-social-digg{background:#005be2}
97	+ <?php } ?>
98	+ <?php if ( true == ampforwp_get_setting('enable-single-stumbleupon-share') ) { ?>
99	+ .amp-social-stumbleupon{background:#eb4924}
100	+ <?php } ?>
101	+ <?php if ( true == ampforwp_get_setting('enable-single-wechat-share') ) { ?>
102	+ .amp-social-wechat{background:#7bb32e}
103	+ <?php } ?>
104	+ <?php if ( true == ampforwp_get_setting('enable-single-viber-share') ) { ?>
105	+ .amp-social-viber{background:#8f5db7}
106	+ <?php } ?>
107	+ <?php if ( true == ampforwp_get_setting('enable-single-hatena-bookmarks') ) { ?>
108	+ .amp-social-hatena{background:#00a4de}
109	+ <?php } ?>
110	+ <?php if ( true == ampforwp_get_setting('enable-single-pocket-share') ) { ?>
111	+ .amp-social-pocket{background:#e8e8e8}
112	+ <?php } ?>
113	+ .comment-button-wrapper a{border-style:solid;border-color:#c2c2c2;border-width:1px 1px 2px;border-radius:4px;background-color:transparent;color:#0a89c0;cursor:pointer;display:block;font-size:14px;font-weight:600;text-align:center;line-height:18px;margin:0 auto;max-width:200px;padding:11px 16px;text-decoration:none;width:50%;-webkit-transition:background-color .2s ease;transition:background-color .2s ease}.close-nav,.comments_list div,.related_posts ol li,.toggle-navigation ul,.toggle-navigationv2 ul li a{display:inline-block}main .amp-wp-content.comments_list{background:0 0;box-shadow:none;max-width:1030px}.comments_list h3{font-size:14px;font-weight:700;letter-spacing:.4px;margin:25px 0 10px;color:#333}.comments_list{margin:2.5em 16px}.comments_list ul{margin:0;padding:0}.comments_list ul.children{padding-bottom:10px;margin-left:4%;width:96%}
114	+
115	+
116	.comments_list ul li p{margin:0;font-size:14px;clear:both;padding-top:5px; word-break:break-word;}
117	.comments_list ul li{font-family:sans-serif;font-size:11px;list-style-type:none;margin-bottom:12px;background:#fefefe;-moz-border-radius:2px;-webkit-border-radius:2px;border-radius:2px;-moz-box-shadow:0 2px 3px rgba(0,0,0,.05);-webkit-box-shadow:0 2px 3px rgba(0,0,0,.05);box-shadow:0 2px 3px rgba(0,0,0,.05);padding:0;max-width:1000px;width:96%}.comments_list ul li .says{margin-right:4px}.comments_list li li,.comments_list li li li{margin:20px 20px 10px}.comments_list ul li p{font-family:Merriweather,'Times New Roman',Times,Serif}.comments_list ul li .comment-body{padding:10px 0 15px}.comment-author{float:left}.single-post footer.comment-meta{padding-bottom:0; line-height: 1.9;}.comments_list li li{background:#f7f7f7;box-shadow:none;border:1px solid #eee} .page-numbers{ padding: 9px 10px; background: #fff; font-size: 14px; } .comment-author-img{float: left; margin-right: 5px; border-radius: 60px;} .comment-content amp-img{max-width: 300px;} amp-sidebar{width:250px}.amp-sidebar-image{line-height:100px;vertical-align:middle}.amp-close-image{top:15px;left:225px;cursor:pointer}.toggle-navigationv2 ul{list-style-type:none;margin:0;font-family:sans-serif;padding:0}.toggle-navigationv2 ul ul li a{padding-left:35px;background:#fff;display:inline-block}.toggle-navigationv2 ul li a{padding:10px 15px 10px 25px;width:88%;text-decoration:none;background:#fafafa;font-size:13px;border-bottom:1px solid #efefef}.close-nav{font-size:12px;font-family:sans-serif;background:rgba(0,0,0,.25);letter-spacing:1px;padding:10px;border-radius:100px;line-height:8px;margin:14px;left:191px;color:#fff}.close-nav:hover{background:rgba(0,0,0,.45)}.toggle-navigation ul{list-style-type:none;margin:0;padding:0;width:100%}.menu-all-pages-container:after{content:"";clear:both}.toggle-navigation ul li{font-size:13px;border-bottom:1px solid rgba(0,0,0,.11);padding:11px 0;width:25%;float:left;text-align:center;margin-top:6px}.toggle-navigation ul ul{display:none}.toggle-navigation ul li a{color:#eee;padding:15px}.toggle-navigation{display:none;background:#444}.nav_container:hover+.toggle-navigation,.toggle-navigation:active,.toggle-navigation:focus,.toggle-navigation:hover{display:inline-block;width:100%}#amp-user-notification1 p{display:inline-block}amp-user-notification{padding:5px;text-align:center;background:#fff;border-top:1px solid} amp-user-notification button {padding: 8px 10px;background: <?php echo sanitize_hex_color( $header_background_color ); ?>;color: <?php echo sanitize_hex_color( $header_color ); ?>;margin-left: 5px;border: 0;}amp-user-notification button:hover {cursor: pointer} .amp-ad-wrapper {text-align: center} <?php if( $redux_builder_amp['enable-single-social-icons'] == true && is_single() ) { ?>body {padding-bottom: 43px;}<?php } ?> .sticky_social a{text-decoration:none}.sticky_social{width:100%;bottom:0;display:block;left:0;box-shadow:0 4px 7px #000;background:#fff;padding:7px 0 0;position:fixed;margin:0;z-index:10;text-align:center}.whatsapp-share-icon{width:50px;height:28px;display:inline-block;background:#5cbe4a;padding:4px 0;position:relative;top:-4px}.amp-wp-tax-category span:first-child:after{content:' '}.amp-wp-tax-category span:after,.amp-wp-tax-tag span:after{content:', '}.amp-wp-tax-category span:last-child:after,.amp-wp-tax-tag span:last-child:after{content:' '}pre{white-space:pre-wrap}.amp-ad-wrapper.amp_ad_1{padding-top:20px}
118	.amp-wp-content-loop{width:100%}

templates/design-manager/design-2/elements/related-posts.php CHANGED Viewed

	@@ -110,7 +110,7 @@ if( isset($redux_builder_amp['ampforwp-single-related-posts-switch']) && $redux_
110	}else{
111	$content = get_the_content();
112	} ?>
113	- <p class="<?php echo $class; ?>"><?php echo wp_trim_words( strip_shortcodes($content) , '15' ); ?></p>
114	<?php } ?>
115	</div>
116	</li>


110	}else{
111	$content = get_the_content();
112	} ?>
113	+ <p class="<?php echo $class; ?>"><?php echo wp_trim_words( strip_shortcodes($content) , 15 ); ?></p>
114	<?php } ?>
115	</div>
116	</li>

templates/design-manager/design-2/style.php CHANGED Viewed

@@ -99,15 +99,48 @@ amp-lightbox{ background: rgba(0, 0, 0,0.85); }
             #pagination .prev{ float: left }
             #pagination .next a, #pagination .prev a{ margin-bottom: 12px; background: #fefefe; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; -moz-box-shadow: 0 2px 3px rgba(0,0,0,.05); -webkit-box-shadow: 0 2px 3px rgba(0,0,0,.05); box-shadow: 0 2px 3px rgba(0,0,0,.05); padding: 11px 15px; font-size: 12px; color: #666; }
             <?php
-            -
             if(is_single() || is_page() ){?>
             /* Sticky Social bar in Single */
             .ampforwp-social-icons-wrapper{ margin: 0.65em 0px 0.65em 0px; height: 28px; }
             .sticky_social{ width: 100%; bottom: 0; display: block; left: 0; box-shadow: 0px 4px 7px #000; background: #fff; padding: 7px 0px 0px 0px; position: fixed; margin: 0; z-index: 10; text-align: center; }
             .amp-social-icon{ width: 50px; height: 28px; display: inline-block; background: #5cbe4a;position: relative; top: -8px; padding-top: 0px; margin-bottom:5px; }
             .amp-social-icon amp-img{ top: 4px; }
             .custom-amp-socialsharing-line{background:#00b900}
             .ampforwp-social-icons custom-amp-socialsharing-vk{background:#45668e}
-            -
            .amp-social-odnoklassniki{background:#ed812b}.amp-social-reddit{background:#ff4500}.amp-social-telegram{background:#0088cc}.amp-social-tumblr{background:#35465c}.amp-social-digg{background:#005be2}.amp-social-stumbleupon{background:#eb4924}.amp-social-wechat{background:#7bb32e}.amp-social-viber{background:#8f5db7}.amp-social-hatena{background:#00a4de}.amp-social-pocket{background:#e8e8e8}
             <?php }?>
             /* Header */
             header.container{line-height: 0;}


99	#pagination .prev{ float: left }
100	#pagination .next a, #pagination .prev a{ margin-bottom: 12px; background: #fefefe; -moz-border-radius: 2px; -webkit-border-radius: 2px; border-radius: 2px; -moz-box-shadow: 0 2px 3px rgba(0,0,0,.05); -webkit-box-shadow: 0 2px 3px rgba(0,0,0,.05); box-shadow: 0 2px 3px rgba(0,0,0,.05); padding: 11px 15px; font-size: 12px; color: #666; }
101	<?php
102	+ if(ampforwp_get_setting('enable-single-social-icons') == true && is_single() \|\| is_page() ){?>
103	/* Sticky Social bar in Single */
104	.ampforwp-social-icons-wrapper{ margin: 0.65em 0px 0.65em 0px; height: 28px; }
105	.sticky_social{ width: 100%; bottom: 0; display: block; left: 0; box-shadow: 0px 4px 7px #000; background: #fff; padding: 7px 0px 0px 0px; position: fixed; margin: 0; z-index: 10; text-align: center; }
106	.amp-social-icon{ width: 50px; height: 28px; display: inline-block; background: #5cbe4a;position: relative; top: -8px; padding-top: 0px; margin-bottom:5px; }
107	.amp-social-icon amp-img{ top: 4px; }
108	+ <?php if ( true == ampforwp_get_setting('enable-single-line-share') ) { ?>
109	.custom-amp-socialsharing-line{background:#00b900}
110	+ <?php } ?>
111	+ <?php if ( true == ampforwp_get_setting('enable-single-vk-share') ) { ?>
112	.ampforwp-social-icons custom-amp-socialsharing-vk{background:#45668e}
113	+ <?php } ?>
114	+ <?php if ( true == ampforwp_get_setting('enable-single-odnoklassniki-share') ) { ?>
115	+ .amp-social-odnoklassniki{background:#ed812b}
116	+ <?php } ?>
117	+ <?php if ( true == ampforwp_get_setting('enable-single-reddit-share') ) { ?>
118	+ .amp-social-reddit{background:#ff4500}
119	+ <?php } ?>
120	+ <?php if ( true == ampforwp_get_setting('enable-single-telegram-share') ) { ?>
121	+ .amp-social-telegram{background:#61A8DE}
122	+ <?php } ?>
123	+ <?php if ( true == ampforwp_get_setting('enable-single-tumblr-share') ) { ?>
124	+ .amp-social-tumblr{background:#35465c}
125	+ <?php } ?>
126	+ <?php if ( true == ampforwp_get_setting('enable-single-digg-share') ) { ?>
127	+ .amp-social-digg{background:#005be2}
128	+ <?php } ?>
129	+ <?php if ( true == ampforwp_get_setting('enable-single-stumbleupon-share') ) { ?>
130	+ .amp-social-stumbleupon{background:#eb4924}
131	+ <?php } ?>
132	+ <?php if ( true == ampforwp_get_setting('enable-single-wechat-share') ) { ?>
133	+ .amp-social-wechat{background:#7bb32e}
134	+ <?php } ?>
135	+ <?php if ( true == ampforwp_get_setting('enable-single-viber-share') ) { ?>
136	+ .amp-social-viber{background:#8f5db7}
137	+ <?php } ?>
138	+ <?php if ( true == ampforwp_get_setting('enable-single-hatena-bookmarks') ) { ?>
139	+ .amp-social-hatena{background:#00a4de}
140	+ <?php } ?>
141	+ <?php if ( true == ampforwp_get_setting('enable-single-pocket-share') ) { ?>
142	+ .amp-social-pocket{background:#e8e8e8}
143	+ <?php } ?>
144	<?php }?>
145	/* Header */
146	header.container{line-height: 0;}

templates/design-manager/design-3/elements/related-posts.php CHANGED Viewed

	@@ -115,7 +115,7 @@ if( isset($redux_builder_amp['ampforwp-single-related-posts-switch']) && $redux_
115	}else{
116	$content = get_the_content();
117	} ?>
118	- <p class="<?php echo esc_attr($class); ?>"><?php echo wp_trim_words( strip_shortcodes( $content ) , '15' ); ?></p>
119	<?php } ?>
120	</div>
121	</li>


115	}else{
116	$content = get_the_content();
117	} ?>
118	+ <p class="<?php echo esc_attr($class); ?>"><?php echo wp_trim_words( strip_shortcodes( $content ) , 15 ); ?></p>
119	<?php } ?>
120	</div>
121	</li>

templates/design-manager/design-3/style.php CHANGED Viewed

@@ -130,7 +130,7 @@ amp-sidebar{ width: 280px; background: #131313; font-family: 'Roboto Slab', seri
             #pagination .next, #pagination .prev{ margin: 0px 6% 10px 6%; }
             #pagination .next a, #pagination .prev a{ opacity:0.9; background: #f42f42; width: 100%; color: #fff; display: inline-block; text-align: center; font-size: 16px; line-height: 1; padding: 18px 0%; border-radius: 4px; }
             <?php }
-            -
             if ( is_single() || is_page() ) {?>
             /* Sticky Social bar in Single */
             .sticky_social{ width: 100%; bottom: 0; display: block; left: 0; box-shadow: 0px 4px 7px #000; background: #fff; padding: 7px 0px 0px 0px; position: fixed; margin: 0; z-index: 10; text-align: center; }
             .amp-social-icon{ width: 50px; height: 28px; display: inline-block; background: #5cbe4a;position: relative; top: -8px; padding-top: 0px; }
@@ -206,10 +206,63 @@ h1.amp-wp-title{ margin: 0; color: #333333; font-size: 48px; line-height: 58px;
             .ampforwp-social-icons{ margin-bottom: 70px; margin-top: 25px; min-height: 40px; }
             .ampforwp-social-icons amp-social-share{ border-radius:60px; background-size:22px; margin-right:6px; }
             .amp-social-icon-rounded{padding: 11px 12px 9px 12px; top: -13px; position: relative; line-height: 1; display: inline-block; height: inherit; border-radius: 60px; }
             .amp-social-line{background:#00b900}
             .amp-social-vk{background:#45668e}
-            -
            .amp-social-odnoklassniki{background:#ed812b}.amp-social-reddit{background:#ff4500}.amp-social-telegram{background:#0088cc}.amp-social-tumblr{background:#35465c}.amp-social-digg{background:#005be2}.amp-social-stumbleupon{background:#eb4924}.amp-social-wechat{background:#7bb32e}.amp-social-viber{background:#8f5db7}.amp-social-hatena{background:#00a4de}.amp-social-pocket{background:#e8e8e8}
-            -
            .amp-social-facebook{background:#3b5998}.amp-social-twitter{background:#1da1f2}.amp-social-gplus{background:#dd4b39}.amp-social-email{background:#000000}.amp-social-pinterest{background:#bd081c}.amp-social-linkedin{background:#0077b5}.amp-social-whatsapp{background:#5cbe4a}
             .ampforwp-custom-social{display:inline-block; margin-bottom:5px}
             .amp-wp-tax-tag { list-style: none; display: inline-block; }
             figure{ margin: 0 0 20px 0; }


130	#pagination .next, #pagination .prev{ margin: 0px 6% 10px 6%; }
131	#pagination .next a, #pagination .prev a{ opacity:0.9; background: #f42f42; width: 100%; color: #fff; display: inline-block; text-align: center; font-size: 16px; line-height: 1; padding: 18px 0%; border-radius: 4px; }
132	<?php }
133	+ if ( ampforwp_get_setting('enable-single-social-icons') == true && is_single() \|\| is_page() ) {?>
134	/* Sticky Social bar in Single */
135	.sticky_social{ width: 100%; bottom: 0; display: block; left: 0; box-shadow: 0px 4px 7px #000; background: #fff; padding: 7px 0px 0px 0px; position: fixed; margin: 0; z-index: 10; text-align: center; }
136	.amp-social-icon{ width: 50px; height: 28px; display: inline-block; background: #5cbe4a;position: relative; top: -8px; padding-top: 0px; }

206	.ampforwp-social-icons{ margin-bottom: 70px; margin-top: 25px; min-height: 40px; }
207	.ampforwp-social-icons amp-social-share{ border-radius:60px; background-size:22px; margin-right:6px; }
208	.amp-social-icon-rounded{padding: 11px 12px 9px 12px; top: -13px; position: relative; line-height: 1; display: inline-block; height: inherit; border-radius: 60px; }
209	+ <?php if ( true == ampforwp_get_setting('enable-single-line-share') ) { ?>
210	.amp-social-line{background:#00b900}
211	+ <?php } ?>
212	+ <?php if ( true == ampforwp_get_setting('enable-single-vk-share') ) { ?>
213	.amp-social-vk{background:#45668e}
214	+ <?php } ?>
215	+ <?php if ( true == ampforwp_get_setting('enable-single-odnoklassniki-share') ) { ?>
216	+ .amp-social-odnoklassniki{background:#ed812b}
217	+ <?php } ?>
218	+ <?php if ( true == ampforwp_get_setting('enable-single-reddit-share') ) { ?>
219	+ .amp-social-reddit{background:#ff4500}
220	+ <?php } ?>
221	+ <?php if ( true == ampforwp_get_setting('enable-single-telegram-share') ) { ?>
222	+ .amp-social-telegram{background:#0088cc}
223	+ <?php } ?>
224	+ <?php if ( true == ampforwp_get_setting('enable-single-tumblr-share') ) { ?>
225	+ .amp-social-tumblr{background:#35465c}
226	+ <?php } ?>
227	+ <?php if ( true == ampforwp_get_setting('enable-single-digg-share') ) { ?>
228	+ .amp-social-digg{background:#005be2}
229	+ <?php } ?>
230	+ <?php if ( true == ampforwp_get_setting('enable-single-stumbleupon-share') ) { ?>
231	+ .amp-social-stumbleupon{background:#eb4924}
232	+ <?php } ?>
233	+ <?php if ( true == ampforwp_get_setting('enable-single-wechat-share') ) { ?>
234	+ .amp-social-wechat{background:#7bb32e}
235	+ <?php } ?>
236	+ <?php if ( true == ampforwp_get_setting('enable-single-viber-share') ) { ?>
237	+ .amp-social-viber{background:#8f5db7}
238	+ <?php } ?>
239	+ <?php if ( true == ampforwp_get_setting('enable-single-hatena-bookmarks') ) { ?>
240	+ .amp-social-hatena{background:#00a4de}
241	+ <?php } ?>
242	+ <?php if ( true == ampforwp_get_setting('enable-single-pocket-share') ) { ?>
243	+ .amp-social-pocket{background:#e8e8e8}
244	+ <?php } ?>
245	+ <?php if ( true == ampforwp_get_setting('enable-single-facebook-share') ) { ?>
246	+ .amp-social-facebook{background:#3b5998}
247	+ <?php } ?>
248	+ <?php if ( true == ampforwp_get_setting('enable-single-twitter-share') ) { ?>
249	+ .amp-social-twitter{background:#1da1f2}
250	+ <?php } ?>
251	+ <?php if ( true == ampforwp_get_setting('enable-single-gplus-share') ) { ?>
252	+ .amp-social-gplus{background:#dd4b39}
253	+ <?php } ?>
254	+ <?php if ( true == ampforwp_get_setting('enable-single-email-share') ) { ?>
255	+ .amp-social-email{background:#000000}
256	+ <?php } ?>
257	+ <?php if ( true == ampforwp_get_setting('enable-single-pinterest-share') ) { ?>
258	+ .amp-social-pinterest{background:#bd081c}
259	+ <?php } ?>
260	+ <?php if ( true == ampforwp_get_setting('enable-single-linkedin-share') ) { ?>
261	+ .amp-social-linkedin{background:#0077b5}
262	+ <?php } ?>
263	+ <?php if ( true == ampforwp_get_setting('enable-single-whatsapp-share') ) { ?>
264	+ .amp-social-whatsapp{background:#5cbe4a}
265	+ <?php } ?>
266	.ampforwp-custom-social{display:inline-block; margin-bottom:5px}
267	.amp-wp-tax-tag { list-style: none; display: inline-block; }
268	figure{ margin: 0 0 20px 0; }

templates/design-manager/swift/style.php CHANGED Viewed

	@@ -95,7 +95,9 @@ $callnowcolor = ampforwp_get_setting('amp-opt-color-rgba-colorscheme-call');
95	.h-call a:after{color:<?php echo ampforwp_sanitize_color($callnowcolor['color']);?>;}
96	<?php }
97	} ?>

98	.h-shop a:after{align-self: center;}

99	.h-ic{margin:0px 10px; align-self: center;}
100	.amp-logo a{line-height:0;display:inline-block;<?php if(isset($redux_builder_amp['swift-element-color-control'] ['rgba']) && $redux_builder_amp['swift-element-color-control'] ['rgba']){?>color:<?php echo ampforwp_sanitize_color($redux_builder_amp['swift-element-color-control']['rgba'])?>;<?php } ?>}
101	.logo <?php if(is_single()){ ?> h2 <?php } else{?>h1<?php }?>{margin: 0;font-size: 17px;font-weight: 700;text-transform: uppercase;display:inline-block;}
	@@ -178,7 +180,6 @@ if($redux_builder_amp['menu-type'] == '1'){?>
178	.m-ctr{<?php if($redux_builder_amp['header-overlay-width']){?>width:<?php echo $redux_builder_amp['header-overlay-width']?>;<?php } ?>height:100%;position: absolute;z-index:99;padding: 2% 0% 100vh 0%;}
179	.m-menu{display: inline-block;width: 100%;padding: 2px 20px 10px 20px;}
180	.m-scrl{overflow-y: auto;display: inline-block;width: 100%;overflow: scroll;max-height: 94vh;}
181	- ::-webkit-scrollbar { display: none; }
182	.m-menu .amp-menu .toggle:after{content: "\e313";font-family: 'icomoon';background-size: 16px;display: inline-block;top: 1px;padding: 5px;font-size:25px;transform: rotate(270deg);cursor: pointer;border-radius: 35px;color: <?php echo ampforwp_sanitize_color($redux_builder_amp['swift-element-overlay-color-control']['rgba'])?>;}
183	.m-menu .amp-menu li.menu-item-has-children:after{display:none;}
184	.m-menu .amp-menu li ul{font-size:14px;}
	@@ -207,7 +208,7 @@ if($redux_builder_amp['menu-type'] == '1'){?>
207	if($redux_builder_amp['primary-menu']){?>
208	.p-m-fl{width:100%;border-bottom: 1px solid rgba(0, 0, 0, 0.05);<?php if($redux_builder_amp['primary-menu-background-scheme']['rgba']){?>background:<?php echo $redux_builder_amp['primary-menu-background-scheme']['rgba']; ?><?php } ?>}
209	.p-menu{width:100%;text-align:center;margin: 0px auto;<?php if($redux_builder_amp['primary-menu-padding-control']){?>padding: <?php echo ' 0px ' .' '.$redux_builder_amp['primary-menu-padding-control']['padding-right'] .' 0px '.$redux_builder_amp['primary-menu-padding-control']['padding-left'] ; ?>;<?php } ?>}
210	- ::-webkit-scrollbar {display: none;}
211	.p-menu ul li{display: inline-block;margin-right: 21px;font-size: 12px;line-height: 20px;letter-spacing: 1px;font-weight: 400;}
212	.p-menu ul li a{<?php if($redux_builder_amp['primary-menu-text-scheme']['rgba']){?>color:<?php echo ampforwp_sanitize_color($redux_builder_amp['primary-menu-text-scheme']['rgba'])?>;<?php } ?>
213	padding: <?php echo $redux_builder_amp['primary-menu-padding-control']['padding-top'] .' 0px '.$redux_builder_amp['primary-menu-padding-control']['padding-bottom'] .' 0px' ; ?>}
	@@ -386,6 +387,10 @@ if( is_page() \|\| ampforwp_is_front_page() \|\| ampforwp_polylang_front_page() ){?>
386	}
387	<?php } ?>
388	<?php } // Level Condition Ends?>




389	<?php if($redux_builder_amp['single-design-type'] == '1' \|\| $redux_builder_amp['single-design-type'] == '4'){?>
390	<?php // Single
391
	@@ -439,10 +444,6 @@ p.nocomments {padding: 10px;color: #fff;}
439	.sgl table {width: 100%;margin-bottom:25px;}
440	.sgl td {padding: 0.5em 1em;border: 1px solid #ddd;}
441	.sgl tr:nth-child(odd) td {background: #f7f7f7;}
442	-
443	- / Pre tag Styling /
444	- pre {padding: 30px 15px;background: #f7f7f7;white-space: pre-wrap;;font-size: 14px;color: #666666;border-left: 3px solid;border-color: <?php echo ampforwp_sanitize_color($swift_cs_color)?>;margin-bottom: 20px;}
445	-
446	<?php // Social Sharing Conditional CSS
447	if($redux_builder_amp['swift-social-position'] == 'above-content'){?>
448	.shr-txt{display:none;}
	@@ -1143,7 +1144,7 @@ if(isset($redux_builder_amp['ftr2-gapping'])){
1143	}
1144	.w-bl{margin-left: 0;display: flex;flex-direction: column;position: relative;flex: 1 0 22%;margin:0 15px 30px;line-height:1.5;font-size:14px;}
1145	.w-bl h4{font-size: <?php echo $redux_builder_amp['swift-head-size'] ?>;font-weight: <?php echo $redux_builder_amp['swift-head-fntwgth'] ?>;margin-bottom: 20px;text-transform: uppercase;letter-spacing: 1px;padding-bottom: 4px;}
1146	- .w-bl ul li~~, .ampforwp_wc_shortcode_title~~{list-style-type: none;margin-bottom: 15px;}
1147	.w-bl ul li:last-child{margin-bottom:0;}
1148	.w-bl ul li a{text-decoration: none;}
1149	.w-bl .menu li .sub-menu, .w-bl .lb-x{display:none;}
	@@ -1199,14 +1200,7 @@ if(isset($redux_builder_amp['ftr2-gapping'])){
1199	border: 1px solid #ccc;
1200	padding: 6px 10px;
1201	}
1202	- ~~.ampforwp_wc_shortcode_title{~~
1203	- margin-top: 12px;
1204	- display: inline-block;
1205	- }
1206	- .ampforwp_wc_shortcode_excerpt{
1207	- font-size:15px;
1208	- line-height:1.4;
1209	- }
1210	<?php /* New footer Features */
1211	if( isset($redux_builder_amp['footer-customize-options']) && true == $redux_builder_amp['footer-customize-options']) { ?>
1212	.f-w{


95	.h-call a:after{color:<?php echo ampforwp_sanitize_color($callnowcolor['color']);?>;}
96	<?php }
97	} ?>
98	+ <?php if (function_exists('is_shop') && is_shop()){ ?>
99	.h-shop a:after{align-self: center;}
100	+ <?php } ?>
101	.h-ic{margin:0px 10px; align-self: center;}
102	.amp-logo a{line-height:0;display:inline-block;<?php if(isset($redux_builder_amp['swift-element-color-control'] ['rgba']) && $redux_builder_amp['swift-element-color-control'] ['rgba']){?>color:<?php echo ampforwp_sanitize_color($redux_builder_amp['swift-element-color-control']['rgba'])?>;<?php } ?>}
103	.logo <?php if(is_single()){ ?> h2 <?php } else{?>h1<?php }?>{margin: 0;font-size: 17px;font-weight: 700;text-transform: uppercase;display:inline-block;}

180	.m-ctr{<?php if($redux_builder_amp['header-overlay-width']){?>width:<?php echo $redux_builder_amp['header-overlay-width']?>;<?php } ?>height:100%;position: absolute;z-index:99;padding: 2% 0% 100vh 0%;}
181	.m-menu{display: inline-block;width: 100%;padding: 2px 20px 10px 20px;}
182	.m-scrl{overflow-y: auto;display: inline-block;width: 100%;overflow: scroll;max-height: 94vh;}

183	.m-menu .amp-menu .toggle:after{content: "\e313";font-family: 'icomoon';background-size: 16px;display: inline-block;top: 1px;padding: 5px;font-size:25px;transform: rotate(270deg);cursor: pointer;border-radius: 35px;color: <?php echo ampforwp_sanitize_color($redux_builder_amp['swift-element-overlay-color-control']['rgba'])?>;}
184	.m-menu .amp-menu li.menu-item-has-children:after{display:none;}
185	.m-menu .amp-menu li ul{font-size:14px;}

208	if($redux_builder_amp['primary-menu']){?>
209	.p-m-fl{width:100%;border-bottom: 1px solid rgba(0, 0, 0, 0.05);<?php if($redux_builder_amp['primary-menu-background-scheme']['rgba']){?>background:<?php echo $redux_builder_amp['primary-menu-background-scheme']['rgba']; ?><?php } ?>}
210	.p-menu{width:100%;text-align:center;margin: 0px auto;<?php if($redux_builder_amp['primary-menu-padding-control']){?>padding: <?php echo ' 0px ' .' '.$redux_builder_amp['primary-menu-padding-control']['padding-right'] .' 0px '.$redux_builder_amp['primary-menu-padding-control']['padding-left'] ; ?>;<?php } ?>}
211	+ .hamb-mnu ::-webkit-scrollbar {display: none;}
212	.p-menu ul li{display: inline-block;margin-right: 21px;font-size: 12px;line-height: 20px;letter-spacing: 1px;font-weight: 400;}
213	.p-menu ul li a{<?php if($redux_builder_amp['primary-menu-text-scheme']['rgba']){?>color:<?php echo ampforwp_sanitize_color($redux_builder_amp['primary-menu-text-scheme']['rgba'])?>;<?php } ?>
214	padding: <?php echo $redux_builder_amp['primary-menu-padding-control']['padding-top'] .' 0px '.$redux_builder_amp['primary-menu-padding-control']['padding-bottom'] .' 0px' ; ?>}

387	}
388	<?php } ?>
389	<?php } // Level Condition Ends?>
390	+ <?php if(is_singular()){ ?>
391	+ / Pre tag Styling /
392	+ pre {padding: 30px 15px;background: #f7f7f7;white-space: pre-wrap;;font-size: 14px;color: #666666;border-left: 3px solid;border-color: <?php echo ampforwp_sanitize_color($swift_cs_color); ?>;margin-bottom: 20px;}
393	+ <?php } ?>
394	<?php if($redux_builder_amp['single-design-type'] == '1' \|\| $redux_builder_amp['single-design-type'] == '4'){?>
395	<?php // Single
396

444	.sgl table {width: 100%;margin-bottom:25px;}
445	.sgl td {padding: 0.5em 1em;border: 1px solid #ddd;}
446	.sgl tr:nth-child(odd) td {background: #f7f7f7;}




447	<?php // Social Sharing Conditional CSS
448	if($redux_builder_amp['swift-social-position'] == 'above-content'){?>
449	.shr-txt{display:none;}

1144	}
1145	.w-bl{margin-left: 0;display: flex;flex-direction: column;position: relative;flex: 1 0 22%;margin:0 15px 30px;line-height:1.5;font-size:14px;}
1146	.w-bl h4{font-size: <?php echo $redux_builder_amp['swift-head-size'] ?>;font-weight: <?php echo $redux_builder_amp['swift-head-fntwgth'] ?>;margin-bottom: 20px;text-transform: uppercase;letter-spacing: 1px;padding-bottom: 4px;}
1147	+ .w-bl ul li{list-style-type: none;margin-bottom: 15px;}
1148	.w-bl ul li:last-child{margin-bottom:0;}
1149	.w-bl ul li a{text-decoration: none;}
1150	.w-bl .menu li .sub-menu, .w-bl .lb-x{display:none;}

1200	border: 1px solid #ccc;
1201	padding: 6px 10px;
1202	}
1203	+







1204	<?php /* New footer Features */
1205	if( isset($redux_builder_amp['footer-customize-options']) && true == $redux_builder_amp['footer-customize-options']) { ?>
1206	.f-w{

templates/features.php CHANGED Viewed

	@@ -1906,7 +1906,7 @@ function ampforwp_meta_redirection_status(){
1906	global $post;
1907	$ampforwp_redirection_post_on_off_meta = '';
1908
1909	- if ( ! is_404() && ampforwp_is_search_has_results() ) {
1910	$ampforwp_redirection_post_on_off_meta = get_post_meta( $post->ID,'ampforwp-redirection-on-off',true);
1911	}
1912
	@@ -4926,14 +4926,14 @@ function ampforwp_generate_meta_desc($json=""){
4926	$desc = $post->post_content;
4927	}
4928	$desc = preg_replace('/\[(.*?)\]/',' ', $desc);
4929	- $desc = addslashes( wp_trim_words( strip_tags( $desc ) , '15' ) );
4930	}
4931	if ( is_search() ) {
4932	$desc = addslashes( ampforwp_translation($redux_builder_amp['amp-translator-search-text'], 'You searched for:') . ' ' . get_search_query() );
4933	}
4934	if ( ampforwp_is_front_page() ) {
4935	$post_id = ampforwp_get_frontpage_id();
4936	- $desc = addslashes( wp_trim_words( strip_tags( get_post_field('post_content', $post_id) ) , '15' ) );
4937	}
4938
4939	// Yoast
	@@ -5108,18 +5108,19 @@ function is_category_amp_disabled(){
5108	}
5109
5110	// 73. View AMP Site below View Site In Dashboard #1076
5111	-
5112	add_action( 'admin_bar_menu', 'ampforwp_visit_amp_in_admin_bar',999 );
5113	-
5114	function ampforwp_visit_amp_in_admin_bar($admin_bar) {
5115	- $~~args = array(~~
5116	- ~~'parent'~~ => '~~site~~-~~name~~',
5117	- ~~'id' =>~~ ~~'view-amp',~~
5118	- '~~title~~' => '~~Visit AMP~~',
5119	- '~~href~~' => ~~ampforwp_url_controller( get_home_url() )~~,
5120	- '~~meta~~' => ~~false~~
5121	- );
5122	- ~~$admin_bar->add_node(~~ ~~$args );~~



5123	}
5124
5125	// Things to be added in the Body Tag #1064
	@@ -5627,7 +5628,7 @@ function ampforwp_inline_related_posts(){
5627	}else{
5628	$content ='<p>'.get_the_content().'</p>';
5629	}
5630	- $inline_related_posts .= '<p>'. wp_trim_words( strip_shortcodes( $content ) , '15' ).'</p>
5631	</div>
5632	</li>';
5633	}


1906	global $post;
1907	$ampforwp_redirection_post_on_off_meta = '';
1908
1909	+ if ( (! is_404() && ampforwp_is_search_has_results() ) && (is_singular() \|\| ampforwp_is_front_page()) ) {
1910	$ampforwp_redirection_post_on_off_meta = get_post_meta( $post->ID,'ampforwp-redirection-on-off',true);
1911	}
1912

4926	$desc = $post->post_content;
4927	}
4928	$desc = preg_replace('/\[(.*?)\]/',' ', $desc);
4929	+ $desc = addslashes( wp_trim_words( strip_tags( $desc ) , 15 ) );
4930	}
4931	if ( is_search() ) {
4932	$desc = addslashes( ampforwp_translation($redux_builder_amp['amp-translator-search-text'], 'You searched for:') . ' ' . get_search_query() );
4933	}
4934	if ( ampforwp_is_front_page() ) {
4935	$post_id = ampforwp_get_frontpage_id();
4936	+ $desc = addslashes( wp_trim_words( strip_tags( get_post_field('post_content', $post_id) ) , 15 ) );
4937	}
4938
4939	// Yoast

5108	}
5109
5110	// 73. View AMP Site below View Site In Dashboard #1076

5111	add_action( 'admin_bar_menu', 'ampforwp_visit_amp_in_admin_bar',999 );

5112	function ampforwp_visit_amp_in_admin_bar($admin_bar) {
5113	+ global $redux_builder_amp;
5114	+ if ( ampforwp_get_setting('ampforwp-homepage-on-off-support') ) {
5115	+ $args = array(
5116	+ 'parent' => 'site-name',
5117	+ 'id' => 'view-amp',
5118	+ 'title' => 'Visit AMP',
5119	+ 'href' => ampforwp_url_controller( get_home_url() ),
5120	+ 'meta' => false
5121	+ );
5122	+ $admin_bar->add_node( $args );
5123	+ }
5124	}
5125
5126	// Things to be added in the Body Tag #1064

5628	}else{
5629	$content ='<p>'.get_the_content().'</p>';
5630	}
5631	+ $inline_related_posts .= '<p>'. wp_trim_words( strip_shortcodes( $content ) , 15 ).'</p>
5632	</div>
5633	</li>';
5634	}

AMP for WP – Accelerated Mobile Pages - Version 0.9.97.36

Version Description

Release Info

Code changes from version 0.9.97.35 to 0.9.97.36