Changeset 737860

Timestamp:

07/08/2013 05:33:47 PM (13 years ago)

Author:

bhengh

Message:

Updating to 0.45.9 (six bug fixes)

Location:

sermon-browser/trunk

Files:

• readme.txt (modified) (4 diffs)
• sb-includes/admin.php (modified) (3 diffs)
• sb-includes/frontend.php (modified) (4 diffs)
• sermon.php (modified) (2 diffs)

sermon-browser/trunk/readme.txt

@@ -4 +4 @@
 Tags: sermons, podcast, mp3, church, bible, audio, widget, embed, video, esv, wpmu, preach, iTunes, preacher, listen
 Requires at least: 2.9.2
-Tested up to: 3.5.1
+Tested up to: 3.5.2
 Stable tag: trunk
 License: GPLv3 or later
@@ -19 +19 @@
 1. Store thousands of sermons, and **search** them by topic, preacher, bible passage or date.
 2. Full **podcasting** capabilities, including custom podcasts for individual users.
-3. Sermons uploaded in mp3 format can be **played directly** on your website using your choice of WordPress MP3 plugins (including [1PixelOut Audio Player](http://wpaudioplayer.com/)).
+3. Sermons uploaded in mp3 format can be **played directly** on your website using your choice of WordPress MP3 plugins (including [MediaElement.js](https://wordpress.org/plugins/media-element-html5-video-and-audio-player/)).
 4. Three optional **sidebar widgets** can display sermons on all of your posts or pages.
 5. **Embed videos** and other flash files from sites such as [YouTube](http://www.youtube.com/) or [Vimeo](http://www.vimeo.com/), using either HTML code provided by those sites, or shortcode providing by a WordPress plugin.
@@ -250 +250 @@
 == Upgrade Notice ==
 
+= 0.45.9 =
+Six more bug fixes.
+
 = 0.45.8 =
 More bug fixes, collated and patched by [Ben Miller](http://www.sermonbrowser.com/forum/profile/bhengh/).
@@ -289 +292 @@
 
 == Changelog ==
+
+= 0.45.9 (8 July 2013) =
+* **Bug fix:** Auto fill of Bible books on Sermon edit admin screen works better ([link](http://www.sermonbrowser.com/forum/sermon-browser-support/adding-second-bible-passage-bug/)).
+* **Bug fix:** Fix Bible passage link on function sb_display_sermons ([link](http://www.sermonbrowser.com/forum/sermon-browser-support/relative-vs-absolute-url-on-home-page/)).
+* **Bug fix:** Fix sermon title link on Recent Sermons widget.
+* **Bug fix:** Loosen requirements for a valid header from MP3 at external URL ([link](http://www.sermonbrowser.com/forum/sermon-browser-support/patch-for-invalid-url-problem-on-url-import/)).
+* **Bug fix:** Fix "No Sermons Found" bug when sermon is missing Series info.
+* **Bug fix:** Widget miniplayer didn't work with MP3 files attached via URL ([link](http://www.sermonbrowser.com/forum/sermon-browser-support/mini-player-not-working-1/)).
 
 = 0.45.8 (31 May 2013) =

sermon-browser/trunk/sb-includes/admin.php

@@ -795 +795 @@
         if(ini_get('allow_url_fopen')) {
             $headers = array_change_key_case(get_headers($url, 1),CASE_LOWER);
-            if ($headers[0] == 'HTTP/1.1 200 OK') {
+            $matches = array();
+            $matched = preg_match('#HTTP/\d+\.\d+ (\d+)#', $headers[0], $matches);
+            if ($matched && $matches[1] == '200') {
                 if ($_POST['import_type'] == 'download') {
                     $filename = substr($url, strrpos ($url, '/')+1);
@@ -1634 +1636 @@
             p.attr('id', 'passage' + gpid);
             jQuery('tr:first td:first', p).prepend('[<a href="javascript:removePassage(' + gpid++ + ')">x</a>] ');
+            jQuery("select", p).attr('value', '');
             jQuery("input", p).attr('value', '');
             jQuery('.passage:last').after(p);
@@ -1641 +1644 @@
         }
         function syncBook(s) {
-            if (jQuery('#endbook')[0].value != "") return;
-            var slc = jQuery('#startbook')[0].value;
+            var slc = jQuery(s)[0].value;
             jQuery('.passage').each(function(i) {
                 if (this == jQuery(s).parents('.passage')[0]) {

sermon-browser/trunk/sb-includes/frontend.php

@@ -40 +40 @@
                 $foo = unserialize($sermon->start);
                 $bar = unserialize($sermon->end);
-                echo "<span class=\"sermon-passage\"> (".sb_get_books($foo[0], $bar[0]).")</span>";
+                echo "<span class=\"sermon-passage\"> (".sb_get_books($foo[0], $bar[0], FALSE).")</span>";
             }
             if ($display_preacher) {
@@ -83 +83 @@
         $i++;
         echo "<li><span class=\"sermon-title\">";
-        echo "<a href=".sb_build_url(array('sermon_id' => $sermon->id), true).">".stripslashes($sermon->title)."</a></span>";
+        echo '<a href="'.sb_build_url(array('sermon_id' => $sermon->id), true).'">'.stripslashes($sermon->title).'</a></span>';
         if ($book) {
             $foo = unserialize($sermon->start);
@@ -776 +776 @@
     global $wpdb;
     $id = (int) $id;
-    $sermon = $wpdb->get_row("SELECT m.id, m.title, m.datetime, m.start, m.end, m.description, p.id as pid, p.name as preacher, p.image as image, p.description as preacher_description, s.id as sid, s.name as service, ss.id as ssid, ss.name as series FROM {$wpdb->prefix}sb_sermons as m, {$wpdb->prefix}sb_preachers as p, {$wpdb->prefix}sb_services as s, {$wpdb->prefix}sb_series as ss where m.preacher_id = p.id and m.service_id = s.id and m.series_id = ss.id and m.id = {$id}");
+    $sermon = $wpdb->get_row("SELECT m.id, m.title, m.datetime, m.start, m.end, m.description, p.id as pid, p.name as preacher, p.image as image, p.description as preacher_description, s.id as sid, s.name as service FROM {$wpdb->prefix}sb_sermons as m, {$wpdb->prefix}sb_preachers as p, {$wpdb->prefix}sb_services as s where m.preacher_id = p.id and m.service_id = s.id and m.id = {$id}");
+    $series = $wpdb->get_row("SELECT ss.id as ssid, ss.name as series FROM {$wpdb->prefix}sb_sermons as m, {$wpdb->prefix}sb_series as ss WHERE m.series_id = ss.id and m.id = {$id}");
     if ($sermon) {
+        if ($series) {
+            $sermon->series = $series->series;
+            $sermon->ssid = $series->ssid;
+        }
+        else {
+            $sermon->series = '';
+            $sermon->ssid = 0;
+        }
         $file = $code = $tags = array();
         $stuff = $wpdb->get_results("SELECT f.id, f.type, f.name FROM {$wpdb->prefix}sb_stuff as f WHERE sermon_id = $id ORDER BY id desc");
@@ -1110 +1119 @@
     foreach ((array) $stuff as $file) {
         if (strtolower(substr($file, strrpos($file, '.') + 1)) == 'mp3') {
-            if ((substr($url,0,7) == "http://") or (substr($url,0,8) == 'https://')) {
+            if ((substr($file,0,7) == "http://") or (substr($file,0,8) == 'https://')) {
                 if ($stats)
                     $file=sb_display_url().sb_query_char().'show&amp;url='.rawurlencode($file);

sermon-browser/trunk/sermon.php

@@ -5 +5 @@
 Description: Upload sermons to your website, where they can be searched, listened to, and downloaded. Easy to use with comprehensive help and tutorials.
 Author: Mark Barnes
-Version: 0.45.8
+Version: 0.45.9
 Author URI: http://www.4-14.org.uk/
 
@@ -54 +54 @@
 * @package common_functions
 */
-define('SB_CURRENT_VERSION', '0.45.8');
+define('SB_CURRENT_VERSION', '0.45.9');
 define('SB_DATABASE_VERSION', '1.7');
 sb_define_constants();