Changeset 2651864

Timestamp:

01/02/2022 04:47:44 PM (4 years ago)

Author:

aspiesoft

Message:

Added ability to combine GUI list with shortcodes

Location:

aspiesoft-church-sermon-video-list/trunk

Files:

• aspiesoft-church-sermon-video-list.php (modified) (1 diff)
• main.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

aspiesoft-church-sermon-video-list/trunk/aspiesoft-church-sermon-video-list.php

@@ -6 +6 @@
 /*
 Plugin Name: AspieSoft Church Sermon Video List
-Version: 1.3.1
+Version: 1.3.2
 Description: An easy way for a church to list there sermon videos on their website.
 Author: AspieSoft

aspiesoft-church-sermon-video-list/trunk/main.php

@@ -54 +54 @@
       }
 
-      if ($attr['url'] && preg_match('/[\\w_\\-.]\\/[\\w_\\-.]/', $attr['url'])) {
+      if ($attr['url'] && preg_match('/^[\\w_\\-.]+\\/[\\w_\\-]+$/', $attr['url'])) {
         $urlParts = explode('/', $attr['url']);
+        $attr['fb-profile'] = $urlParts[0];
+        $attr['fb-id'] = $urlParts[1];
+        $attr['url'] = false;
+      }else if($attr['url'] && preg_match('/^https?:\\/\\/(?:www\\.|)facebook\\.com\\/([\\w_\\-.]+)\\/videos\\/([\\w_\\-]+)\\/?$/', $attr['url'])){
+        $urlParts = preg_replace('/^https?:\\/\\/(?:www\\.|)facebook\\.com\\/([\\w_\\-.]+)\\/videos\\/([\\w_\\-]+)\\/?$/', '$1/$2', $attr['url']);
+        $urlParts = explode('/', $urlParts);
         $attr['fb-profile'] = $urlParts[0];
         $attr['fb-id'] = $urlParts[1];
@@ -127 +133 @@
       }
 
-      if($content){
+      if ($attr['list']) {
         $this->enqueue();
-        $content = do_shortcode(sanitize_text_field($content));
-      }else if($attr['list']){
-        $this->enqueue();
+        $oldContent = $content;
         $content = '';
 
         $sermonList = sanitize_textarea_field(get_option('AspieSoftChurchSermonVideoList'));
         $sermonList = json_decode($sermonList, true);
-        foreach($sermonList as $item){
+        foreach ($sermonList as $item) {
           $content .= '[cs-video';
-          if(!$item['visible']){
+          if (!$item['visible']) {
             $content .= ' hide=true';
           }
@@ -144 +148 @@
         }
 
+        if($oldContent){
+          $content .= $oldContent;
+        }
+
+        $content = do_shortcode(sanitize_text_field($content));
+      }else if($content){
+        $this->enqueue();
         $content = do_shortcode(sanitize_text_field($content));
       }else{

aspiesoft-church-sermon-video-list/trunk/readme.txt

@@ -4 +4 @@
 Requires at least: 3.0.1
 Tested up to: 5.8.2
-Stable tag: 1.3.1
+Stable tag: 1.3.2
 Requires PHP: 5.2.4
 License: GPLv2 or later