Changeset 2489591

Timestamp:

03/08/2021 02:20:55 PM (5 years ago)

Author:

allan.casilum

Message:

release version 1.11.33

Location:

searchie/trunk

Files:

• README.txt (modified) (2 diffs)
• SIO/API/Widgets.php (modified) (3 diffs)
• SIO/Media/Controller.php (modified) (1 diff)
• SIO/Media/Index.php (modified) (6 diffs)
• SIO/Settings/Controller.php (modified) (1 diff)
• admin/partials/dashboard/media/local-index.php (modified) (3 diffs)
• functions/api.php (modified) (1 diff)
• functions/helper.php (modified) (1 diff)
• functions/media.php (modified) (1 diff)
• functions/widgets.php (modified) (1 diff)
• searchie.php (modified) (3 diffs)

searchie/trunk/README.txt

@@ -4 +4 @@
 Tags: video, audio, content
 Requires at least: 5.4
-Tested up to: 5.5.1
-Stable tag: 1.11.30
+Tested up to: 5.6.2
+Stable tag: 1.11.33
 Requires PHP: 7.0
 License: GPLv2 or later
@@ -27 +27 @@
 
 == Changelog ==
+
+= 1.11.33 =
+* Update the current version to latest WordPress stable version.
+* Fix some bug due to some incompatible.
 
 = 1.11.30 =

searchie/trunk/SIO/API/Widgets.php

@@ -89 +89 @@
     $res = SIO_API::get_instance()->get($args);
 
-    if ( $res['http_code'] == 200 ) {
+    if ( isset($res['http_code']) && $res['http_code'] == 200 ) {
       $body = json_decode($res['body']);
             $msg = $res['msg'];
@@ -99 +99 @@
             ];
     } else {
-      $body = json_decode($res['body']);
-      $msg = $res['msg'];
+            $resBody = isset($res['body']) ?? [];
+      $body = json_decode($resBody);
+      $msg = $res['msg'] ?? '';
 
             $ret = [
@@ -106 +107 @@
                 'msg' => $msg,
                 'status' => false,
-                'http_code' => $res['http_code'],
+                'http_code' => $res['http_code'] ?? '',
             ];
     }

searchie/trunk/SIO/Media/Controller.php

@@ -43 +43 @@
     public function sync() {
         SIO_Media_Index::get_instance()->sync();
-        sio_redirect_to( admin_url('?page=searchie-media') );   
+        sio_redirect_to( admin_url('?page=searchie-media') );
     }
 

searchie/trunk/SIO/Media/Index.php

@@ -85 +85 @@
 
                 $res = SIO_API_Files::get_instance()->search([ 'search' => $search, 'paged' => $paged ]);
+
                 if ( $res['http_code'] == 200 && $res['body']->meta->total > 0 ) {
                     $data = [
@@ -129 +130 @@
   }
 
-  public function content( $args = [] ) {
+  public function content($args = [])
+    {
         $defaults = [];
         $data = wp_parse_args( $args, $defaults );
@@ -173 +175 @@
 
             $medias = sio_get_local_media();
-        
+
             $data = [
                 'limit' => $limit,
@@ -185 +187 @@
                 'media_data_source' => $media_data_source
             ];
+
             SIO_View::get_instance()->admin_partials('dashboard/media/local-index.php', $data);
         }
-
-
 
   }
@@ -222 +223 @@
             } else {
                 //many pages
-                $result_data[] = $data['medias'];
+                $result_data = $data['medias'];
+
                 for($i = 2; $i <= $last_page; $i++) {
                     $paged = $i;
@@ -229 +231 @@
                     ];
                     $files = sio_get_media($api_file_args);
-                    $result_data[] = $files['body']->data;
-                }
-            }
-        }
+
+                    $totalFiles = $files['body']->data;
+                }
+                $result_data += $totalFiles;
+            }
+        }
+        $result_data = array_merge_recursive($result_data, $totalFiles ?? []);
 
         sio_store_media_files( $result_data );
-
     }
 

searchie/trunk/SIO/Settings/Controller.php

@@ -102 +102 @@
 
         $args['username'] = false;
