Changeset 3172446

Timestamp:

10/20/2024 06:16:37 PM (15 months ago)

Author:

rickey29

Message:

4.1.0

Location:

hyper-pwa/trunk

Files:

• admin/admin.php (modified) (10 diffs)
• cfg/cfg.php (modified) (1 diff)
• fallback/manifest.php (modified) (6 diffs)
• flx/flx.php (modified) (1 diff)
• hyper-pwa.php (modified) (9 diffs)
• readme.txt (modified) (2 diffs)

hyper-pwa/trunk/admin/admin.php

@@ -167 +167 @@
     private function get_tab()
     {
-        $tab = ! empty( $_GET[ 'tab' ] ) ? $_GET[ 'tab' ] : '';
+        $tab = ! empty( $_GET['tab'] ) ? sanitize_text_field( wp_unslash( $_GET['tab'] ) ) : '';
         if ( 'manifest' === $tab || 'service-worker' === $tab || 'a2hs' === $tab || 'faq' === $tab || 'subscription' === $tab
             || 'custom-dev' === $tab || 'contact-us' === $tab )
@@ -175 +175 @@
             return $tab;
         }
-        elseif ( empty( $tab ) && ! empty( $_COOKIE[ 'hyper-pwa-admin-tab' ] ) )
-        {
-            return $_COOKIE[ 'hyper-pwa-admin-tab' ];
+        elseif ( empty( $tab ) && ! empty( $_COOKIE['hyper-pwa-admin-tab'] ) )
+        {
+            return sanitize_text_field( wp_unslash( $_COOKIE['hyper-pwa-admin-tab'] ) );
         }
         else
@@ -422 +422 @@
     <h2>Hyper PWA Settings</h2>';
 
-        if ( ! empty( $_GET[ 'settings-updated' ] ) )
+        if ( ! empty( $_GET['settings-updated'] ) )
         {
             update_option( HYPER_PWA_TRANSIENT_TIMESTAMP, $this->current_timestamp );
@@ -441 +441 @@
         {
             echo '
-        <a href="?page=hyper-pwa&tab=' . $key . '" class="nav-tab' . ( ( $key === $this->tab ) ? ' nav-tab-active' : '' ) . '">' . $value . '</a>';
+        <a href="?page=hyper-pwa&tab=' . esc_attr( $key ) . '" class="nav-tab' . ( ( $key === $this->tab ) ? ' nav-tab-active' : '' ) . '">' . esc_html( $value ) . '</a>';
         }
 
@@ -504 +504 @@
     public function field_callback( $args )
     {
-        $value = get_option( $args[ 'uid' ] );
+        $value = get_option( $args['uid'] );
         if ( empty( $value ) )
         {
-            $value = isset( $args[ 'default' ] ) ? $args[ 'default' ] : '';
-        }
-
-        if ( ! isset( $args[ 'placeholder' ] ) )
-        {
-            $args[ 'placeholder' ] = '';
-        }
-
-        switch ( $args[ 'type' ] )
+            $value = isset( $args['default'] ) ? $args['default'] : '';
+        }
+
+        if ( ! isset( $args['placeholder'] ) )
+        {
+            $args['placeholder'] = '';
+        }
+
+        switch ( $args['type'] )
         {
             case 'text':
             case 'password':
             case 'number':
-                printf( '<input name="%1$s" id="%1$s" type="%2$s" placeholder="%3$s" value="%4$s" size="64" />', $args[ 'uid' ], $args[ 'type' ], $args[ 'placeholder' ], $value );
+                printf( '<input name="%1$s" id="%1$s" type="%2$s" placeholder="%3$s" value="%4$s" size="64" />', esc_attr( $args['uid'] ), esc_attr( $args['type'] ), esc_attr( $args['placeholder'] ), esc_attr( $value ) );
                 break;
 
             case 'textarea':
-                printf( '<textarea name="%1$s" id="%1$s" placeholder="%2$s" rows="4" cols="64">%3$s</textarea>', $args[ 'uid' ], $args[ 'placeholder' ], $value );
+                printf( '<textarea name="%1$s" id="%1$s" placeholder="%2$s" rows="4" cols="64">%3$s</textarea>', esc_attr( $args['uid'] ), esc_attr( $args['placeholder'] ), esc_textarea( $value ) );
                 break;
 
             case 'select':
             case 'multiselect':
-                if ( ! empty( $args[ 'options' ] ) && is_array( $args[ 'options' ] ) )
+                if ( ! empty( $args['options'] ) && is_array( $args['options'] ) )
                 {
                     $options_markup = '';
-                    foreach ( $args[ 'options' ] as $key => $label )
+                    foreach ( $args['options'] as $key => $label )
                     {
                         if ( ! empty( $value ) )
@@ -545 +545 @@
 
                     $attributes = '';
-                    if ( 'multiselect' === $args[ 'type' ] )
+                    if ( 'multiselect' === $args['type'] )
                     {
                         $attributes = ' multiple="multiple" ';
                     }
 
-                    printf( '<select name="%1$s[]" id="%1$s" %2$s>%3$s</select>', $args[ 'uid' ], $attributes, $options_markup );
+                    printf( '<select name="%1$s[]" id="%1$s" %2$s>%3$s</select>', esc_attr( $args['uid'] ), esc_attr( $attributes ), wp_kses_post( $options_markup ) );
                 }
                 break;
@@ -556 +556 @@
             case 'radio':
             case 'checkbox':
-                if ( ! empty( $args[ 'options' ] ) && is_array( $args[ 'options' ] ) )
+                if ( ! empty( $args['options'] ) && is_array( $args['options'] ) )
                 {
                     $options_markup = '';
                     $iterator = 0;
-                    foreach ( $args[ 'options' ] as $key => $label )
+                    foreach ( $args['options'] as $key => $label )
                     {
                         $iterator++;
                         if ( ! empty( $value ) )
                         {
-                            $options_markup .= sprintf( '<input id="%1$s_%6$s" name="%1$s[]" type="%2$s" value="%3$s" %4$s /><label for="%1$s_%6$s"> %5$s</label><br>', $args[ 'uid' ], $args[ 'type' ], $key, checked( $value[ array_search( $key, $value, TRUE ) ], $key, FALSE ), $label, $iterator );
+                            $options_markup .= sprintf( '<input id="%1$s_%6$s" name="%1$s[]" type="%2$s" value="%3$s" %4$s /><label for="%1$s_%6$s"> %5$s</label><br>', esc_attr( $args['uid'] ), esc_attr( $args['type'] ), esc_attr( $key ), checked( $value[ array_search( $key, $value, TRUE ) ], $key, FALSE ), esc_html( $label ), esc_attr( $iterator ) );
                         }
                         else
                         {
-                            $options_markup .= sprintf( '<input id="%1$s_%5$s" name="%1$s[]" type="%2$s" value="%3$s" /><label for="%1$s_%5$s"> %4$s</label><br>', $args[ 'uid' ], $args[ 'type' ], $key, $label, $iterator );
+                            $options_markup .= sprintf( '<input id="%1$s_%5$s" name="%1$s[]" type="%2$s" value="%3$s" /><label for="%1$s_%5$s"> %4$s</label><br>', esc_attr( $args['uid'] ), esc_attr( $args['type'] ), esc_attr( $key ), esc_html( $label ), esc_attr( $iterator ) );
                         }
                     }
 
-                    printf( '<fieldset>%s</fieldset>', $options_markup );
+                    printf( '<fieldset>%s</fieldset>', wp_kses_post( $options_markup ) );
                 }
                 break;
 
             case 'media-uploader':
-                printf( '<input id="%1$s" type="text" name="%1$s" value="%2$s" placeholder="%3$s" size="64" /> <input id="%4$s" type="button" class="button-primary" value="Choose Image" />', $args[ 'uid' ], $value, $args[ 'placeholder' ], $args[ 'button' ] );
+                printf( '<input id="%1$s" type="text" name="%1$s" value="%2$s" placeholder="%3$s" size="64" /> <input id="%4$s" type="button" class="button-primary" value="Choose Image" />', esc_attr( $args['uid'] ), esc_attr( $value ), esc_attr( $args['placeholder'] ), esc_attr( $args['button'] ) );
                 break;
 
             case 'color-picker':
-                printf( '<input id="%1$s" type="text" name="%1$s" value="%2$s" class="hyper-pwa-color-picker" data-default-color="#ffffff" />', $args[ 'uid' ], $value );
+                printf( '<input id="%1$s" type="text" name="%1$s" value="%2$s" class="hyper-pwa-color-picker" data-default-color="#ffffff" />', esc_attr( $args['uid'] ), esc_attr( $value ) );
                 break;
         }
 
-        if ( ! empty( $args[ 'helper' ] ) )
-        {
-            $helper = $args[ 'helper' ];
-            printf( '<span class="helper">%s</span>', $helper );
-        }
-
-        if ( ! empty( $args[ 'supplimental' ] ) )
-        {
-            $supplimental = $args[ 'supplimental' ];
-            printf( '<p class="description">%s</p>', $supplimental );
+        if ( ! empty( $args['helper'] ) )
+        {
+            $helper = $args['helper'];
+            printf( '<span class="helper">%s</span>', esc_html( $helper ) );
+        }
+
+        if ( ! empty( $args['supplimental'] ) )
+        {
+            $supplimental = $args['supplimental'];
+            printf( '<p class="description">%s</p>', esc_html( $supplimental ) );
         }
     }
@@ -608 +608 @@
         foreach ( $this->fields as $field )
         {
-            if ( empty( $field[ 'tab' ] ) || $this->tab !== $field[ 'tab' ] )
+            if ( empty( $field['tab'] ) || $this->tab !== $field['tab'] )
             {
                 continue;
             }
-            $tab = $field[ 'tab' ];
-
-            if ( empty( $field[ 'uid' ] ) )
+            $tab = $field['tab'];
+
+            if ( empty( $field['uid'] ) )
             {
                 continue;
             }
-            $uid = $field[ 'uid' ];
-
-            if ( empty( $field[ 'label' ] ) )
+            $uid = $field['uid'];
+
+            if ( empty( $field['label'] ) )
             {
                 continue;
             }
-            $label = $field[ 'label' ];
-
-            if ( empty( $field[ 'section' ] ) )
+            $label = $field['label'];
+
+            if ( empty( $field['section'] ) )
             {
                 continue;
             }
-            $section = $field[ 'section' ];
+            $section = $field['section'];
 
             $title = ! empty( $this->sections[$section] ) ? $this->sections[$section] : '';
@@ -648 +648 @@
 
 
-if ( 'admin-ajax.php' === $GLOBALS[ 'pagenow' ] || 'wp-activate.php' === $GLOBALS[ 'pagenow' ] || 'wp-cron.php' === $GLOBALS[ 'pagenow' ] ||
-    'wp-signup.php' === $GLOBALS[ 'pagenow' ] )
+if ( 'admin-ajax.php' === $GLOBALS['pagenow'] || 'wp-activate.php' === $GLOBALS['pagenow'] || 'wp-cron.php' === $GLOBALS['pagenow'] || 'wp-signup.php' === $GLOBALS['pagenow'] )
 {
     return;
 }
-elseif ( 'wp-login.php' === $GLOBALS[ 'pagenow' ] )
+elseif ( 'wp-login.php' === $GLOBALS['pagenow'] )
 {
-    if ( ! empty( $_COOKIE[ 'hyper-pwa-admin-tab' ] ) )
+    if ( ! empty( $_COOKIE['hyper-pwa-admin-tab'] ) )
     {
         $current_timestamp = time();
@@ -668 +667 @@
 }
 
-$HYPER_PWA_admin = new HyperPWAAdmin();
-
-add_action( 'admin_menu', [ $HYPER_PWA_admin, 'add_menu' ] );
-add_action( 'admin_init', [ $HYPER_PWA_admin, 'register_settings' ] );
+$hyper_pwa_admin = new HyperPWAAdmin();
+
+add_action( 'admin_menu', [ $hyper_pwa_admin, 'add_menu' ] );
+add_action( 'admin_init', [ $hyper_pwa_admin, 'register_settings' ] );

hyper-pwa/trunk/cfg/cfg.php

@@ -5 +5 @@
 }
 
-define( 'HYPER_PWA_VERSION', '4.0.0' );
+define( 'HYPER_PWA_VERSION', '4.1.0' );
 
 define( 'HYPER_PWA_TRANSIENT_SCHEDULE_RECURRENCE', HOUR_IN_SECONDS );

hyper-pwa/trunk/fallback/manifest.php

@@ -62 +62 @@
   "icons": [
     {
-      "src": "' . $this->host_dir . $icons[ 'icon_192' ] . '",
+      "src": "' . $this->host_dir . $icons['icon_192'] . '",
       "sizes": "192x192",
       "type": "image/png",
@@ -68 +68 @@
     },
     {
-      "src": "' . $this->host_dir . $icons[ 'icon_512' ] . '",
+      "src": "' . $this->host_dir . $icons['icon_512'] . '",
       "sizes": "512x512",
       "type": "image/png",
@@ -74 +74 @@
     },
     {
-      "src": "' . $this->host_dir . $icons[ 'maskable_icon_192' ] . '",
+      "src": "' . $this->host_dir . $icons['maskable_icon_192'] . '",
       "sizes": "192x192",
       "type": "image/png",
@@ -80 +80 @@
     },
     {
-      "src": "' . $this->host_dir . $icons[ 'maskable_icon_512' ] . '",
+      "src": "' . $this->host_dir . $icons['maskable_icon_512'] . '",
       "sizes": "512x512",
       "type": "image/png",
@@ -91 +91 @@
   "screenshots": [
     {
-      "src": "' . $this->host_dir . $screenshots[ 'wide' ] . '",
+      "src": "' . $this->host_dir . $screenshots['wide'] . '",
       "sizes": "512x384",
       "type": "image/gif",
@@ -98 +98 @@
     },
     {
-      "src": "' . $this->host_dir . $screenshots[ 'narrow' ] . '",
+      "src": "' . $this->host_dir . $screenshots['narrow'] . '",
       "sizes": "384x512",
       "type": "image/gif",

hyper-pwa/trunk/flx/flx.php

@@ -33 +33 @@
         $list = [];
 
-        $num = rand( 1, 6 );
+        $num = wp_rand( 1, 6 );
         if ( 1 === $num )
         {

hyper-pwa/trunk/hyper-pwa.php

@@ -4 +4 @@
 Plugin URI:  https://wordpress.org/plugins/hyper-pwa/
 Description: Provide Manifest and Service Worker, convert WordPress into Progressive Web Apps (PWA).
-Version:     4.0.0
+Version:     4.1.0
 Author:      Rickey Gu
 Author URI:  https://flexplat.com
@@ -20 +20 @@
 define( 'HYPER_PWA_PATH', plugin_dir_path( __FILE__ ) );
 
+include_once ABSPATH . 'wp-admin/includes/plugin.php';
+
 require_once HYPER_PWA_PATH . 'cfg/cfg.php';
 require_once HYPER_PWA_PATH . 'lib/transient.php';
@@ -47 +49 @@
         $this->base_pattern = str_replace( [ '/', '.' ], [ '\/', '\.' ], $this->home_url );
 
-        $parts = parse_url( $this->home_url );
-        $this->page_url = $parts[ 'scheme' ] . '://' . $parts[ 'host' ] . add_query_arg( [] );
+        $parts = wp_parse_url( $this->home_url );
+        $this->page_url = $parts['scheme'] . '://' . $parts['host'] . add_query_arg( [] );
 
         $this->current_timestamp = time();
@@ -249 +251 @@
         }
 
-        $icon_192 = '/wp-content/plugins/hyper-pwa/img/icon-192.png';
+        $icons = $this->option->get_icons();
         $install_button = $this->option->get_install_button();
         $popup_messages = $this->option->get_popup_messages();
 
-        $settings = $this->retrieve->get_settings();
-        if ( ! empty( $settings[ 'premium' ] ) && 'enable' === $settings[ 'premium' ] )
-        {
-            $icons = $this->option->get_icons();
-            $icon_192 = $icons['icon_192'];
-        }
-
         $footer = '<div id="hyper-pwa-notification-bar" class="hyper-pwa-hidden hyper-pwa-notification-bar" style="display:flex;">
     <div>
-        <img class="hyper-pwa-icon" src="' . $this->home_url . $icon_192 . '" width="48" height="48">
+        <img class="hyper-pwa-icon" src="' . $this->home_url . $icons['icon_192'] . '" width="48" height="48">
     </div>
     <div style="flex:1;">
@@ -280 +275 @@
 <div id="hyper-pwa-popup-window-ios-safari" class="hyper-pwa-popup-window">
     <div id="hyper-pwa-popup-text-ios-safari" class="hyper-pwa-popup-text">
-        ' . $popup_messages[ 'ios_safari' ] . '
+        ' . $popup_messages['ios_safari'] . '
         <svg width="24px" height="24px" style="vertical-align: bottom;" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" enable-background="new 0 0 50 50">
             <path fill="dodgerblue" d="M30.3 13.7L25 8.4l-5.3 5.3-1.4-1.4L25 5.6l6.7 6.7z"/>
@@ -286 +281 @@
             <path fill="dodgerblue" d="M35 40H15c-1.7 0-3-1.3-3-3V19c0-1.7 1.3-3 3-3h7v2h-7c-.6 0-1 .4-1 1v18c0 .6.4 1 1 1h20c.6 0 1-.4 1-1V19c0-.6-.4-1-1-1h-7v-2h7c1.7 0 3 1.3 3 3v18c0 1.7-1.3 3-3 3z"/>
         </svg>
-        ' . $popup_messages[ 'ios_safari_2' ] . '
+        ' . $popup_messages['ios_safari_2'] . '
     </div>
 </div>
 <div id="hyper-pwa-popup-window-ios-chrome" class="hyper-pwa-popup-window">
     <div id="hyper-pwa-popup-text-ios-chrome" class="hyper-pwa-popup-text">
-        ' . $popup_messages[ 'ios_chrome' ] . '
+        ' . $popup_messages['ios_chrome'] . '
     </div>
 </div>' . "\n";
@@ -317 +312 @@
         $url = esc_url( $url );
 
-        $link = '<a href="' . $url . '">' . __( 'Settings' ) . '</a>';
+        $link = '<a href="' . $url . '">' . __( 'Settings', 'hyper-pwa' ) . '</a>';
         array_push( $links, $link );
 
@@ -332 +327 @@
 
         setcookie( 'hyper-pwa-admin-tab', '', $this->current_timestamp - 1, COOKIEPATH, COOKIE_DOMAIN );
-        setcookie( 'hyper-pwa-disable-a2hs', '', $this->current_timestamp - 1, COOKIEPATH, COOKIE_DOMAIN );
+        setcookie( 'hyper-pwa-a2hs-disable', '', $this->current_timestamp - 1, COOKIEPATH, COOKIE_DOMAIN );
     }
 
@@ -343 +338 @@
 
         setcookie( 'hyper-pwa-admin-tab', '', $this->current_timestamp - 1, COOKIEPATH, COOKIE_DOMAIN );
-        setcookie( 'hyper-pwa-disable-a2hs', '', $this->current_timestamp - 1, COOKIEPATH, COOKIE_DOMAIN );
-    }
-}
-
+        setcookie( 'hyper-pwa-a2hs-disable', '', $this->current_timestamp - 1, COOKIEPATH, COOKIE_DOMAIN );
+    }
+}
+
+
+if ( is_plugin_active( 'flx-woo/flx-woo.php' ) )
+{
+    return;
+}
 
 include_once HYPER_PWA_PATH . 'admin/admin.php';
 
-if ( 'admin-ajax.php' === $GLOBALS[ 'pagenow' ] || 'wp-activate.php' === $GLOBALS[ 'pagenow' ] ||
-    'wp-cron.php' === $GLOBALS[ 'pagenow' ] || 'wp-login.php' === $GLOBALS[ 'pagenow' ] ||
-    'wp-signup.php' === $GLOBALS[ 'pagenow' ] )
+if ( 'admin-ajax.php' === $GLOBALS['pagenow'] || 'wp-activate.php' === $GLOBALS['pagenow'] || 'wp-cron.php' === $GLOBALS['pagenow'] || 'wp-login.php' === $GLOBALS['pagenow'] || 'wp-signup.php' === $GLOBALS['pagenow'] )
 {
     return;

hyper-pwa/trunk/readme.txt

@@ -4 +4 @@
 Tags: progressive web apps, pwa, add to home screen, a2hs, offline
 Requires at least: 5.1
-Tested up to: 6.6.1
+Tested up to: 6.6.2
 Requires PHP: 7.2
-Stable tag: 4.0.0
+Stable tag: 4.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -63 +63 @@
 == Changelog ==
 
+= 4.1.0
+(Sun., Oct. 20, 2024)
+* Improve according to Plugin Check
+
 = 4.0.0
 (Sun., Aug. 25, 2024)