Skip to content

Commit

Permalink
Auto update (#1)
Browse files Browse the repository at this point in the history 
* Enables plugin update from within the admin area,

* V2.1.0 allows updating the plugin from wordpress
  • Loading branch information
@stevennoad
stevennoad authored Jul 9, 2024
1 parent c66d713 commit 4e6423f
Show file tree
Hide file tree
Showing 116 changed files with 11,138 additions and 145 deletions.
289 changes: 152 additions & 137 deletions apple-maps.php
View file
Original file line number Diff line number Diff line change
@@ -1,114 +1,117 @@
<?php
/*
Plugin Name: Apple Maps
Plugin URI: https://github.com/stevennoad/apple-maps-plugin
Description: A plugin to add Apple Maps with multiple locations.
Version: 2.0.0
Author: Steve Noad
Version: 2.1.0
Author: Steve Noad
License: MIT
Text Domain: apple-maps
*/

// Register the shortcodes
function register_apple_map_shortcodes() {
add_shortcode('apple_map', 'apple_map_shortcode');
add_shortcode('apple_map_places', 'apple_map_places_shortcode');
add_shortcode('apple_map', 'apple_map_shortcode');
add_shortcode('apple_map_places', 'apple_map_places_shortcode');
}
add_action('init', 'register_apple_map_shortcodes');

// Enqueue scripts and styles based on the shortcode used
function apple_maps_enqueue_scripts() {
if (is_singular()) {
global $post;
if (has_shortcode($post->post_content, 'apple_map')) {
wp_enqueue_script('apple-mapkit', 'https://cdn.apple-mapkit.com/mk/5.x.x/mapkit.js', [], null, true);
wp_enqueue_script('apple-maps-custom-js', plugins_url('apple-maps.js', __FILE__), ['apple-mapkit'], null, true);
} elseif (has_shortcode($post->post_content, 'apple_map_places')) {
wp_enqueue_script('apple-mapkit', 'https://cdn.apple-mapkit.com/mk/5.x.x/mapkit.js', [], null, true);
wp_enqueue_script('apple-maps-custom-js', plugins_url('places.js', __FILE__), ['apple-mapkit'], null, true);
}
$apple_map_settings = get_option('apple_map_settings');
$localize_data = [
'token' => $apple_map_settings['apple_map_token'] ?? '',
'glyph' => $apple_map_settings['apple_map_glyph'] ?? ''
];
wp_localize_script('apple-maps-custom-js', 'appleMapsSettings', $localize_data);
wp_enqueue_style('apple-maps-custom-css', plugins_url('apple-maps.css', __FILE__));
// Debug logs
if (defined('WP_DEBUG') && WP_DEBUG) {
error_log('Apple Maps scripts and styles enqueued.');
}
}
if (is_singular() || \Elementor\Plugin::instance()->preview->is_preview_mode()) {
global $post;
if (has_shortcode($post->post_content, 'apple_map')) {
wp_enqueue_script('apple-mapkit', 'https://cdn.apple-mapkit.com/mk/5.x.x/mapkit.js', [], null, true);
wp_enqueue_script('apple-maps-custom-js', plugins_url('assets/js/standard.js', __FILE__), ['apple-mapkit'], null, true);
} elseif (has_shortcode($post->post_content, 'apple_map_places')) {
wp_enqueue_script('apple-mapkit', 'https://cdn.apple-mapkit.com/mk/5.x.x/mapkit.js', [], null, true);
wp_enqueue_script('apple-maps-custom-js', plugins_url('assets/js/places.js', __FILE__), ['apple-mapkit'], null, true);
}

$apple_map_settings = get_option('apple_map_settings');
$localize_data = [
'token' => $apple_map_settings['apple_map_token'] ?? '',
'glyph' => $apple_map_settings['apple_map_glyph'] ?? ''
];

wp_localize_script('apple-maps-custom-js', 'appleMapsSettings', $localize_data);
wp_enqueue_style('apple-maps-custom-css', plugins_url('assets/css/map.css', __FILE__));

// Debug logs
if (defined('WP_DEBUG') && WP_DEBUG) {
error_log('Apple Maps scripts and styles enqueued.');
}
}
}
add_action('wp_enqueue_scripts', 'apple_maps_enqueue_scripts');

// Shortcode for the standard Apple Map
function apple_map_shortcode($atts, $content = null) {
static $map_counter = 0;
$map_counter++;

$map_id = 'apple-map-' . $map_counter;
$locations = json_decode($content, true);

if (json_last_error() !== JSON_ERROR_NONE) {
return '<p>Invalid JSON format.</p>';
}

// Debug log
if (defined('WP_DEBUG') && WP_DEBUG) {
error_log('Apple Maps shortcode rendered with map ID: ' . $map_id);
}

ob_start();
?>
<div id="<?php echo esc_attr($map_id); ?>" class="apple-map-container"
data-landmarks='<?php echo esc_attr(json_encode($locations, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT)); ?>'>
</div>
<?php
return ob_get_clean();
static $map_counter = 0;
$map_counter++;

$map_id = 'apple-map-' . $map_counter;
$locations = json_decode($content, true);

if (json_last_error() !== JSON_ERROR_NONE) {
return '<p>Invalid JSON format.</p>';
}

// Debug log
if (defined('WP_DEBUG') && WP_DEBUG) {
error_log('Apple Maps shortcode rendered with map ID: ' . $map_id);
}

ob_start();
?>
<div id="<?php echo esc_attr($map_id); ?>" class="apple-map-container"
data-landmarks='<?php echo esc_attr(json_encode($locations, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT)); ?>'>
</div>
<?php
return ob_get_clean();
}

// Shortcode for the places Apple Map
function apple_map_places_shortcode($atts, $content = null) {
static $map_counter = 0;
$map_counter++;

$map_id = 'apple-map-places-' . $map_counter;
$locations = json_decode($content, true);

if (json_last_error() !== JSON_ERROR_NONE) {
return '<p>Invalid JSON format.</p>';
}

// Extract the settings object
$settings = $locations['settings'] ?? [];

// Localize the settings object
wp_localize_script('apple-maps-custom-js', 'appleMapsSettings', [
'token' => get_option('apple_map_settings')['apple_map_token'] ?? '',
'glyph' => get_option('apple_map_settings')['apple_map_glyph'] ?? '',
'settings' => $settings
]);

// Debug log
if (defined('WP_DEBUG') && WP_DEBUG) {
error_log('Apple Maps Places shortcode rendered with map ID: ' . $map_id);
}

ob_start();
?>
<div id="<?php echo esc_attr($map_id); ?>" class="apple-map-container"
data-landmarks='<?php echo esc_attr(json_encode($locations, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT)); ?>'>
</div>
<?php
return ob_get_clean();
static $map_counter = 0;
$map_counter++;

$map_id = 'apple-map-places-' . $map_counter;
$locations = json_decode($content, true);

if (json_last_error() !== JSON_ERROR_NONE) {
return '<p>Invalid JSON format.</p>';
}

// Extract the settings object
$settings = $locations['settings'] ?? [];

// Localize the settings object
wp_localize_script('apple-maps-custom-js', 'appleMapsSettings', [
'token' => get_option('apple_map_settings')['apple_map_token'] ?? '',
'glyph' => get_option('apple_map_settings')['apple_map_glyph'] ?? '',
'settings' => $settings
]);

// Debug log
if (defined('WP_DEBUG') && WP_DEBUG) {
error_log('Apple Maps Places shortcode rendered with map ID: ' . $map_id);
}

ob_start();
?>
<div id="<?php echo esc_attr($map_id); ?>" class="apple-map-container"
data-landmarks='<?php echo esc_attr(json_encode($locations, JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS | JSON_HEX_QUOT)); ?>'>
</div>
<?php
return ob_get_clean();
}

// Add a settings link on the plugins page
function apple_maps_add_settings_link($links) {
$settings_link = '<a href="admin.php?page=apple_map">' . __('Settings', 'apple_map') . '</a>';
$links[] = $settings_link;
return $links;
$settings_link = '<a href="admin.php?page=apple_map">' . __('Settings', 'apple_map') . '</a>';
$links[] = $settings_link;
return $links;
}
add_filter('plugin_action_links_' . plugin_basename(__FILE__), 'apple_maps_add_settings_link');

Expand All @@ -117,75 +120,87 @@ function apple_maps_add_settings_link($links) {
add_action('admin_init', 'apple_map_settings_init');

function apple_map_add_admin_menu() {
add_options_page('Apple Map Settings', 'Apple Map', 'manage_options', 'apple_map', 'apple_map_options_page');
add_options_page('Apple Map Settings', 'Apple Map', 'manage_options', 'apple_map', 'apple_map_options_page');
}

function apple_map_settings_init() {
register_setting('apple_map', 'apple_map_settings');

add_settings_section(
'apple_map_section',
__('Apple Maps Settings', 'apple_map'),
'apple_map_settings_section_callback',
'apple_map'
);

$fields = [
'apple_map_token' => __('MapKit Token', 'apple_map'),
'apple_map_glyph' => __('Map Glyph Text', 'apple_map')
];

foreach ($fields as $id => $label) {
add_settings_field(
$id,
$label,
'apple_map_' . $id . '_render',
'apple_map',
'apple_map_section'
);
}
register_setting('apple_map', 'apple_map_settings');

add_settings_section(
'apple_map_section',
__('Apple Maps Settings', 'apple_map'),
'apple_map_settings_section_callback',
'apple_map'
);

$fields = [
'apple_map_token' => __('MapKit Token', 'apple_map'),
'apple_map_glyph' => __('Map Glyph Text', 'apple_map')
];

foreach ($fields as $id => $label) {
add_settings_field(
$id,
$label,
'apple_map_' . $id . '_render',
'apple_map',
'apple_map_section'
);
}
}

function apple_map_render_field($field_id, $type = 'text', $description = '') {
$options = get_option('apple_map_settings');
$value = $options[$field_id] ?? '';

if ($type === 'textarea') {
echo "<textarea name='apple_map_settings[{$field_id}]' rows='5' cols='100'>" . esc_textarea($value) . "</textarea>";
} else {
echo "<input type='{$type}' name='apple_map_settings[{$field_id}]' size='50' value='" . esc_attr($value) . "'>";
}

if ($description) {
echo "<p class='description'>" . __($description, 'apple_map') . "</p>";
}
$options = get_option('apple_map_settings');
$value = $options[$field_id] ?? '';

if ($type === 'textarea') {
echo "<textarea name='apple_map_settings[{$field_id}]' rows='5' cols='100'>" . esc_textarea($value) . "</textarea>";
} else {
echo "<input type='{$type}' name='apple_map_settings[{$field_id}]' size='50' value='" . esc_attr($value) . "'>";
}

if ($description) {
echo "<p class='description'>" . __($description, 'apple_map') . "</p>";
}
}

function apple_map_apple_map_token_render() {
apple_map_render_field('apple_map_token', 'textarea');
apple_map_render_field('apple_map_token', 'textarea');
}

function apple_map_apple_map_glyph_render() {
apple_map_render_field('apple_map_glyph', 'text', 'Enter the glyph for the map here (e.g., "i", "M", "A").');
apple_map_render_field('apple_map_glyph', 'text', 'Enter the glyph for the map here (e.g., "i", "M", "A").');
}

// Dummy callback function for the settings section (adjust as needed)
function apple_map_settings_section_callback() {
echo '<p>This is the Apple Maps settings section.</p>';
echo '<p>This is the Apple Maps settings section.</p>';
}

function apple_map_options_page() {
?>
<div class="wrap">
<h1><?php echo esc_html(get_admin_page_title()); ?></h1>
<form action='options.php' method='post'>
<?php
settings_fields('apple_map');
do_settings_sections('apple_map');
submit_button();
?>
</form>
</div>
<?php
?>
<div class="wrap">
<h1><?php echo esc_html(get_admin_page_title()); ?></h1>
<form action='options.php' method='post'>
<?php
settings_fields('apple_map');
do_settings_sections('apple_map');
submit_button();
?>
</form>
</div>
<?php
}
?>

// Wordpress auto updater
require 'includes/plugin-update-checker/plugin-update-checker.php';
use YahnisElsts\PluginUpdateChecker\v5\PucFactory;

$myUpdateChecker = PucFactory::buildUpdateChecker(
'https://github.com/stevennoad/apple-maps-plugin/',
__FILE__,
'apple-maps'
);

// Set the branch that contains the stable release.
$myUpdateChecker->getVcsApi()->enableReleaseAssets();
0 apple-maps.css → assets/css/map.css
View file
File renamed without changes.
Loading

0 comments on commit 4e6423f

Please sign in to comment.