Changeset 2814758

Timestamp:

11/09/2022 12:23:20 AM (3 years ago)

Author:

checkfront

Message:

Git sync: remove sidebar widget, improve escaping, improve shortcode widget_id
Git commit: 062599090f54a954cd5be8c1bb0f880aeb349d1e

Location:

checkfront-wp-booking/trunk

Files:

• CheckfrontWidget.php (modified) (4 diffs)
• README.md (added)
• checkfront-custom-template-sample.php (deleted)
• checkfront.php (modified) (7 diffs)
• examples (added)
• examples/booking-template.php (added)
• examples/shortcodes.html (added)
• pipe.html (modified) (1 diff)
• readme.txt (modified) (3 diffs)
• setup.js (deleted)
• setup.php (modified) (6 diffs)

checkfront-wp-booking/trunk/CheckfrontWidget.php

@@ -5 +5 @@
  *
  * @package     CheckfrontWidget
- * @version     3.0 
+ * @version     3.0
  * @author      Checkfront <[email protected]>
- * @copyright   2008-2018 Checkfront Inc 
+ * @copyright   2008-2018 Checkfront Inc
  * @license     http://opensource.org/licenses/bsd-license.php New BSD License
  * @link        http://www.checkfront.com/developers/
@@ -60 +60 @@
     public $src = '';
     public $plugin_url = '';
