← All changes
|
jetpack_vendor/automattic/jetpack-device-detection/src/class-device-detection.php
+60
-32
13.3.3
→
16.3
View file →
| @@ -23,8 +23,22 @@ | ||
| 23 | 23 | */ |
| 24 | 24 | class Device_Detection { |
| 25 | 25 | |
| 26 | 26 | /** |
| 27 | + * Memoization cache for get_info() results. | |
| 28 | + * | |
| 29 | + * @var array | |
| 30 | + */ | |
| 31 | + private static $get_info_memo = array(); | |
| 32 | + | |
| 33 | + /** | |
| 34 | + * Maximum size of the memoization cache. | |
| 35 | + * | |
| 36 | + * @var int | |
| 37 | + */ | |
| 38 | + private static $max_memo_size = 100; | |
| 39 | + | |
| 40 | + /** | |
| 27 | 41 | * Returns information about the current device accessing the page. |
| 28 | 42 | * |
| 29 | 43 | * @param string $ua (Optional) User-Agent string. |
| 30 | 44 | * |
| @@ -40,8 +54,18 @@ | ||
| 40 | 54 | * 'is_phone_matched_ua' => (string) Matched UA. |
| 41 | 55 | * ); |
| 42 | 56 | */ |
| 43 | 57 | public static function get_info( $ua = '' ) { |
| 58 | + // Return memoized result if available. | |
| 59 | + // phpcs:disable WordPress.Security.ValidatedSanitizedInput | |
| 60 | + $memo_key = ! empty( $ua ) ? $ua : ( $_SERVER['HTTP_USER_AGENT'] ?? '' ); | |
| 61 | + // Note: UA string used raw for compatibility reasons. | |
| 62 | + // No sanitization is needed as the value is never output or persisted, and is only used for memoization. | |
| 63 | + // phpcs:enable WordPress.Security.ValidatedSanitizedInput | |
| 64 | + if ( isset( self::$get_info_memo[ $memo_key ] ) ) { | |
| 65 | + return self::$get_info_memo[ $memo_key ]; | |
| 66 | + } | |
| 67 | + | |
| 44 | 68 | $ua_info = new User_Agent_Info( $ua ); |
| 45 | 69 | |
| 46 | 70 | $info = array( |
| 47 | 71 | 'is_phone' => self::is_mobile( 'any', false, $ua_info ), |
| @@ -48,8 +72,10 @@ | ||
| 48 | 72 | 'is_phone_matched_ua' => self::is_mobile( 'any', true, $ua_info ), |
| 49 | 73 | 'is_smartphone' => self::is_mobile( 'smart', false, $ua_info ), |
| 50 | 74 | 'is_tablet' => $ua_info->is_tablet(), |
| 51 | 75 | 'platform' => $ua_info->get_platform(), |
| 76 | + 'desktop_platform' => $ua_info->get_desktop_platform(), | |
| 77 | + 'browser' => $ua_info->get_browser(), | |
| 52 | 78 | ); |
| 53 | 79 | |
| 54 | 80 | $info['is_handheld'] = $info['is_phone'] || $info['is_tablet']; |
| 55 | 81 | $info['is_desktop'] = ! $info['is_handheld']; |
| @@ -65,8 +91,15 @@ | ||
| 65 | 91 | * @param User_Agent_Info $ua_info Instance of Automattic\Jetpack\Device_Detection\User_Agent_Info. |
| 66 | 92 | */ |
| 67 | 93 | $info = apply_filters( 'jetpack_device_detection_get_info', $info, $ua, $ua_info ); |
| 68 | 94 | } |
| 95 | + | |
| 96 | + // Memoize the result. | |
| 97 | + self::$get_info_memo[ $memo_key ] = $info; | |
| 98 | + if ( count( self::$get_info_memo ) > self::$max_memo_size ) { | |
| 99 | + array_shift( self::$get_info_memo ); | |
| 100 | + } | |
| 101 | + | |
| 69 | 102 | return $info; |
| 70 | 103 | } |
| 71 | 104 | |
| 72 | 105 | /** |
| @@ -143,9 +176,8 @@ | ||
| 143 | 176 | 'smart' => false, |
| 144 | 177 | 'dumb' => false, |
| 145 | 178 | 'any' => false, |
| 146 | 179 | ); |
| 147 | - $first_run = true; | |
| 148 | 180 | $matched_agent = ''; |
| 149 | 181 | |
| 150 | 182 | // If an invalid kind is passed in, reset it to default. |
| 151 | 183 | if ( ! isset( $kinds[ $kind ] ) ) { |
| @@ -155,15 +187,15 @@ | ||
| 155 | 187 | if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) { |
| 156 | 188 | return false; |
| 157 | 189 | } |
| 158 | 190 | |
| 159 | - $agent = strtolower( filter_var( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ) ); | |
| 160 | - if ( strpos( $agent, 'ipad' ) ) { | |
| 191 | + $agent = strtolower( wp_unslash( $_SERVER['HTTP_USER_AGENT'] ) ); // phpcs:ignore WordPress.Security.ValidatedSanitizedInput.InputNotSanitized -- This is validating. | |
| 192 | + if ( strpos( $agent, 'ipad' ) !== false ) { | |
| 161 | 193 | return false; |
| 162 | 194 | } |
| 163 | 195 | |
| 164 | 196 | // Remove Samsung Galaxy tablets (SCH-I800) from being mobile devices. |
| 165 | - if ( strpos( $agent, 'sch-i800' ) ) { | |
| 197 | + if ( strpos( $agent, 'sch-i800' ) !== false ) { | |
| 166 | 198 | return false; |
| 167 | 199 | } |
| 168 | 200 | |
| 169 | 201 | if ( $ua_info->is_android_tablet() && false === $ua_info->is_kindle_touch() ) { |
| @@ -173,44 +205,40 @@ | ||
| 173 | 205 | if ( $ua_info->is_blackberry_tablet() ) { |
| 174 | 206 | return false; |
| 175 | 207 | } |
| 176 | 208 | |
| 177 | - if ( $first_run ) { | |
| 178 | - $first_run = false; | |
| 209 | + // checks for iPhoneTier devices & RichCSS devices. | |
| 210 | + if ( $ua_info->isTierIphone() || $ua_info->isTierRichCSS() ) { | |
| 211 | + $kinds['smart'] = true; | |
| 212 | + $matched_agent = $ua_info->matched_agent; | |
| 213 | + } | |
| 179 | 214 | |
| 180 | - // checks for iPhoneTier devices & RichCSS devices. | |
| 181 | - if ( $ua_info->isTierIphone() || $ua_info->isTierRichCSS() ) { | |
| 182 | - $kinds['smart'] = true; | |
| 183 | - $matched_agent = $ua_info->matched_agent; | |
| 184 | - } | |
| 215 | + if ( ! $kinds['smart'] ) { | |
| 216 | + // if smart, we are not dumb so no need to check. | |
| 217 | + $dumb_agents = $ua_info->dumb_agents; | |
| 185 | 218 | |
| 186 | - if ( ! $kinds['smart'] ) { | |
| 187 | - // if smart, we are not dumb so no need to check. | |
| 188 | - $dumb_agents = $ua_info->dumb_agents; | |
| 219 | + foreach ( $dumb_agents as $dumb_agent ) { | |
| 220 | + if ( false !== strpos( $agent, $dumb_agent ) ) { | |
| 221 | + $kinds['dumb'] = true; | |
| 222 | + $matched_agent = $dumb_agent; | |
| 189 | 223 | |
| 190 | - foreach ( $dumb_agents as $dumb_agent ) { | |
| 191 | - if ( false !== strpos( $agent, $dumb_agent ) ) { | |
| 192 | - $kinds['dumb'] = true; | |
| 193 | - $matched_agent = $dumb_agent; | |
| 194 | - | |
| 195 | - break; | |
| 196 | - } | |
| 224 | + break; | |
| 197 | 225 | } |
| 226 | + } | |
| 198 | 227 | |
| 199 | - if ( ! $kinds['dumb'] ) { | |
| 200 | - if ( isset( $_SERVER['HTTP_X_WAP_PROFILE'] ) ) { | |
| 201 | - $kinds['dumb'] = true; | |
| 202 | - $matched_agent = 'http_x_wap_profile'; | |
| 203 | - } elseif ( isset( $_SERVER['HTTP_ACCEPT'] ) && ( preg_match( '/wap\.|\.wap/i', $_SERVER['HTTP_ACCEPT'] ) || false !== strpos( strtolower( $_SERVER['HTTP_ACCEPT'] ), 'application/vnd.wap.xhtml+xml' ) ) ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput -- This is doing the validating. | |
| 204 | - $kinds['dumb'] = true; | |
| 205 | - $matched_agent = 'vnd.wap.xhtml+xml'; | |
| 206 | - } | |
| 228 | + if ( ! $kinds['dumb'] ) { | |
| 229 | + if ( isset( $_SERVER['HTTP_X_WAP_PROFILE'] ) ) { | |
| 230 | + $kinds['dumb'] = true; | |
| 231 | + $matched_agent = 'http_x_wap_profile'; | |
| 232 | + } elseif ( isset( $_SERVER['HTTP_ACCEPT'] ) && ( preg_match( '/wap\.|\.wap/i', $_SERVER['HTTP_ACCEPT'] ) || false !== strpos( strtolower( $_SERVER['HTTP_ACCEPT'] ), 'application/vnd.wap.xhtml+xml' ) ) ) { // phpcs:ignore WordPress.Security.ValidatedSanitizedInput -- This is doing the validating. | |
| 233 | + $kinds['dumb'] = true; | |
| 234 | + $matched_agent = 'vnd.wap.xhtml+xml'; | |
| 207 | 235 | } |
| 208 | 236 | } |
| 237 | + } | |
| 209 | 238 | |
| 210 | - if ( $kinds['dumb'] || $kinds['smart'] ) { | |
| 211 | - $kinds['any'] = true; | |
| 212 | - } | |
| 239 | + if ( $kinds['dumb'] || $kinds['smart'] ) { | |
| 240 | + $kinds['any'] = true; | |
| 213 | 241 | } |
| 214 | 242 | |
| 215 | 243 | $value = $kinds[ $kind ]; |
| 216 | 244 | |