Changeset 2906373

Timestamp:

04/30/2023 04:59:52 PM (3 years ago)

Author:

andy_moyle

Message:

3.7.19

• Fix ministry rota edit shortcode bug
• Fix series dropdown in new style sermons

Location:

church-admin/trunk

Files:

• display/new-sermon-podcast.php (modified) (5 diffs)
• includes/rota.new.php (modified) (3 diffs)
• index.php (modified) (2 diffs)
• readme.txt (modified) (1 diff)

church-admin/trunk/display/new-sermon-podcast.php

@@ -18 +18 @@
     $order=!empty($_REQUEST['order'])?sanitize_text_field($_REQUEST['order']):'desc';
     $series=!empty($_REQUEST['series'])?urldecode(sanitize_text_field($_REQUEST['series']) ):null;
-    $series_id=null;
+    $series_id=!empty($_REQUEST['series_id'])?sanitize_text_field($_REQUEST['series_id']) :null;
     $speaker=!empty($_REQUEST['speaker'])?sanitize_text_field($_REQUEST['speaker']):null;
     //$book=!empty($_REQUEST['book'])?sanitize_text_field($_REQUEST['book']):'book';
@@ -41 +41 @@
 
     // series
-    $series_results = $wpdb->get_results('SELECT * FROM '.CA_SERM_TBL);
+    $series_results = $wpdb->get_results('SELECT * FROM '.CA_SERM_TBL.' ORDER BY series_name');
    
     if(!empty($series_results))
@@ -57 +57 @@
         $series= null;
     }
-
+    
     // speaker 
     $speakers_results=$wpdb->get_results('SELECT speaker FROM '.CA_FIL_TBL);
@@ -242 +242 @@
     {
         //series
-        $out.='<div class="church-admin-sermon-filter"><select name="series"><option value="0">'.esc_html(__('Choose a series','church-admin')).'</option>';
+        $out.='<div class="church-admin-sermon-filter"><select name="series_id"><option value="0">'.esc_html(__('Choose a series','church-admin')).'</option>';
         foreach($stored_series AS $id=>$series_name){
             $out.='<option value="'.esc_attr($id).'" '.selected($series_id,$id,FALSE).'/>'.esc_html($series_name).'</option>';
@@ -263 +263 @@
          
             $video_detail = !empty($row->video_url) ? church_admin_generateVideoEmbedUrl( $row->video_url) : null;
-       
+            $video_or_image='';
             //image
             $image = '<img src="'.esc_url(plugins_url('/images/sermon.jpg',dirname(__FILE__) )).'"/>';//default image

church-admin/trunk/includes/rota.new.php

@@ -523 +523 @@
     }
     $team_contact_ids=$wpdb->get_results('SELECT a.*,b.ID FROM '.CA_RST_TBL.' a, '.CA_MET_TBL.' b WHERE b.ID=a.ministries AND b.people_id="'.(int)$person->people_id.'" AND b.meta_type="team_contact" GROUP BY a.rota_task ORDER by a.rota_task');
+
     if(church_admin_level_check('Rota')){
 
@@ -537 +538 @@
     if($wpdb->num_rows==1)
     {
-        $rota_task_id=$team_contact_ids[0]['rota_id'];
+        $rota_task_id=$team_contact_ids[0]->rota_id;
     }
 
@@ -610 +611 @@
                 $errors=array();
                 foreach($dates AS $date){
-                    $wpdb->query('UPDATE '.CA_ROTA_TBL.' SET people_id=NULL WHERE rota_date="'.esc_sql($date->rota_date).'" AND service_id="'.(int)$service_id.'" AND rota_task_id="'.(int)$rota_task_id.'"');
+                    $wpdb->query('DELETE FROM '.CA_ROTA_TBL.' WHERE rota_date="'.esc_sql($date->rota_date).'" AND service_id="'.(int)$service_id.'" AND rota_task_id="'.(int)$rota_task_id.'"');
+                    
                     $people=array();
                     if(!empty($_POST['j'.$date->rota_date])){

church-admin/trunk/index.php

@@ -5 +5 @@
 Plugin URI: http://www.churchadminplugin.com/
 Description: Manage church life with address book, schedule, classes, small groups, and advanced communication tools - bulk email and sms. 
-Version: 3.7.18
+Version: 3.7.19
 Tags: sermons, sermons, prayer, membership, SMS, schedule, rota, Bible, events, calendar, email, small groups, contact form, giving, administration, management
 Author: Andy Moyle
@@ -59 +59 @@
     require_once( plugin_dir_path( __FILE__ ).'includes/enqueue.php');
     
-    $church_admin_version = "3.7.18";
+    $church_admin_version = "3.7.19";
     $church_admin_url='admin.php?page=church_admin/index.php';
     $people_type=get_option('church_admin_people_type');

church-admin/trunk/readme.txt

@@ -71 +71 @@
 
 == Changelog ==
+= 3.7.19 =
+* Fix ministry rota edit shortcode bug
+* Fix series dropdown in new style sermons
 = 3.7.18 =
 * Improved birthdays display calculation and ordering