+    private $nextDropletId = 1;
 
 
@@ -151 +152 @@
 
     /**
-     * clean short code params
+     * clean shortcode params
      *
      * @param array $cnf shortcode paramaters
@@ -209 +210 @@
         }
 
-        $cnf['widget_id'] = (isset($cnf['widget_id']) and $cnf['widget_id'] > 0) ? $cnf['widget_id'] : '01';
+        $cnf['widget_id'] = (isset($cnf['widget_id']) and $cnf['widget_id'] > 0)
+            ? (int)$cnf['widget_id']
+            : $this->nextDropletId++;
         $html = "\n<!-- CHECKFRONT BOOKING PLUGIN v{$this->interface_version}-->\n";
         $html .= '<div id="CHECKFRONT_WIDGET_' . $cnf['widget_id'] . '"><p id="CHECKFRONT_LOADER" style="background: url(\'//' . $this->host . '/images/loader.gif\') left center no-repeat; padding: 5px 5px 5px 20px">' . $this->load_msg . '...</p></div>';

checkfront-wp-booking/trunk/checkfront.php

@@ -5 +5 @@
 Plugin URI: https://www.checkfront.com/wordpress
 Description: Connects Wordpress to the Checkfront Online Booking System.  Checkfront allows Tour, Activity, Accommodation, and Rental businesses to manage their availability, track inventories, centralize reservations, and process online payments. This plugin connects your WordPress site to your Checkfront account, and provides a powerful real-time booking interface – right within your existing website.
-Version: 3.5
+Version: 3.6
 Author: Checkfront Inc.
 Author URI: https://www.checkfront.com/
@@ -36 +36 @@
         'partner_id' => '',
         'popup'      => '',
+        'widget_id'  => '',
     ], $cnf);
     return checkfront($cnf);
@@ -64 +65 @@
 {
     global $Checkfront;
-    wp_enqueue_script('jquery'); 
-    wp_enqueue_script(WP_PLUGIN_URL . '/setup.js'); 
     include(dirname(__FILE__).'/setup.php');
 }
 
-// Init Checkfront, include any required js / css only when required
-function checkfront_head()
+// include required js, if the page will use it
+function checkfront_enqueue_scripts()
 {
-    $embedded = 0;
-
     global $post, $Checkfront;
     if (!isset($Checkfront->host)) {
@@ -80 +77 @@
     
     // does this page have any shortcode. If not, back out.
-    $pos = stripos($post->post_content, '[checkfront');
-    if ($pos || $pos === 0) {
-        $embedded = 1;
+    if (stripos($post->post_content, '[checkfront') === false) {
+        return;
     }
 
-    // calendar widget
-    if ($Checkfront->arg['widget']) {
-        $checkfront_widget_post = get_option("checkfront_widget_post");
-        $checkfront_widget_page = get_option("checkfront_widget_page");
-        $checkfront_widget_booking = get_option("checkfront_widget_booking");
+    wp_enqueue_script('cf/interface.js', "//{$Checkfront->host}/lib/interface--{$Checkfront->interface_version}.js", ['jquery']);
+    // Disable Comments
+    add_filter('comments_open', 'checkfront_comments_open_filter', 10, 2);
+    add_filter('comments_template', 'checkfront_comments_template_filter', 10, 1);
 
-        if ($embedded && !$checkfront_widget_booking) { 
-            $Checkfront->arg['widget'] = 0;
-        } else {
-            if (is_page() && !$checkfront_widget_page) {
-                $Checkfront->arg['widget'] = 0;
-            }
-            if (is_single() && !$checkfront_widget_post) {
-                $Checkfront->arg['widget'] = 0;
-            }
-        }
-    }
+    // disable auto p
+    // remove_filter ('the_content', 'wpautop');
 
-    if ($Checkfront->arg['widget'] || $embedded) {
-        echo ' <script src="//' . $Checkfront->host . '/lib/interface--' . $Checkfront->interface_version . '.js" type="text/javascript"></script>' ."\n";
-        if ($embedded) {
-            // Disable Comments
-            add_filter('comments_open', 'checkfront_comments_open_filter', 10, 2);
-            add_filter('comments_template', 'checkfront_comments_template_filter', 10, 1);
-
-            // disable auto p
-            // remove_filter ('the_content', 'wpautop');
-
-            // disable wptexturize
-            remove_filter('the_content', 'wptexturize');
-        }
-    }
+    // disable wptexturize
+    remove_filter('the_content', 'wptexturize');
 }
 
-// disable comments on booking pagfe
+// disable comments on booking page
 function checkfront_comments_open_filter($open, $post_id=null)
 {
@@ -134 +108 @@
 function checkfront_init()
 {
-    global $Checkfront;
-    wp_register_sidebar_widget(
-        'checkfront_widget',
-        'Checkfront',
-        'checkfront_widget',
-        ['description' => __('Availability calendar and search')]
-    );
-
-    wp_register_widget_control('checkfront_widget', 'Checkfront', 'checkfront_widget_ctrl');
-    add_action('wp_head', 'checkfront_head');
-    // required includes
     wp_enqueue_script('jquery');
-    if (!isset($Checkfront->arg)) {
-        $Checkfront->arg = [];
-    }
-
-    $Checkfront->arg['widget'] = (is_active_widget('checkfront_widget')) ? 1 : 0;
+    add_action('wp_enqueue_scripts', 'checkfront_enqueue_scripts');
 }
 
@@ -168 +127 @@
     }
     return $links;
-}
-
-// Show widget
-function checkfront_widget()
-{
-    global $Checkfront;
-    if (!$Checkfront->arg['widget']) {
-        return;
-    }
-    $checkfront_widget_title = get_option("checkfront_widget_title");
-    if ($checkfront_book_url = get_option("checkfront_book_url")) {
-        if (!(strpos('http', $checkfront_book_url) === 0)) {
-            $checkfront_book_url = 'http://' . $_SERVER['HTTP_HOST'] . $checkfront_book_url;
-        }
-    }
-    if (!empty($checkfront_widget_title)) {
-        echo '<h2 class="widgettitle">' . $checkfront_widget_title . '</h2>';
-    }
-    echo '<div id="checkfront-cal"><iframe allowTransparency=true border=0 style="border:0; height: 260px;" src="//' . $Checkfront->host . '/reserve/widget/calendar/?return=' . urlencode($checkfront_book_url) . '"></iframe></div>';
-}
-
-// Widget control
-function checkfront_widget_ctrl()
-{
-    if ($_POST['checkfront_update']) {
-        update_option("checkfront_book_url", $_POST['checkfront_book_url']);
-        update_option("checkfront_widget_title", $_POST['checkfront_widget_title']);
-        update_option("checkfront_widget_post ", $_POST['checkfront_widget_post']);
-        update_option("checkfront_widget_page ", $_POST['checkfront_widget_page']);
-        update_option("checkfront_widget_booking", $_POST['checkfront_widget_booking']);
-    }
-
-    $checkfront_book_url = get_option("checkfront_book_url");
-
-    // try and find booking page in content
-    if (!$checkfront_book_url) {
-        global $wpdb;
-        $checkfront_book_url = $wpdb->get_var("select guid FROM `{$wpdb->prefix}posts` where post_content like '%[checkfront%' and post_type = 'page' limit 1");
-        update_option("checkfront_widget_url", $checkfront_book_url);
-    }
-
-    $checkfront_widget_title = get_option("checkfront_widget_title");
-    $checkfront_widget_post = (get_option("checkfront_widget_post")) ? ' checked="checked"' : '';
-    $checkfront_widget_page = (get_option("checkfront_widget_page")) ? ' checked="checked"' : '';
-    $checkfront_widget_booking  = (get_option("checkfront_widget_booking")) ? ' checked="checked"' : '';
-
-    echo '<input type="hidden" name="checkfront_update" value="1" />';  
-    echo '<ul>';
-    echo '<li><label for="checkfront_book_url">' . __('Internal Booking Page (URL)') . ': </label><input type="text" id="checkfront_book_url" name="checkfront_book_url" value="' . $checkfront_book_url . '" /> </li>';
-    echo '<li><label for="checkfront_widget_title">' . __('Title') . ': </label><input type="text" id="checkfront_widget_title" name="checkfront_widget_title" value="' . $checkfront_widget_title . '" /> </li>';
-    echo '<li style="color: firebrick">It is not recommended to use this with the v2 interface.</li>';
-    echo '<li><input type="checkbox" id="checkfront_widget_post" name="checkfront_widget_post" value="1"' . $checkfront_widget_post . '/><label for="checkfront_widget_post" />' . __('Show on posts') . '</li>';
-    echo '<li><input type="checkbox" id="checkfront_widget_page" name="checkfront_widget_page" value="1"' .  $checkfront_widget_page . '/><label for="checkfront_widget_post" />' . __('Show on pages') . '</li>';
-    echo '<li><input type="checkbox" id="checkfront_widget_booking" name="checkfront_widget_booking" value="1"' . $checkfront_widget_booking . '/><label for="checkfront_widget_booking" />' . __('Show on booking page') . '</li>';
-    echo '</ul>';
 }
 
@@ -243 +147 @@
 add_action('admin_menu', 'checkfront_conf');
 add_action('init', 'checkfront_init');
-
-?>

checkfront-wp-booking/trunk/pipe.html

@@ -19 +19 @@
         <pre>
         This is a static helper file that improves performance, rendering and sizing of the Checkfront Booking System.
-        It should be placed on the same server where the booking portal is hosted and referenced in the embed code.  
+        It should be placed on the same server where the booking portal is hosted and referenced in the embed code.
         For more information see: <a href="http://www.checkfront.com/support/droplet#helper">http://www.checkfront.com/support/droplet#helper</a>
         </pre>

checkfront-wp-booking/trunk/readme.txt

@@ -2 +2 @@
 
 Contributors: checkfront
-Stable tag: trunk
+Stable tag: 3.6
 Tags: Booking, Booking System, Reservation, Reservation System, Online Booking, Booking Engine, Tours, Tour Operator, Booking Plugin, Reservation Plugin, Booking Software, Reservation Payment System, Activity Booking, Rental Booking, Reservation Payments, Tour Booking, Passbook, Availability, Payments, Bookings
 Requires at least: 2.0
@@ -32 +32 @@
 * Multi-gateway payment processing including Stripe, Square, Paypal, Authorize.net, SagePay & dozens more
 * SSL support keeps the customer on your website while making payment
-* Support for short codes, or custom theme pages in Wordpress.
+* Support for shortcodes, or custom theme pages in Wordpress.
 * Tailored onboarding session and a 24/7 support team
 * **No commissions!**
@@ -73 +73 @@
 ### Changelog
 
+* *November 2nd 2022:*
+  * Wordpress 6.1 compatibility
+  * Removed deprecated sidebar widget
 * *February 25th 2021:*
   * Fixed broken image links in plugin setup

checkfront-wp-booking/trunk/setup.php

@@ -1 +1 @@
 <?php
-if (isset($_POST['checkfront_host'])) {
+if (!empty($_POST['checkfront_host'])) {
     if ($host = $Checkfront->valid_host($_POST['checkfront_host'])) {
         update_option('checkfront_host', trim($host));
@@ -11 +11 @@
 ?>
 <div style="width: 800px">
-    <script type="text/javascript">
-        jQuery(document).ready(function() {
-
-            function clean(str) {
-                return str.replace(/[^\d\w\-\_ , "]/ig, '');
-            }
-
-            jQuery('#shortcode_generator').click(function() {
-                height = 600;
-                width = 1150;
-                var cwidth = (window.screen.width - width) / 2;
-                var cheight = (window.screen.height - height) / 2;
-                var param = "location=yes,status=yes,resizable=yes,scrollbars=yes,menubar=yes,toolbar=yes,width=" + width + ',height=' + height + ',left=' + cwidth + ',top=' + cheight;
-                var sw = window.open(this.href, '', param);
-                sw.focus();
-                return false;
-            });
-        });
-    </script>
     <div style="width: 500px; float: left">
         <h1>Online Bookings For Wordpress</h1>
@@ -38 +19 @@
             <li style="padding: 5px 0; height: 25px; line-height: 25px;"><strong style="margin-right: 10px; background-color: #ccc; border-radius: 20px; clear: none; color: #000; display: inline-block; float: left; font-style: normal; height: 25px; font-weight: bold; line-height: 25px;font-size:14px; text-align: center; width: 25px;">1</strong> Create and configure <a href="https://www.checkfront.com/start/?src=wp-setup" target="_blank">your Checkfront account</a>.</li>
             <li style="padding: 5px 0; height: 25px; line-height: 25px;"><strong style="margin-right: 10px; background-color: #ccc; border-radius: 20px; clear: none; color: #000; display: inline-block; float: left; font-style: normal; height: 25px; font-weight: bold; line-height: 25px;font-size:14px; text-align: center; width: 25px;">2</strong> Supply your Checkfront URL and optional settings <a href="#checkfront_setup">below</a>.</li>
-            <li style="padding: 5px 0; height: 25px; line-height: 25px;"><strong style="margin-right: 10px; background-color: #ccc; border-radius: 20px; clear: none; color: #000; display: inline-block; float: left; font-style: normal; height: 25px; font-weight: bold; line-height: 25px;font-size:14px; text-align: center; width: 25px;">3</strong> Create a new page and supply the <a href="#shortcode">short code</a> you created.</li>
+            <li style="padding: 5px 0; height: 25px; line-height: 25px;"><strong style="margin-right: 10px; background-color: #ccc; border-radius: 20px; clear: none; color: #000; display: inline-block; float: left; font-style: normal; height: 25px; font-weight: bold; line-height: 25px;font-size:14px; text-align: center; width: 25px;">3</strong> Create a new page and supply the <a href="#shortcode">shortcode</a> you created.</li>
             <li style="padding: 5px 0; height: 25px; line-height: 25px;"><strong style="margin-right: 10px; background-color: #ccc; border-radius: 20px; clear: none; color: #000; display: inline-block; float: left; font-style: normal; height: 25px; font-weight: bold; line-height: 25px;font-size:14px; text-align: center; width: 25px;">4</strong> Start accepting online bookings.</li>
             <li style="padding: 5px 0; height: 25px; line-height: 25px;"><strong style="margin-right: 10px; background-color: #ccc; border-radius: 20px; clear: none; color: #000; display: inline-block; float: left; font-style: normal; height: 25px; font-weight: bold; line-height: 25px;font-size:14px; text-align: center; width: 25px;">5</strong> Have questions? <a href="https://www.checkfront.com/support/?src=wp-setup">We're here to help</a>.</li>
@@ -48 +29 @@
             <strong>Smart, Simplified Online Bookings</strong><br /><br />
         </div>
-        <iframe src="//www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fcheckfront.bookings&amp;send=false&amp;layout=button_count&amp;width=250&amp;show_faces=false&amp;action=like&amp;colorscheme=light&amp;font&amp;height=21&amp;appId=132896805841" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:290px; margin-bottom: 10px; height:21px;" allowTransparency="true"></iframe>
-        <!-- Place this tag in your head or just before your close body tag -->
-        <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script>
-        <!-- Place this tag where you want the +1 button to render -->
-        <div class="g-plusone" data-size="small" data-annotation="inline" data-href="https://www.checkfront.com/?src=wp-setup"></div>
         <br />
         <br />
@@ -65 +41 @@
                 <h3 class="hndle">Setup</h3>
                 <?php
-                if (isset($cf_msg)) { ?>
+                if (!empty($cf_msg)) { ?>
                     <div style="background-color: rgb(255, 251, 204); margin:1em 1em 0em 1em" id="message" class="updated fade">
-                        <p><strong><?php echo $cf_msg ?></strong></p>
+                        <p><strong><?php echo esc_html($cf_msg) ?></strong></p>
                     </div>
                 <?php } ?>
@@ -75 +51 @@
                             <tr valign="top">
                                 <th scope="row"><label for="checkfront_email">Checkfront Host Url:</label></th>
-                                <td nowrap>https://<input name="checkfront_host" style="width: 15em;font-weight: bold" id="CF_id" value="<?php echo $Checkfront->host ?>" class="regular-text" type="text" /><br /><em style="color: #888">Eg: demo.checkfront.com</em> </td>
+                                <td nowrap>https://<input name="checkfront_host" style="width: 15em;font-weight: bold" id="CF_id" value="<?php echo esc_attr($Checkfront->host) ?>" class="regular-text" type="text" /><br /><em style="color: #888">Eg: demo.checkfront.com</em> </td>
                                 <td id="CF_status"><em>Location of your Checkfront Admin</td>
                             </tr>