Skip to content

Commit

Permalink
Merge branch 'master' into aioec_ical_support
Browse files Browse the repository at this point in the history
  • Loading branch information
@Rajat1192
Rajat1192 authored Aug 28, 2023
2 parents 05aecb4 + 96cc65f commit cd30260
Show file tree
Hide file tree
Showing 8 changed files with 44 additions and 20 deletions.
4 changes: 4 additions & 0 deletions assets/css/import-facebook-events-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -558,3 +558,7 @@ table.ife_form_table tr td:nth-child(1) {
50% { transform: scale(1.2); }
100% { transform: scale(0); }
}

.ife-lh{
line-height: 1.5 !important;
}
1 change: 1 addition & 0 deletions import-facebook-events.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ class Import_Facebook_Events {
* @var object Instance of Import_Facebook_Events
*/
private static $instance;
public $common, $cpt, $facebook, $admin, $manage_import, $ife, $tec, $em, $eventon, $event_organizer, $aioec, $my_calendar, $ee4, $ical_parser, $ical, $fb_authorize, $common_pro, $facebook_pro, $cron;

/**
* Main Import Facebook Events Instance.
Expand Down
4 changes: 2 additions & 2 deletions includes/class-import-facebook-events-em.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ public function import_event( $centralize_array, $event_args ) {
$start_time = $centralize_array['starttime_local'];
$end_time = $centralize_array['endtime_local'];
$ticket_uri = $centralize_array['url'];
$timezone_name = isset( $centralize_array['timezone_name'] ) ? $centralize_array['timezone_name'] : '';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? $centralize_array['timezone_name'] : 'Africa/Abidjan';
if ( empty( $timezone_name ) ) {
$timezone_name = isset( $centralize_array['timezone'] ) ? $centralize_array['timezone'] : 'UTC';
}
Expand Down Expand Up @@ -338,7 +338,7 @@ public function import_event( $centralize_array, $event_args ) {
* @param int $event_id Event id.
* @return array
*/
public function get_location_args( $venue, $event_id = false, $is_online ) {
public function get_location_args( $venue, $event_id = false, $is_online = false ) {
global $wpdb, $ife_events;

if( $is_online == true ){
Expand Down
5 changes: 3 additions & 2 deletions includes/class-import-facebook-events-eventon.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,8 @@ public function import_event( $centralize_array, $event_args ) {
$city = isset( $centralize_array['location']['city'] ) ? sanitize_text_field( $centralize_array['location']['city'] ) : '';
$state = isset( $centralize_array['location']['state'] ) ? sanitize_text_field( $centralize_array['location']['state'] ) : '';
$country = isset( $centralize_array['location']['country'] ) ? sanitize_text_field( $centralize_array['location']['country'] ) : '';
$timezone = isset( $centralize_array['timezone'] ) ? sanitize_text_field( $centralize_array['timezone'] ) : '';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? sanitize_text_field( $centralize_array['timezone_name'] ) : '';
$timezone = isset( $centralize_array['timezone'] ) ? sanitize_text_field( $centralize_array['timezone'] ) : 'UTC';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? sanitize_text_field( $centralize_array['timezone_name'] ) : 'Africa/Abidjan';
$is_all_day = !empty( $centralize_array['is_all_day'] ) ? $centralize_array['is_all_day'] : 0;
$is_online = isset( $centralize_array['is_online'] ) ? $centralize_array['is_online'] : false;

Expand All @@ -208,6 +208,7 @@ public function import_event( $centralize_array, $event_args ) {
update_post_meta( $inserted_event_id, 'ife_event_timezone', $timezone );
update_post_meta( $inserted_event_id, 'ife_event_timezone_name', $timezone_name );
update_post_meta( $inserted_event_id, 'evcal_allday', $is_all_day );
update_post_meta( $inserted_event_id, '_evo_tz', $timezone_name );

$location_name = isset( $centralize_array['location']['name'] ) ? sanitize_text_field( $centralize_array['location']['name'] ) : '';
if( $is_online == true ){
Expand Down
21 changes: 16 additions & 5 deletions includes/class-import-facebook-events-ical_parser.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,17 @@ public function generate_centralize_event_array( $event, $event_data = array()
$timezone_name = $event_api_data['ical_timezone_name'];
}

if( isset( $event_api_data['ical_timezone_name'] ) && empty( $event_api_data['start_time'] ) ){
$start_time = strtotime( $this->convert_fb_ical_timezone( $start->format('Y-m-d H:i:s'), $event_api_data['ical_timezone_name'] ) );
if( empty( $event_api_data['start_time'] ) ){
$cwt_start = $this->convert_fb_ical_timezone( $start->format('Y-m-d H:i:s'), $event_api_data['ical_timezone_name'] );
$timezone = $wordpress_timezone;
$timezone_name = $cwt_start['timezone_name'];
$start_time = strtotime( $cwt_start['date_format'] );
}
if( isset( $event_api_data['ical_timezone_name'] ) && empty( $event_api_data['end_time'] ) ){
$end_time = strtotime( $this->convert_fb_ical_timezone( $end->format('Y-m-d H:i:s'), $event_api_data['ical_timezone_name'] ) );
if( empty( $event_api_data['end_time'] ) ){
$cwt_end = $this->convert_fb_ical_timezone( $end->format('Y-m-d H:i:s'), $event_api_data['ical_timezone_name'] );
$timezone = $wordpress_timezone;
$timezone_name = $cwt_end['timezone_name'];
$end_time = strtotime( $cwt_end['date_format'] );
}
}
}
Expand Down Expand Up @@ -562,7 +568,12 @@ public function convert_fb_ical_timezone( $event_datetime = '', $timezone = '' )
$event_timezone = new DateTimeZone( $tz );
$datetime->setTimezone( $event_timezone );

return $datetime->format('Y-m-d H:i:s');
$date_format = $datetime->format('Y-m-d H:i:s');
$return_args = array(
'timezone_name' => $tz,
'date_format' => $date_format,
);
return $return_args;
}

/**
Expand Down
19 changes: 13 additions & 6 deletions includes/class-import-facebook-events-tec.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,10 @@ public function create_event( $centralize_array = array(), $formated_args = arra
}
}
if ( $new_event_id ) {
$timezone = isset( $centralize_array['timezone'] ) ? sanitize_text_field( $centralize_array['timezone'] ) : '';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? sanitize_text_field( $centralize_array['timezone_name'] ) : '';
$timezone = isset( $centralize_array['timezone'] ) ? sanitize_text_field( $centralize_array['timezone'] ) : 'UTC';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? sanitize_text_field( $centralize_array['timezone_name'] ) : 'Africa/Abidjan';

update_post_meta( $new_event_id, '_EventTimezone', $timezone_name );
update_post_meta( $new_event_id, 'ife_facebook_event_id', $centralize_array['ID'] );
update_post_meta( $new_event_id, 'ife_event_origin', $event_args['import_origin'] );
update_post_meta( $new_event_id, 'ife_event_link', esc_url( $centralize_array['url'] ) );
Expand Down Expand Up @@ -283,8 +284,14 @@ public function update_event( $event_id, $centralize_array, $formated_args = arr

if ( $update_event_id ) {

$timezone = isset( $centralize_array['timezone'] ) ? sanitize_text_field( $centralize_array['timezone'] ) : '';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? sanitize_text_field( $centralize_array['timezone_name'] ) : '';
$start_time = $centralize_array['starttime_local'];
$end_time = $centralize_array['endtime_local'];
$timezone = isset( $centralize_array['timezone'] ) ? sanitize_text_field( $centralize_array['timezone'] ) : 'UTC';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? $centralize_array['timezone_name'] : 'Africa/Abidjan';

update_post_meta( $update_event_id, '_EventStartDate', date( 'Y-m-d H:i:s', $start_time ) );
update_post_meta( $update_event_id, '_EventEndDate', date( 'Y-m-d H:i:s', $end_time ) );
update_post_meta( $update_event_id, '_EventTimezone', $timezone_name );

update_post_meta( $update_event_id, 'ife_facebook_event_id', $centralize_array['ID'] );
update_post_meta( $update_event_id, 'ife_event_origin', $event_args['import_origin'] );
Expand Down Expand Up @@ -351,13 +358,13 @@ public function format_event_args_for_tec_orm( $centralize_array ) {
}
$start_time = $centralize_array['starttime_local'];
$end_time = $centralize_array['endtime_local'];
$timezone = isset( $centralize_array['timezone'] ) ? $centralize_array['timezone'] : 'UTC';
$timezone_name = isset( $centralize_array['timezone_name'] ) ? $centralize_array['timezone_name'] : 'Africa/Abidjan';
$event_args = array(
'title' => $centralize_array['name'],
'post_content' => $centralize_array['description'],
'status' => 'pending',
'url' => $centralize_array['url'],
'timezone' => $timezone,
'timezone' => $timezone_name,
'start_date' => date( 'Y-m-d H:i:s', $start_time ),
'end_date' => date( 'Y-m-d H:i:s', $end_time ),
);
Expand Down
6 changes: 3 additions & 3 deletions languages/import-facebook-events.pot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"POT-Creation-Date: 2023-08-15T07:14:38+00:00\n"
"POT-Creation-Date: 2023-08-28T10:55:58+00:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"X-Generator: WP-CLI 2.8.1\n"
"X-Domain: import-facebook-events\n"
Expand Down Expand Up @@ -946,8 +946,8 @@ msgstr ""
msgid "Import histories are deleted successfully."
msgstr ""

#: includes/class-import-facebook-events-tec.php:253
#: includes/class-import-facebook-events-tec.php:334
#: includes/class-import-facebook-events-tec.php:254
#: includes/class-import-facebook-events-tec.php:341
msgid "Something went wrong, please try again."
msgstr ""

Expand Down
4 changes: 2 additions & 2 deletions templates/admin/admin-sidebar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<div class="upgrade_to_pro">
<h2><?php esc_html_e( 'Upgrade to Pro', 'import-facebook-events' ); ?></h2>
<p><?php esc_html_e( 'Unlock more power to events import operation, enable scheduled imports today, Upgrade today!!', 'import-facebook-events' ); ?></p>
<a class="button button-primary upgrade_button" href="<?php echo esc_url( IFE_PLUGIN_BUY_NOW_URL ); ?>" target="_blank">
<a class="button button-primary ife-lh upgrade_button" href="<?php echo esc_url( IFE_PLUGIN_BUY_NOW_URL ); ?>" target="_blank">
<?php esc_html_e( 'Upgrade to Pro', 'import-facebook-events' ); ?>
</a>
</div>

<div class="upgrade_to_pro">
<h2><?php esc_html_e( 'Custom WordPress Development Services', 'import-facebook-events' ); ?></h2>
<p><?php esc_html_e( 'From small blog to complex web apps, we push the limits of what\'s possible with WordPress.', 'import-facebook-events' ); ?></p>
<a class="button button-primary upgrade_button" href="<?php echo esc_url( 'https://xylusthemes.com/contact/?utm_source=insideplugin&utm_medium=web&utm_content=sidebar&utm_campaign=freeplugin' ); ?>" target="_blank">
<a class="button button-primary ife-lh upgrade_button" href="<?php echo esc_url( 'https://xylusthemes.com/contact/?utm_source=insideplugin&utm_medium=web&utm_content=sidebar&utm_campaign=freeplugin' ); ?>" target="_blank">
<?php esc_html_e( 'Hire Us', 'import-facebook-events' ); ?>
</a>
</div>
Expand Down

0 comments on commit cd30260

Please sign in to comment.