← All changes
|
vendor/codeinwp/themeisle-sdk/src/Modules/Dashboard_widget.php
+98
-47
3.1.3
→
3.10.5
View file →
| @@ -71,9 +71,11 @@ | ||
| 71 | 71 | * |
| 72 | 72 | * @return Dashboard_Widget Module instance. |
| 73 | 73 | */ |
| 74 | 74 | public function load( $product ) { |
| 75 | - | |
| 75 | + if ( apply_filters( 'themeisle_sdk_hide_dashboard_widget', false ) ) { | |
| 76 | + return; | |
| 77 | + } | |
| 76 | 78 | $this->product = $product; |
| 77 | 79 | $this->dashboard_name = apply_filters( 'themeisle_sdk_dashboard_widget_name', 'WordPress Guides/Tutorials' ); |
| 78 | 80 | $this->feeds = apply_filters( |
| 79 | 81 | 'themeisle_sdk_dashboard_widget_feeds', |
| @@ -78,8 +80,10 @@ | ||
| 78 | 80 | $this->feeds = apply_filters( |
| 79 | 81 | 'themeisle_sdk_dashboard_widget_feeds', |
| 80 | 82 | [ |
| 81 | 83 | 'https://themeisle.com/blog/feed', |
| 84 | + 'https://www.codeinwp.com/blog/feed', | |
| 85 | + 'https://wpshout.com/feed', | |
| 82 | 86 | ] |
| 83 | 87 | ); |
| 84 | 88 | add_action( 'wp_dashboard_setup', array( &$this, 'add_widget' ) ); |
| 85 | 89 | add_action( 'wp_network_dashboard_setup', array( &$this, 'add_widget' ) ); |
| @@ -93,9 +97,9 @@ | ||
| 93 | 97 | * Add widget to the dashboard |
| 94 | 98 | * |
| 95 | 99 | * @return string|void |
| 96 | 100 | */ |
| 97 | - function add_widget() { | |
| 101 | + public function add_widget() { | |
| 98 | 102 | global $wp_meta_boxes; |
| 99 | 103 | if ( isset( $wp_meta_boxes['dashboard']['normal']['core']['themeisle'] ) ) { |
| 100 | 104 | return; |
| 101 | 105 | } |
| @@ -102,9 +106,9 @@ | ||
| 102 | 106 | wp_add_dashboard_widget( |
| 103 | 107 | 'themeisle', |
| 104 | 108 | $this->dashboard_name, |
| 105 | 109 | [ |
| 106 | - &$this, | |
| 110 | + $this, | |
| 107 | 111 | 'render_dashboard_widget', |
| 108 | 112 | ] |
| 109 | 113 | ); |
| 110 | 114 | } |
| @@ -111,9 +115,9 @@ | ||
| 111 | 115 | |
| 112 | 116 | /** |
| 113 | 117 | * Render widget content |
| 114 | 118 | */ |
| 115 | - function render_dashboard_widget() { | |
| 119 | + public function render_dashboard_widget() { | |
| 116 | 120 | $this->setup_feeds(); |
| 117 | 121 | if ( empty( $this->items ) || ! is_array( $this->items ) ) { |
| 118 | 122 | return; |
| 119 | 123 | } |
| @@ -126,12 +130,13 @@ | ||
| 126 | 130 | padding-top: 6px; |
| 127 | 131 | } |
| 128 | 132 | |
| 129 | 133 | #themeisle h2.hndle { |
| 130 | - background-image: url('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA3Ny4xMiA3Ny4xMiI+PHRpdGxlPkFzc2V0IDM8L3RpdGxlPjxwYXRoIGQ9Ik03NS43Niw0Ny42cS0xLjUsNi40Ni00LjA3LDkuMjZBMzYuMjIsMzYuMjIsMCwwLDEsNjMuMjYsNjNhNTEsNTEsMCwwLDEtOS43OSw0LjZoLS4xNXY0LjgyQTQuNjYsNC42NiwwLDAsMSw1Miw3NS43Niw0LjA3LDQuMDcsMCwwLDEsNDksNzcuMTJhNCw0LDAsMCwxLTIuMTgtLjYxQTQuOTQsNC45NCwwLDAsMSw0NS4xOSw3NWE0LjQyLDQuNDIsMCwwLDEtNy41NCwwLDQuOTQsNC45NCwwLDAsMS0xLjU4LDEuNSwzLjc1LDMuNzUsMCwwLDEtMiwuNjFBNC4yNyw0LjI3LDAsMCwxLDMwLjI3LDc1YTQuOTQsNC45NCwwLDAsMS0xLjU4LDEuNSw0LDQsMCwwLDEtMi4xOC42MSwzLjkzLDMuOTMsMCwwLDEtMy4xNi0xLjQzLDUuMyw1LjMsMCwwLDEtMS4yMS0zLjU0LDEzLjgxLDEzLjgxLDAsMCwxLTguNTgsMywxMy4yMywxMy4yMywwLDAsMS05LTMuNDdBMTguMjEsMTguMjEsMCwwLDAsOSw3MC43OWExNC4yNiwxNC4yNiwwLDAsMS03LjgzLTUuNDIsMTYuMTIsMTYuMTIsMCwwLDAsNS4xOS4wNywxMi44OSwxMi44OSwwLDAsMCw0LjktMS43M1EzLjE1LDU1LjQzLDEuMDUsNTAuNDZhMTgsMTgsMCwwLDEtMS02LjkzQTQwLDQwLDAsMCwxLDEuMjEsMzQsMjYuNTksMjYuNTksMCwwLDEsNS4yNywyNC4xUTguNDQsMTkuNDMsMTMsMTkuNDNhMy40MSwzLjQxLDAsMCwxLDMuNDcsMi4yNmMuNi0uOCwxLjItMS41NiwxLjgxLTIuMjZsLjQ1LS40NS43NS0uNzUsMS4wNS0xLjgxYTM1LjIsMzUuMiwwLDAsMSwyLjExLTMuMzIsMjguNTcsMjguNTcsMCwwLDEsOS4xMi03LjY4QTIzLjQsMjMuNCwwLDAsMSw0Mi45MywyLjU2YTIyLjIyLDIyLjIyLDAsMCwxLDIuNzEuMTVBOC4xNiw4LjE2LDAsMCwxLDUxLjgxLDAsOC42OSw4LjY5LDAsMCwxLDU4LDIuNDFhMS41MSwxLjUxLDAsMCwxLC4xNS42OGMwLC4yNS0uNTUuOTMtMS42NiwybC0uMy4zYTkuNjksOS42OSwwLDAsMSwxLjU4LjgzYy41NS4zNS44My42NS44My45YTEuNjIsMS42MiwwLDAsMS0uNiwxbC0uMTUuMTVxNi43OCw2LDguNTgsMTYuMjdBMy4zLDMuMywwLDAsMSw2OSwyMy4zNWE2LjQ4LDYuNDgsMCwwLDEsNC4yMiwyLjFxMy45MiwzLjMyLDMuOTIsMTEuOUE0Mi4wNSw0Mi4wNSwwLDAsMSw3NS43Niw0Ny42Wk01My42Miw1NC4wN2EyNCwyNCwwLDAsMS0xNCw0LjUyQTIxLjQxLDIxLjQxLDAsMCwxLDI3LDU0LjY3LDI0LjI4LDI0LjI4LDAsMCwxLDE4LjUzLDQ1YTI5LDI5LDAsMCwxLTMtMTMsMzEuNzgsMzEuNzgsMCwwLDEsLjkxLTcuNTNBMzIuMTcsMzIuMTcsMCwwLDAsMTEuOSw0MS4yN2EzMy41LDMzLjUsMCwwLDAsMi43OSwxMy40LDI5LjEsMjkuMSwwLDAsMCw3LjksMTAuODUsNC42OCw0LjY4LDAsMCwxLDEuNjYtMS44OCw0LjE3LDQuMTcsMCwwLDEsNC40NC0uMDgsNC41LDQuNSwwLDAsMSwxLjU4LDEuNjZBNC4yLDQuMiwwLDAsMSwzNCw2M2EzLjgzLDMuODMsMCwwLDEsMiwuNiw0LjUsNC41LDAsMCwxLDEuNTgsMS42Niw0LjI3LDQuMjcsMCwwLDEsNy41NCwwLDQuNSw0LjUsMCwwLDEsMS41OC0xLjY2LDQuMTcsNC4xNywwLDAsMSw0LjQ0LjA4LDMuODYsMy44NiwwLDAsMSwxLjUxLDEuNzMsMzAuMTcsMzAuMTcsMCwwLDAsNy42OC05Ljk0LDMxLjE4LDMxLjE4LDAsMCwwLDMuMTYtMTIuMzVBMjguMzksMjguMzksMCwwLDEsNTMuNjIsNTQuMDdaTTI4Ljc3LDY1LjM3YTMuMSwzLjEsMCwwLDAtNC4zNywwLDMuMDYsMy4wNiwwLDAsMC0uOSwyLjI2djQuODJhMy4zMiwzLjMyLDAsMCwwLC45LDIuMzMsMi45MywyLjkzLDAsMCwwLDQuMzcsMCwzLjMyLDMuMzIsMCwwLDAsLjktMi4zM1Y2Ny42M0EzLjA2LDMuMDYsMCwwLDAsMjguNzcsNjUuMzdabS45LTQ4YTQuMjQsNC4yNCwwLDAsMCwzLjQ3LDEuNzMsNC40NSw0LjQ1LDAsMCwwLDMuNTQtMS43Myw2LDYsMCwwLDAsMS40My0zLjkyLDUuNyw1LjcsMCwwLDAtMS40My0zLjg0QTQuNTMsNC41MywwLDAsMCwzMy4xNCw4YTQuMzEsNC4zMSwwLDAsMC0zLjQ3LDEuNjYsNS43OSw1Ljc5LDAsMCwwLTEuMzUsMy43N0E2LjMzLDYuMzMsMCwwLDAsMjkuNjcsMTcuNFptNi40OCw0OGEzLjEsMy4xLDAsMCwwLTQuMzcsMCwzLjA2LDMuMDYsMCwwLDAtLjksMi4yNnY0LjgyYTMuMzIsMy4zMiwwLDAsMCwuOSwyLjMzLDIuOTMsMi45MywwLDAsMCw0LjM3LDAsMy4zMiwzLjMyLDAsMCwwLC45LTIuMzNWNjcuNjNBMy4wNiwzLjA2LDAsMCwwLDM2LjE1LDY1LjM3Wm0tNC4wNy01NC4zYTIuMzcsMi4zNywwLDAsMSwyLTEsMi4xNywyLjE3LDAsMCwxLDEuODgsMSw0LjEsNC4xLDAsMCwxLDAsNC41MiwyLjE3LDIuMTcsMCwwLDEtMS44OCwxLDIuMzcsMi4zNywwLDAsMS0yLTEsMy43MiwzLjcyLDAsMCwxLS43NS0yLjM0QTMuNDksMy40OSwwLDAsMSwzMi4wOCwxMS4wN1ptNSw5LjQxYTIwLjYxLDIwLjYxLDAsMCwwLTMuNTQsMTIuMjgsMTcuMTUsMTcuMTUsMCwwLDAsNC4wNywxMSwxMi40MywxMi40MywwLDAsMCw5Ljg3LDQuNDUsMTUuMywxNS4zLDAsMCwwLDktMywxMywxMywwLDAsMCwuNi0zLjMycTAtMy4zMi0zLjE2LTMuMzFhOC41OCw4LjU4LDAsMCwwLTIsLjNxLTcuODMsMS41LTExLjU5LS4zLTQuNTMtMi4xMi00LjUyLTkuMzRBMzcuOTIsMzcuOTIsMCwwLDEsMzcuMDUsMjAuNDhaTTYxLjQ1LDE3QTEyLjg0LDEyLjg0LDAsMCwwLDUxLjIxLDEyLjJhMTUuMTEsMTUuMTEsMCwwLDAtNi40LDEuNDMsMTcuODMsMTcuODMsMCwwLDAtNS41LDRxLTYuMTgsMjAuNjQsNi4xOCwyMC42NEEyNC43NSwyNC43NSwwLDAsMCw0OSwzNy44MWEzOC45MiwzOC45MiwwLDAsMSw0LjgyLS40NmMxLjgxLDAsMy4wNi40NiwzLjc3LDEuMzZxMS4zNSwxLjUuNzUsNS4xMmEyMS43MiwyMS43MiwwLDAsMCw1LTcuMTVBMjEuMzgsMjEuMzgsMCwwLDAsNjUuMDcsMjgsMTcuNDQsMTcuNDQsMCwwLDAsNjEuNDUsMTdaTTQzLjYsNjUuMzdhMi43MiwyLjcyLDAsMCwwLTIuMS0uOSwzLDMsMCwwLDAtMi4xOS45LDMuMDYsMy4wNiwwLDAsMC0uOSwyLjI2djQuODJhMy4zMiwzLjMyLDAsMCwwLC45LDIuMzMsMi44NCwyLjg0LDAsMCwwLDIuMTksMSwyLjYxLDIuNjEsMCwwLDAsMi4xLTEsMy40NSwzLjQ1LDAsMCwwLC44My0yLjMzVjY3LjYzQTMuMTcsMy4xNywwLDAsMCw0My42LDY1LjM3Wm03LjQ2LDBhMywzLDAsMCwwLTIuMTgtLjksMi43MywyLjczLDAsMCwwLTIuMTEuOSwzLjE3LDMuMTcsMCwwLDAtLjgzLDIuMjZ2NC44MmEzLjQ1LDMuNDUsMCwwLDAsLjgzLDIuMzMsMi42MSwyLjYxLDAsMCwwLDIuMTEsMSwyLjgzLDIuODMsMCwwLDAsMi4xOC0xLDMuMzIsMy4zMiwwLDAsMCwuOS0yLjMzVjY3LjYzQTMuMDYsMy4wNiwwLDAsMCw1MS4wNiw2NS4zN1oiLz48L3N2Zz4='); | |
| 134 | + background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEgAAABbCAMAAADncTNAAAAAtFBMVEVHcEyAgIB/f3+xsbGgoaGBgYGCgoKKioqAgIC1tbW5ubnFx8iAgIDU1taBgYGCgoKAgIC0tLXW19jW2NiAgIC3uLiBgYHLzMy4uLhycnLW19d/f3/T1NW0tLTX19mVlZWvr6+BgYHl5eWKiottbW5JSUnW2Nm5ubnh4eHT1NWVlZVjY2N4eHh9fX6pqqq+v79PT0/39/fu7u7Nzc7Z2ttYWFgBAQHDw8P////JysoZGRk0NTZqJc/sAAAAIXRSTlMA0FL7/oEnEPL6eibivm9gwJya76/enFq2CXI+2lFAyM8GATmPAAADj0lEQVR4Xu2YaW/iOhSGAwRCWDosnXa6znjJvm8svf//f12TuARyhiR2pfnUR6gSEnr0+uT4xK7yRb755pvhHePli5K7Bfpkuhoq8ozRJdMH+WWha6Z3sqYparCSLRJqspjImVbANJU03cNMMpofAwQZCGsmpQYyFvVM0Q00OQ9koMl5IPcCoro+RA1Dt2Ea9n9eZ0+YHJLkgIlkDywQx00wCTyaReiKH8LbNU9ybJOdkchV6QFxyCFLbVvdfaREqgUWg/tx2UbqIcK2Hex2TdGLwFTjIj3XP3YfCZFsb23KRZn/3263oymSFI0/a5S4PqUBjoBIJBDjeEhCN0wxQSRybIxtJ3K5SGzuE/vAwIQc8ZmMMJFAIM4oikZItfEFtorGgoE43FObwqHU68OtPCnOz8KZ2Jbl5LgkSW0Tc7YyIz/EFWmS4jMbiZU5mJOmKRaJpKGGyLZtDJh3iyaNUu/3+xyKnrtFL71EG+FTiMpENhQtxUQ8kSOXCIr2tnCNhg/gTX0SHYFp0t7TCwQZ7U841yoHrW6rtGroUwTWVnLMssxx+H4bgZcSOFf5MYx0Ae8FghomMDyC2EBNImBywPkNTDNqGLQpIg2TjUNU8tBy9DQMo0DAZF16rAi7vJAtFTIYFAHUc6hIRW6OuOhJgaCSwmDEAYK4oa7ro+qIEyJU/US7KTJKPNSFT9tFgVFBu0SF1y7yjX4masRA9Da7EFGj28R/BkQz6xGIOurkx38T/bKs9Uk8aIiMwm/Jw0VP1yLrJwt13xAxvABBgsK4KWLov35DkRF7ZaqgzuZ7MQ8MOntmVYyAqKTwaICKqvSUFnVccMN5sziEP/5+xGDTahbH5Q3ZB76zr8fI+nJtvUUU3t3ml5GKviK/npCg3CGodnuJ4JVkfRFJYGVDBZrqKnn9RLf+CzDTS5PaN5J38+auzX4ykU4Qoj0rdKfcYs5ijfo9OL/uRUgZyQr7NCWtWwiUSLc4arfJa7lpszTA1OJZAQ8w8dXFrR5YHzCWSnS3pZ18tOi4Ps4vl/c7i/6qomjRecN+UubrPyPGn/VEMU3T0UFHkaPzpgjxmJsnjmrtionlMDZiog0TsY/DPtn8SXtlBvbtxKtwopy7lqW3smQO+yoGE1Uu55GJ3pmI8ygoejZNnqj0vnIRCyTKfLstRdtStGQi09myUsvwvlkuzSUXbV+Xz5ryBebV33fln/A/moud69FZiEYAAAAASUVORK5CYII='); | |
| 131 | 135 | background-repeat: no-repeat; |
| 132 | - background-position: 92% 50%; | |
| 133 | - background-size: 30px; | |
| 136 | + background-position: 2% 50%; | |
| 137 | + background-size: 25px; | |
| 138 | + padding-left: 39px; | |
| 134 | 139 | } |
| 135 | 140 | |
| 136 | 141 | #themeisle .inside { |
| 137 | 142 | padding: 0; |
| @@ -217,21 +222,23 @@ | ||
| 217 | 222 | ?> |
| 218 | 223 | <li class="ti-dw-feed-item"> |
| 219 | 224 | <a href=" |
| 220 | 225 | <?php |
| 221 | - echo add_query_arg( | |
| 222 | - array( | |
| 223 | - 'utm_source' => 'wpadmin', | |
| 224 | - 'utm_campaign' => 'feed', | |
| 225 | - 'utm_medium' => 'dashboard_widget', | |
| 226 | - ), | |
| 227 | - $item['link'] | |
| 226 | + echo esc_url( | |
| 227 | + add_query_arg( | |
| 228 | + array( | |
| 229 | + 'utm_source' => 'wpadmin', | |
| 230 | + 'utm_campaign' => 'feed', | |
| 231 | + 'utm_medium' => 'dashboard_widget', | |
| 232 | + ), | |
| 233 | + $item['link'] | |
| 234 | + ) | |
| 228 | 235 | ); |
| 229 | 236 | ?> |
| 230 | 237 | " target="_blank"> |
| 231 | 238 | <span class="ti-dw-date-container"><span |
| 232 | - class="ti-dw-day-container"><?php echo date( 'd', $item['date'] ); ?></span> <span | |
| 233 | - class="ti-dw-month-container"><?php echo substr( date( 'M', $item['date'] ), 0, 3 ); ?></span></span><?php echo $item['title']; ?> | |
| 239 | + class="ti-dw-day-container"><?php echo esc_attr( gmdate( 'd', $item['date'] ) ); ?></span> <span | |
| 240 | + class="ti-dw-month-container"><?php echo esc_attr( substr( gmdate( 'M', $item['date'] ), 0, 3 ) ); ?></span></span><?php echo esc_attr( $item['title'] ); ?> | |
| 234 | 241 | </a> |
| 235 | 242 | </li> |
| 236 | 243 | <?php |
| 237 | 244 | } |
| @@ -272,26 +279,30 @@ | ||
| 272 | 279 | } |
| 273 | 280 | ?> |
| 274 | 281 | <div class="ti-dw-footer"> |
| 275 | 282 | <span class="ti-dw-recommend-item "> |
| 276 | - <span class="ti-dw-recommend"><?php echo apply_filters( 'themeisle_sdk_dashboard_popular_label', sprintf( 'Popular %s', ucwords( $type ) ) ); ?> | |
| 283 | + <span class="ti-dw-recommend"><?php echo esc_attr( apply_filters( 'themeisle_sdk_dashboard_popular_label', sprintf( 'Popular %s', ucwords( $type ) ) ) ); ?> | |
| 277 | 284 | : </span> |
| 278 | 285 | <?php |
| 279 | - echo trim( | |
| 280 | - str_replace( | |
| 281 | - array( | |
| 282 | - 'lite', | |
| 283 | - 'Lite', | |
| 284 | - ), | |
| 285 | - '', | |
| 286 | - $recommend['name'] | |
| 286 | + echo esc_attr( | |
| 287 | + trim( | |
| 288 | + str_replace( | |
| 289 | + array( | |
| 290 | + 'lite', | |
| 291 | + 'Lite', | |
| 292 | + '(Lite)', | |
| 293 | + '(lite)', | |
| 294 | + ), | |
| 295 | + '', | |
| 296 | + $recommend['name'] | |
| 297 | + ) | |
| 287 | 298 | ) |
| 288 | 299 | ); |
| 289 | 300 | ?> |
| 290 | 301 | (<a class="thickbox open-plugin-details-modal" |
| 291 | - href="<?php echo $url . '&TB_iframe=true&width=600&height=500'; ?>"><?php echo apply_filters( 'themeisle_sdk_dashboard_install_label', 'Install' ); ?></a>) | |
| 302 | + href="<?php echo esc_url( $url . '&TB_iframe=true&width=600&height=500' ); ?>"><?php echo esc_attr( apply_filters( 'themeisle_sdk_dashboard_install_label', 'Install' ) ); ?></a>) | |
| 292 | 303 | </span> |
| 293 | - <span class="ti-dw-powered-by"><span><?php echo apply_filters( 'themeisle_sdk_dashboard_widget_powered_by', esc_attr( sprintf( 'Powered by %s', $this->product->get_friendly_name() ) ) ); ?></span></span> | |
| 304 | + <span class="ti-dw-powered-by"><span><?php echo esc_attr( apply_filters( 'themeisle_sdk_dashboard_widget_powered_by', sprintf( 'Powered by %s', $this->product->get_friendly_name() ) ) ); ?></span></span> | |
| 294 | 305 | </div> |
| 295 | 306 | |
| 296 | 307 | <?php |
| 297 | 308 | |
| @@ -300,11 +311,38 @@ | ||
| 300 | 311 | /** |
| 301 | 312 | * Setup feed items. |
| 302 | 313 | */ |
| 303 | 314 | private function setup_feeds() { |
| 304 | - if ( false === ( $items_normalized = get_transient( 'themeisle_sdk_feed_items' ) ) ) { | |
| 315 | + if ( false === ( $items_normalized = get_transient( 'themeisle_sdk_feed_items' ) ) ) { //phpcs:ignore Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure | |
| 316 | + // Do not force the feed for the items in the sdk feeds list. | |
| 317 | + // this prevents showing notices if another plugin will force all SimplePie feeds to load, instead it will | |
| 318 | + // use the regular SimplePie validation and abort early if the feed is not valid. | |
| 319 | + $sdk_feeds = $this->feeds; | |
| 320 | + add_action( | |
| 321 | + 'wp_feed_options', | |
| 322 | + function ( $feed, $url ) use ( $sdk_feeds ) { | |
| 323 | + if ( defined( 'TI_SDK_PHPUNIT' ) && true === TI_SDK_PHPUNIT ) { | |
| 324 | + return; | |
| 325 | + } | |
| 326 | + | |
| 327 | + if ( ! is_string( $url ) && in_array( $url, $sdk_feeds, true ) ) { | |
| 328 | + $feed->force_feed( false ); | |
| 329 | + return; | |
| 330 | + } | |
| 331 | + if ( is_array( $url ) ) { | |
| 332 | + foreach ( $url as $feed_url ) { | |
| 333 | + if ( in_array( $feed_url, $sdk_feeds, true ) ) { | |
| 334 | + $feed->force_feed( false ); | |
| 335 | + return; | |
| 336 | + } | |
| 337 | + } | |
| 338 | + } | |
| 339 | + }, | |
| 340 | + PHP_INT_MAX, | |
| 341 | + 2 | |
| 342 | + ); | |
| 305 | 343 | // Load SimplePie Instance. |
| 306 | - $feed = fetch_feed( $this->feeds ); | |
| 344 | + $feed = fetch_feed( $sdk_feeds ); | |
| 307 | 345 | // TODO report error when is an error loading the feed. |
| 308 | 346 | if ( is_wp_error( $feed ) ) { |
| 309 | 347 | return; |
| 310 | 348 | } |
| @@ -309,9 +347,13 @@ | ||
| 309 | 347 | return; |
| 310 | 348 | } |
| 311 | 349 | |
| 312 | 350 | $items = $feed->get_items( 0, 5 ); |
| 313 | - foreach ( (array) $items as $item ) { | |
| 351 | + $items = is_array( $items ) ? $items : []; | |
| 352 | + | |
| 353 | + $items_normalized = []; | |
| 354 | + | |
| 355 | + foreach ( $items as $item ) { | |
| 314 | 356 | $items_normalized[] = array( |
| 315 | 357 | 'title' => $item->get_title(), |
| 316 | 358 | 'date' => $item->get_date( 'U' ), |
| 317 | 359 | 'link' => $item->get_permalink(), |
| @@ -348,9 +390,9 @@ | ||
| 348 | 390 | |
| 349 | 391 | /** |
| 350 | 392 | * Contact the API and fetch the recommended plugins/themes |
| 351 | 393 | */ |
| 352 | - function recommend_plugin_or_theme() { | |
| 394 | + public function recommend_plugin_or_theme() { | |
| 353 | 395 | $products = $this->get_product_from_api(); |
| 354 | 396 | if ( ! is_array( $products ) ) { |
| 355 | 397 | $products = array(); |
| 356 | 398 | } |
| @@ -369,22 +411,29 @@ | ||
| 369 | 411 | * Fetch products from the recomended section. |
| 370 | 412 | * |
| 371 | 413 | * @return array|mixed The list of products to use in recomended section. |
| 372 | 414 | */ |
| 373 | - function get_product_from_api() { | |
| 374 | - if ( false === ( $products = get_transient( 'themeisle_sdk_products' ) ) ) { | |
| 375 | - $products = array(); | |
| 376 | - $themeisle_themes = $this->get_themes_from_wporg( 'themeisle' ); | |
| 377 | - $codeinwp_themes = $this->get_themes_from_wporg( 'codeinwp' ); | |
| 378 | - | |
| 379 | - $themeisle_plugins = $this->get_plugins_from_wporg( 'themeisle' ); | |
| 380 | - $codeinwp_plugins = $this->get_plugins_from_wporg( 'codeinwp' ); | |
| 381 | - | |
| 382 | - $all_themes = array_merge( $themeisle_themes, $codeinwp_themes ); | |
| 415 | + public function get_product_from_api() { | |
| 416 | + if ( false === ( $products = get_transient( 'themeisle_sdk_products' ) ) ) { //phpcs:ignore Squiz.PHP.DisallowMultipleAssignments.FoundInControlStructure | |
| 417 | + $products = array(); | |
| 418 | + $all_themes = $this->get_themes_from_wporg( 'themeisle' ); | |
| 419 | + $all_plugins = $this->get_plugins_from_wporg( 'themeisle' ); | |
| 420 | + static $allowed_products = [ | |
| 421 | + 'hestia' => true, | |
| 422 | + 'neve' => true, | |
| 423 | + 'visualizer' => true, | |
| 424 | + 'feedzy-rss-feeds' => true, | |
| 425 | + 'wp-product-review' => true, | |
| 426 | + 'otter-blocks' => true, | |
| 427 | + 'themeisle-companion' => true, | |
| 428 | + ]; | |
| 383 | 429 | foreach ( $all_themes as $theme ) { |
| 384 | 430 | if ( $theme->active_installs < 4999 ) { |
| 385 | 431 | continue; |
| 386 | 432 | } |
| 433 | + if ( ! isset( $allowed_products[ $theme->slug ] ) ) { | |
| 434 | + continue; | |
| 435 | + } | |
| 387 | 436 | $products[] = array( |
| 388 | 437 | 'name' => $theme->name, |
| 389 | 438 | 'type' => 'theme', |
| 390 | 439 | 'slug' => $theme->slug, |
| @@ -390,13 +439,15 @@ | ||
| 390 | 439 | 'slug' => $theme->slug, |
| 391 | 440 | 'installs' => $theme->active_installs, |
| 392 | 441 | ); |
| 393 | 442 | } |
| 394 | - $all_plugins = array_merge( $themeisle_plugins, $codeinwp_plugins ); | |
| 395 | 443 | foreach ( $all_plugins as $plugin ) { |
| 396 | 444 | if ( $plugin->active_installs < 4999 ) { |
| 397 | 445 | continue; |
| 398 | 446 | } |
| 447 | + if ( ! isset( $allowed_products[ $plugin->slug ] ) ) { | |
| 448 | + continue; | |
| 449 | + } | |
| 399 | 450 | $products[] = array( |
| 400 | 451 | 'name' => $plugin->name, |
| 401 | 452 | 'type' => 'plugin', |
| 402 | 453 | 'slug' => $plugin->slug, |
| @@ -415,10 +466,10 @@ | ||
| 415 | 466 | * @param string $author The author name. |
| 416 | 467 | * |
| 417 | 468 | * @return array The list of themes. |
| 418 | 469 | */ |
| 419 | - function get_themes_from_wporg( $author ) { | |
| 420 | - $products = wp_remote_get( | |
| 470 | + public function get_themes_from_wporg( $author ) { | |
| 471 | + $products = $this->safe_get( | |
| 421 | 472 | 'https://api.wordpress.org/themes/info/1.1/?action=query_themes&request[author]=' . $author . '&request[per_page]=30&request[fields][active_installs]=true' |
| 422 | 473 | ); |
| 423 | 474 | $products = json_decode( wp_remote_retrieve_body( $products ) ); |
| 424 | 475 | if ( is_object( $products ) ) { |
| @@ -436,11 +487,11 @@ | ||
| 436 | 487 | * @param string $author The author slug. |
| 437 | 488 | * |
| 438 | 489 | * @return array The list of plugins for the selected author. |
| 439 | 490 | */ |
| 440 | - function get_plugins_from_wporg( $author ) { | |
| 441 | - $products = wp_remote_get( | |
| 442 | - 'https://api.wordpress.org/plugins/info/1.1/?action=query_plugins&request[author]=' . $author . '&request[per_page]=20&request[fields][active_installs]=true' | |
| 491 | + public function get_plugins_from_wporg( $author ) { | |
| 492 | + $products = $this->safe_get( | |
| 493 | + 'https://api.wordpress.org/plugins/info/1.1/?action=query_plugins&request[author]=' . $author . '&request[per_page]=40&request[fields][active_installs]=true' | |
| 443 | 494 | ); |
| 444 | 495 | $products = json_decode( wp_remote_retrieve_body( $products ) ); |
| 445 | 496 | if ( is_object( $products ) ) { |
| 446 | 497 | $products = isset( $products->plugins ) ? $products->plugins : array(); |