-        if ( isset($_POST['username']) && sanitize_text_field( $_POST['username'] ) !== '' ) {
-            $args['username'] = sanitize_text_field( $_POST['username'] );
+        if ( isset($_POST['username']) && $_POST['username'] !== '' ) {
+            $args['username'] = $_POST['username'];
         }
 
         $args['password'] = false;
-        if ( isset($_POST['password']) && sanitize_text_field( $_POST['password'] ) !== '' ) {
-            $args['password'] = sanitize_text_field( $_POST['password'] );
+        if ( isset($_POST['password']) && $_POST['password'] !== '' ) {
+            $args['password'] = $_POST['password'];
         }
 

searchie/trunk/admin/partials/dashboard/media/local-index.php

@@ -43 +43 @@
           <li class="media media-item">
             <?php
+              $title = $media->title ?? '';
+              $embed_url = $media->embed_url ?? '';
               $ajax_url = add_query_arg(
                   array(
                       'action' => 'tb_show_media',
-                      'embed_url' => $media->embed_url,
-                      'title' => $media->title,
+                      'embed_url' => $embed_url,
+                      'title' => $title,
                       'width' => 600,
                       'height' => 650,
@@ -58 +60 @@
             </a>
             <div class="media-body">
-              <h5 class="mt-0 mb-1"><?php echo $media->title;?></h5>
+              <h5 class="mt-0 mb-1"><?php echo $title;?></h5>
               <div class="input-group mb-3">
                 <input
                   type="text"
                   class="form-control form-control-sm copy-clipboard"
-                  value="[sio_embed_media embed_url='<?php echo $media->embed_url;?>' width='560' height='315' responsive='0']"
+                  value="[sio_embed_media embed_url='<?php echo $embed_url;?>' width='560' height='315' responsive='0']"
                   style="height:75%;"
                   readonly
@@ -80 +82 @@
   <div class="row">
     <?php
-      sio_paginator($limit, $page, $total_page, admin_url($link_href));
+      sio_paginator($limit, $page, $total_page ?? 0, admin_url($link_href));
     ?>
   </div>

searchie/trunk/functions/api.php

@@ -8 +8 @@
   define('SIO_API_CLIENT_ID', 14);
   define('SIO_API_CLIENT_SECRET', 'tK0G7BlgOWCuY712PUm0XPIWnJvuMft7ZlwCueJL');
-} else {
-  define('SIO_API_URL', 'https://fkwhwvg9azgw.searchie.io/');
-  define('SIO_API_CLIENT_ID', 14);
-  define('SIO_API_CLIENT_SECRET', 'NR22qtpXfEfB15w6B1G9vu3qTMsj9JAOtnaKxsqy');
-}
+} 

searchie/trunk/functions/helper.php

@@ -60 +60 @@
 }
 
-function sio_dd( $arr = [] ) {
+function sio_dd( $arr = [], $exit = false ) {
   echo '<pre>';
   print_r($arr);
   echo '</pre>';
+    if ( $exit )
+    {
+        exit();
+    }
 }
 

searchie/trunk/functions/media.php

@@ -37 +37 @@
     if ( $get_data ) {
         foreach( $get_data as $key => $val ) {
-            if ( is_array( $val ) ) {
-                foreach( $val  as $val_array ) {
-                    $get_data_array[] = $val_array;
-                }
-            }
+            // if ( is_array( $val ) ) {
+            //  foreach( $val  as $val_array ) {
+            //      $get_data_array[] = $val_array;
+            //  }
+            // }
+            $get_data_array[] = $val;
         }
     }

searchie/trunk/functions/widgets.php

@@ -26 +26 @@
         $ret = new SIO_API_Widgets;
         $widgets = $ret->get( $args );
-        return $widgets['body']->data;
+        return $widgets['body']->data ?? [];
     } elseif ( $data_source == 'local' ) {
         return sio_get_local_widgets();

searchie/trunk/searchie.php

@@ -4 +4 @@
  *
  * @link              https://www.searchie.io/
- * @since             1.11.30
+ * @since             1.11.33
  * @package           Searchie
  *
@@ -11 +11 @@
  * Plugin URI:        https://www.searchie.io/
  * Description:       Unlock the full potential of your video and audio content Searchie helps reduce content overwhelm for your customers and team, making your content more accessible and easier to consume.  You create� And let Searchie do the work for you.
- * Version:           1.11.30
+ * Version:           1.11.33
  * Author:            Searchie
  * License:           GPL-2.0+
@@ -29 +29 @@
  * Rename this for the plugin and update it as you release new versions.
  */
-define( 'SEARCHIE_VERSION', '1.11.30' );
+define( 'SEARCHIE_VERSION', '1.11.33' );
 /**
  * Get the root url file.