Changeset 2740850

Timestamp:

06/11/2022 01:41:57 PM (4 years ago)

Author:

shapedplugin

Message:

Fix the issues were left

Location:

easy-accordion-free/trunk

Files:

• admin/GutenbergBlock/class-easy-accordion-free-gutenberg-block-init.php (modified) (1 diff)
• admin/css/modal-video.min.css (modified) (1 diff)
• admin/views/models/fields/upgrade/upgrade.php (modified) (1 diff)
• admin/views/premium.php (modified) (5 diffs)
• public/views/class-easy-accordion-free-shortcode.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

easy-accordion-free/trunk/admin/GutenbergBlock/class-easy-accordion-free-gutenberg-block-init.php

@@ -171 +171 @@
 
             if ( ! $attributes['is_admin'] ) {
-                ob_start();
                 return '<div ' . $class_name . '>' . do_shortcode( '[sp_easyaccordion id="' . sanitize_text_field( $attributes['shortcode'] ) . '"]' ) . '</div>';
             }

easy-accordion-free/trunk/admin/css/modal-video.min.css

@@ -1 @@
-@keyframes modal-video{from{opacity:0}to{opacity:1}}@keyframes modal-video-inner{from{transform:translate(0, 100px)}to{transform:translate(0, 0)}}.modal-video{position:fixed;top:0;left:auto;right:0;width: calc(100% - 160px);height:100%;background-color:rgba(0,0,0,0.5);z-index:1000000;cursor:pointer;opacity:1;animation-timing-function:ease-out;animation-duration:.3s;animation-name:modal-video;-webkit-transition:opacity .3s ease-out;-moz-transition:opacity .3s ease-out;-ms-transition:opacity .3s ease-out;-o-transition:opacity .3s ease-out;transition:opacity .3s ease-out}.modal-video-close{opacity:0}.modal-video-close .modal-video-movie-wrap{-webkit-transform:translate(0, 100px);-moz-transform:translate(0, 100px);-ms-transform:translate(0, 100px);-o-transform:translate(0, 100px);transform:translate(0, 100px)}.modal-video-body{max-width:1800px;width:100%;height:100%;margin:0 auto; box-sizing: border-box; display: table; padding: 10%;}.modal-video-inner{display:table-cell;vertical-align:middle;width:100%;height:100%}.modal-video-movie-wrap{width:100%;height:0;position:relative;padding-bottom:56.25%;background-color:#333;animation-timing-function:ease-out;animation-duration:.3s;animation-name:modal-video-inner;-webkit-transform:translate(0, 0);-moz-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-ms-transition:-ms-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal-video-movie-wrap iframe{position:absolute;top:0;left:0;width:100%;height:100%}.modal-video-close-btn{position:absolute;z-index:2;top:-35px;right:-35px;display:inline-block;width:35px;height:35px;overflow:hidden;border:none;background:transparent;cursor: pointer}.modal-video-close-btn:before{transform:rotate(45deg)}.modal-video-close-btn:after{transform:rotate(-45deg)}.modal-video-close-btn:before,.modal-video-close-btn:after{content:'';position:absolute;height:2px;width:100%;top:50%;left:0;margin-top:-1px;background:#fff;border-radius:5px;margin-top:-6px}.modal-video *:focus{outline:0;}@media screen and (max-width: 996px){.modal-video{width: calc(100% - 36px);}}@media screen and (max-width: 782px){.modal-video {width:100%;}}
+@keyframes modal-video{from{opacity:0}to{opacity:1}}@keyframes modal-video-inner{from{transform:translate(0, 100px)}to{transform:translate(0, 0)}}.modal-video{position:fixed;top:0;left:auto;right:0;width: calc(100% - 160px);height:100%;background-color:rgba(0,0,0,0.5);z-index:1000000;cursor:pointer;opacity:1;animation-timing-function:ease-out;animation-duration:.3s;animation-name:modal-video;-webkit-transition:opacity .3s ease-out;-moz-transition:opacity .3s ease-out;-ms-transition:opacity .3s ease-out;-o-transition:opacity .3s ease-out;transition:opacity .3s ease-out}.modal-video-close{opacity:0}.modal-video-close .modal-video-movie-wrap{-webkit-transform:translate(0, 100px);-moz-transform:translate(0, 100px);-ms-transform:translate(0, 100px);-o-transform:translate(0, 100px);transform:translate(0, 100px)}.modal-video-body{max-width:1800px;width:100%;height:100%;margin:0 auto; box-sizing: border-box; display: table; padding: 5% 10%;}.modal-video-inner{display:table-cell;vertical-align:middle;width:100%;height:100%}.modal-video-movie-wrap{width:100%;height:0;position:relative;padding-bottom:56.25%;background-color:#333;animation-timing-function:ease-out;animation-duration:.3s;animation-name:modal-video-inner;-webkit-transform:translate(0, 0);-moz-transform:translate(0, 0);-ms-transform:translate(0, 0);-o-transform:translate(0, 0);transform:translate(0, 0);-webkit-transition:-webkit-transform .3s ease-out;-moz-transition:-moz-transform .3s ease-out;-ms-transition:-ms-transform .3s ease-out;-o-transition:-o-transform .3s ease-out;transition:transform .3s ease-out}.modal-video-movie-wrap iframe{position:absolute;top:0;left:0;width:100%;height:100%}.modal-video-close-btn{position:absolute;z-index:2;top:-35px;right:-35px;display:inline-block;width:35px;height:35px;overflow:hidden;border:none;background:transparent;cursor: pointer}.modal-video-close-btn:before{transform:rotate(45deg)}.modal-video-close-btn:after{transform:rotate(-45deg)}.modal-video-close-btn:before,.modal-video-close-btn:after{content:'';position:absolute;height:2px;width:100%;top:50%;left:0;margin-top:-1px;background:#fff;border-radius:5px;margin-top:-6px}.modal-video *:focus{outline:0;}@media screen and (max-width: 996px){.modal-video{width: calc(100% - 36px);}}@media screen and (max-width: 782px){.modal-video {width:100%;}}

easy-accordion-free/trunk/admin/views/models/fields/upgrade/upgrade.php

@@ -47 +47 @@
             $premium_page = new Easy_Accordion_Premium( SP_PLUGIN_NAME, SP_EA_VERSION );
             $plugin_data  = $premium_page->happy_users();
-            $plugin_names = array_values( $plugin_data['plugins'] );
+            $plugin_names = isset( $plugin_data['plugins'] ) ? array_values( $plugin_data['plugins'] ) : array();
             $install      = 0;
-            foreach ( $plugin_names as &$plugin_name ) {
-                $install += $plugin_name['installs'];
+            if ( $plugin_names ) {
+                foreach ( $plugin_names as &$plugin_name ) {
+                    $install += $plugin_name['installs'];
+                }
+            } else {
+                $install = 227000;
             }
 

easy-accordion-free/trunk/admin/views/premium.php

@@ -73 +73 @@
             );
 
-            $raw = wp_remote_retrieve_body( wp_remote_get( 'http://wptally.com/api/' . $username, $params ) );
+            $raw = wp_remote_retrieve_body( wp_remote_get( 'https://wptally.com/api/' . $username, $params ) );
             $raw = json_decode( $raw, true );
-
             if ( is_array( $raw ) && array_key_exists( 'error', $raw ) ) {
                 $data = array(
@@ -133 +132 @@
                     <div class="count-item">
                         <h3 class="sp-eap-font-24">
-                    <?php
-                    $plugin_data  = $this->happy_users();
-                    $plugin_names = array();
-                    if ( is_array( $plugin_data ) && ! array_key_exists( 'error', $plugin_data ) ) {
-                        $plugin_names         = array_values( $plugin_data['plugins'] );
-                        $active_installations = array_column( $plugin_names, 'installs', 'url' );
-                        echo esc_attr( $active_installations['http://wordpress.org/plugins/easy-accordion-free'] ) . '+';
-                    }
-                    ?>
+                        <?php
+                        $plugin_data  = $this->happy_users();
+                        if ( isset( $plugin_data['plugins'] ) ) {
+                            $plugin_names         = array_values( $plugin_data['plugins'] );
+                            $active_installations = array_column( $plugin_names, 'installs', 'url' );
+                            echo esc_attr( $active_installations['http://wordpress.org/plugins/easy-accordion-free'] ) . '+';
+                        } else {
+                            echo '30000+';
+                        }
+                        ?>
                         </h3>
                         <span class="sp-eap-font-weight-400">Active Installations</span>
@@ -148 +148 @@
                         <h3 class="sp-eap-font-24">
                         <?php
-
-                        if ( ! empty( $plugin_names ) ) {
+                        if ( isset( $plugin_data['plugins'] ) ) {
                             $active_downloads = array_column( $plugin_names, 'downloads', 'url' );
                             echo esc_attr( $active_downloads['http://wordpress.org/plugins/easy-accordion-free'] );
+                        } else {
+                            echo '356559';
                         }
                         ?>
@@ -160 +161 @@
                         <h3 class="sp-eap-font-24">
                         <?php
-                        if ( ! empty( $plugin_names ) ) {
+                        if ( isset( $plugin_data['plugins'] ) ) {
                             $active_ratings = array_column( $plugin_names, 'rating', 'url' );
                             echo esc_attr( $active_ratings['http://wordpress.org/plugins/easy-accordion-free'] ) . '/5';
+                        } else {
+                            echo '4.8/5';
                         }
                         ?>
@@ -359 +362 @@
                             <h2 class="sp-eap-font-28">
                             Join 
-                        <?php
-                        $install = 0;
-                        foreach ( $plugin_names as &$plugin_name ) {
-                            $install += $plugin_name['installs'];
-                        }
-                        echo esc_attr( $install + '15000' ) . '+';
-                        ?>
+                            <?php
+                            $install = 0;
+                            if ( isset( $plugin_data['plugins'] ) ) {
+                                foreach ( $plugin_names as &$plugin_name ) {
+                                    $install += $plugin_name['installs'];
+                                }
+                                echo esc_attr( $install + '15000' ) . '+';
+                            } else {
+                                echo '242000+';
+                            }
+                            ?>
                             Happy Users in 160+ Countries
                             </h2>

easy-accordion-free/trunk/public/views/class-easy-accordion-free-shortcode.php

@@ -142 +142 @@
         ob_start();
         include SP_EA_PATH . '/public/views/templates/default-accordion.php';
-        $html = ob_get_contents();
-        return apply_filters( 'sp_easy_accordion', $html, $post_id );
+        $html = ob_get_clean();
+        echo apply_filters( 'sp_easy_accordion', $html, $post_id ); // phpcs:ignore
     }
 
@@ -164 +164 @@
         $shortcode_data     = get_post_meta( $post_id, 'sp_eap_shortcode_options', true );
         $main_section_title = get_the_title( $post_id );
+        ob_start();
         self::sp_eap_html_show( $post_id, $upload_data, $shortcode_data, $main_section_title );
         return ob_get_clean();

easy-accordion-free/trunk/readme.txt

@@ -264 +264 @@
 * Fix: The accordion section goes above the header section rarely.
 * Fix: The premium page warnings.
-* Fix: The popup video position in the premium page.
+* Fix: The popup video position on the premium page.
 
 = 2.1.14 - May 23, 2022 =