Changeset 2266393

Timestamp:

03/24/2020 07:53:29 AM (6 years ago)

Author:

creativemotion

Message:

• Fixed delete empty account
• Compatible with PHP 7.4
• Other fixes

Location:

instagram-slider-widget/trunk

Files:

• admin/assets/js/jr-insta-admin.js (modified) (1 diff)
• admin/views/instagram.php (modified) (3 diffs)
• includes/class-wis_instagram_slider.php (modified) (11 diffs)
• instaram_slider.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

instagram-slider-widget/trunk/admin/assets/js/jr-insta-admin.js

@@ -261 +261 @@
                 _ajax_nonce: add_account_nonce.nonce
             }).done( function( html ) {
+                console.log(html);
                 window.location.reload();
             });

instagram-slider-widget/trunk/admin/views/instagram.php

@@ -80 +80 @@
                                     <td>
                                         <a href="#"
-                                           data-item_id="<?php echo esc_attr( $profile_info['id'] ); ?>"
+                                           data-item_id="<?php echo !empty($profile_info['id']) ? $profile_info['id'] : 0; ?>"
                                            data-is_business="0"
                                            class="btn btn-danger wis-delete-account">
@@ -86 +86 @@
                                         </a>
                                         <span class="spinner"
-                                              id="wis-delete-spinner-<?php echo esc_attr( $profile_info['id'] ); ?>"></span>
+                                              id="wis-delete-spinner-<?php echo !empty($profile_info['id']) ? $profile_info['id'] : 0; ?>"></span>
                                         <?php
                                         if(isset($_GET['access_token']) && $_GET['access_token'] === $profile_info['token'])
@@ -142 +142 @@
                                     <td>
                                         <a href="#"
-                                           data-item_id="<?php echo esc_attr( $profile_info['id'] ); ?>"
+                                           data-item_id="<?php echo !empty($profile_info['id']) ? $profile_info['id'] : 0; ?>"
                                            data-is_business="1"
                                            class="btn btn-danger wis-delete-account">

instagram-slider-widget/trunk/includes/class-wis_instagram_slider.php

@@ -231 +231 @@
         $options_linkto = $this->options_linkto;
 
-        $defaults = array(
+        if( count($accounts)) $s_for = 'account';
+        else if( count($accounts_business) ) $s_for = 'account_business';
+        else $s_for =  'username';
+        $defaults = array(
             'title'            => __('Social Slider', 'instagram-slider-widget'),
-            'search_for'       => count($accounts) ? 'account' : count($accounts_business) ? 'account_business' : 'username',
+            'search_for'       => $s_for,
             'account'          => '',
             'account_business' => '',
@@ -767 +770 @@
         $output .= __( 'No images found! <br> Try some other hashtag or username', 'instagram-slider-widget' );
 
-        if ( ( $search == 'user' && $attachment  ) ) {
+        if ( ( $search == 'user' && $attachment && false ) ) {
 
             if ( !wp_next_scheduled( 'jr_insta_cron', array(  $search_for['username'], $refresh_hour, $images_number ) ) ) {
@@ -928 +931 @@
             } // конец песочницы
             else {
-                if($search !== 'hashtag') $account = $accounts[$images_data[0]['username']];
+                if($search !== 'hashtag' && $search !== 'user') $account = $accounts[$images_data[0]['username']];
             }
 
@@ -1243 +1246 @@
      * Stores the fetched data from instagram in WordPress DB using transients
      *
-     * @param string $search_for  Array of widget settings
+     * @param array $search_for  Array of widget settings
      * @param string $cache_hours Cache hours for transient
      * @param string $nr_images   Nr of images to fetch from instagram
@@ -1472 +1475 @@
                                 $result = $result['node'];
                                 if ( in_array( $result['owner']['id'], $blocked_users_array ) ) {
-                                    //$nr_images++;
+                                    $nr_images++;
                                     continue;
                                 }
@@ -1494 +1497 @@
 
                         if( $this->is_blocked_by_word($blocked_words, $image_data['caption']) ) {
-                            continue;
+                            $nr_images++;
+                            continue;
                         }
 
@@ -1959 +1963 @@
 
                 if ( !WIS_Plugin::app()->is_premium() && $this->count_accounts() >= 1) {
-                    wp_die( '' );
+                    wp_die( 'No premium' );
                 }
 
@@ -1965 +1969 @@
                 WIS_Plugin::app()->updateOption( 'account_profiles_new', $user_profile );
 
-                wp_die( '' );
+                wp_die( 'Ok' );
             }
         }
@@ -1988 +1992 @@
      */
     public function delete_account() {
-        if ( isset( $_POST['item_id'] ) && ! empty( $_POST['item_id'] ) && isset( $_POST['is_business'] ) ) {
+        if ( isset( $_POST['item_id'] ) && isset( $_POST['is_business'] ) ) {
             if ( ! current_user_can( 'manage_options' ) ) {
                 wp_die( - 1 );
@@ -2000 +2004 @@
                 $accounts = WIS_Plugin::app()->getPopulateOption( $option_name );
                 $accounts_new = array();
-                foreach($accounts as $name => $acc) { if($acc['id'] !== $_POST['item_id']) $accounts_new[$name] = $acc; }
+                foreach($accounts as $name => $acc) {
+                    $id = isset($acc['id']) ? $acc['id'] : 0;
+                    if( $id !== (int)$_POST['item_id'] && !empty($name) )
+                        $accounts_new[$name] = $acc;
+                }
                 WIS_Plugin::app()->updatePopulateOption( $option_name, $accounts_new);
 
@@ -2386 +2394 @@
     {
         if(empty($words) || empty($text)) return false;
-        $words = explode( ',', $words);
-        foreach ( $words as $word ) {
-            $pos = strpos( $text, trim($word) );
+        $words_array = explode( ',', $words);
+        foreach ( $words_array as $word ) {
+            $pos = stripos( $text, trim($word) );
             if($pos !== false) return true;
         }

instagram-slider-widget/trunk/instaram_slider.php

@@ -3 +3 @@
 Plugin Name: Social Slider Widget
 Plugin URI: https://cm-wp.com/instagram-slider-widget
-Version: 1.7.4
+Version: 1.7.5
 Description: Social Slider Widget is a responsive slider widget that shows 12 latest images from a public Instagram user and up to 18 images from a hashtag.
 Author: creativemotion

instagram-slider-widget/trunk/readme.txt

@@ -104 +104 @@
 
 == Changelog ==
+= 1.7.5 =
+* Fixed delete empty account
+* Compatible with PHP 7.4
+* Other fixes
+
 = 1.7.4 =
 * Fixed "50 years ago" in Slider Normal and Slider Overlay templates