From: Steve Sutton Date: Thu, 21 Apr 2016 19:48:47 +0000 (-0400) Subject: Adding the files to events X-Git-Tag: v1.0.0^2~89 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=66e543ee794c9bba1eefddf3bf368d6698e6a6a8;p=WP-Plugins%2Fglm-member-db-events.git Adding the files to events Add file one two and three to output Add file importing for discoverkzoo. --- diff --git a/models/admin/management/events.php b/models/admin/management/events.php index 20035c0..6f21537 100644 --- a/models/admin/management/events.php +++ b/models/admin/management/events.php @@ -120,7 +120,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement WHERE image != '' AND image IS NOT NULL"; $results = $this->wpdb->get_results($sql, ARRAY_A); echo '
$results: ' . print_r($results, true) . '
'; - $imgUrl = 'http://is0.gaslightmedia.com/discoverkalamazoo/CKImage/'; + $imgUrl = 'http://is0.gaslightmedia.com/discoverkalamazoo/original/'; foreach ( $results as $event ) { $imageFullUrl = $imgUrl . $event['image']; $res = $ImageUpload->storeImage($imageFullUrl); @@ -139,6 +139,36 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement } } + public function importEventFiles() + { + // get all events with images + $sql = " + SELECT id,file1,file2_descr,old_event_id + FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX. "events + WHERE file1 != '' AND file1 IS NOT NULL"; + $results = $this->wpdb->get_results($sql, ARRAY_A); + //echo '
$results: ' . print_r($results, true) . '
'; + $fileUrl = 'http://is0.gaslightmedia.com/discoverkalamazoo/original/'; + //echo '
$results: ' . print_r($results, true) . '
'; + //exit; + foreach ( $results as $event ) { + $fileFullUrl = $fileUrl . $event['image']; + $fp = fopen( GLM_MEMBERS_PLUGIN_FILES_PATH . '/' . $event['file1'], 'w+' ); + $ch = curl_init( $fileUrl . $event['file1'] ); + curl_setopt($ch, CURLOPT_TIMEOUT, 50); + curl_setopt($ch, CURLOPT_FILE, $fp); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + $fileData = curl_exec($ch); + $httpCode = curl_getinfo($ch); + curl_close($ch); + fclose($fp); + // Set correct file permissions + $oldUmask = umask(0); + chmod( GLM_MEMBERS_PLUGIN_FILES_PATH . '/' . $event['file1'], 0660 ); + umask($oldUmask); + } + } + /** * modelAction * @@ -189,6 +219,12 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement break; + case 'eventFilesImport': + + $this->importEventFiles(); + + break; + case 'eventimport': $import = false; @@ -591,7 +627,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement SELECT * FROM {$this->settings['schema']}.{$this->settings['tablename']} WHERE edate >= '{$this->settings['sdate']}'::DATE"; - //$sql .=" AND reacur "; + //$sql .=" AND file != '' "; try { $events = $this->dbh->query($sql)->fetchAll(PDO::FETCH_ASSOC); $return .= '
$events: ' . print_r($events, true) . '
'; @@ -632,6 +668,8 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement 'intro' => $intro, 'descr' => $event['descr'], 'image' => $event['img'], + 'file1' => $event['file'], + 'file1_descr' => $event['filename'], 'cost' => $event['cost'], 'url' => $event['url'], 'ref_type' => $refType, @@ -658,6 +696,8 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement '%s', '%s', '%s', + '%s', + '%s', '%d', '%d', '%s', @@ -685,6 +725,8 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement 'intro' => $intro, 'descr' => $event['descr'], 'image' => $event['img'], + 'file1' => $event['file'], + 'file1_descr' => $event['filename'], 'cost' => $event['cost'], 'url' => $event['url'], 'old_event_id' => $event['id'], @@ -716,6 +758,8 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement '%s', '%s', '%s', + '%s', + '%s', '%d', '%d', '%d', @@ -760,18 +804,20 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement ); } // recurrences for the event - $allDates = $event['reacur']; - if ( $allDates && ( $event['bdate'] == $event['edate'] ) ) { - $allDates = 0; + $recurringEvent = $event['reacur']; + if ( $recurringEvent && ( $event['bdate'] == $event['edate'] ) ) { + $recurringEvent = 0; } - $dayOfWeek = - $monthOfYear = - $weekOfMonth = - $byDayOfMonth = + $dayOfWeek = + $monthOfYear = + $weekOfMonth = + $byDayOfMonth = $lastDayOfMonth = null; - if ( $allDates ) { + if ( $recurringEvent ) { if ( $event['daysow'] ) { $dayOfWeek = $event['daysow']; + } else { + $dayOfWeek = 127; } if ( $event['weekom'] ) { switch ($event['weekom']) { @@ -794,20 +840,25 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement } else { $weekOfMonth = 63; } - $monthOfYear = 4095; + $monthOfYear = 4096; } $btime = $this->getTime($event['btime']); $etime = $this->getTime($event['etime']); - $allDay = ( $event['all_day'] || !$event['btime'] ); + $startTimeOnly = ($btime && !$etime); + if ( $startTimeOnly ) { + $etime = $btime; + } + $allDay = ( $event['all_day'] || !$btime ); $recurData =array( 'event' => $eventId, 'name' => 'Imported Event Schedule', 'start_time' => $btime, 'end_time' => $etime, + 'start_time_only' => $startTimeOnly, 'from_date' => $event['bdate'], 'to_date' => $event['edate'], 'all_day' => $allDay, - 'recurring' => $allDates, + 'recurring' => $recurringEvent, 'month_of_year' => $monthOfYear, 'week_of_month' => $weekOfMonth, 'day_of_week' => $dayOfWeek, @@ -826,6 +877,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement '%s', '%s', '%s', + '%s', '%d', '%d', '%d', diff --git a/models/front/events/detail.php b/models/front/events/detail.php index 3ecb45d..50f2193 100644 --- a/models/front/events/detail.php +++ b/models/front/events/detail.php @@ -110,7 +110,8 @@ class GLmMembersFront_events_detail extends GlmMembersFront_events_baseAction 'event' => $event, 'permalink' => $permalink, 'title' => $title, - 'mainImgUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/large/' + 'mainImgUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/large/', + 'filePathUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/files/', ); error_reporting(E_ALL ^ E_NOTICE); diff --git a/views/admin/management/events.html b/views/admin/management/events.html index 01184ca..10651bd 100644 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@ -90,6 +90,7 @@ {else} Import Event Images + Import Event Files
diff --git a/views/front/events/detail.html b/views/front/events/detail.html index 680c67e..0085bb7 100644 --- a/views/front/events/detail.html +++ b/views/front/events/detail.html @@ -60,10 +60,25 @@ {/if} {if $event.cost && !$event.free.value} -
Cost
{$event.cost}
+
Cost:
{$event.cost}
{/if} {if $event.free.value} -
Cost
FREE
+
Cost:
FREE
+ {/if} + {if $event.file1} + + {/if} + {if $event.file2} + + {/if} + {if $event.file3} + {/if}
Contact & More Info
{if $event.url}{$event.url}
{/if}