Changeset 3457754

Timestamp:

02/10/2026 08:19:20 AM (7 weeks ago)

Author:

wpdevelop

Message:

Update 10.14.16

Location:

booking/trunk

Files:

• includes/_functions/admin_menu_url.php (modified) (1 diff)
• includes/_toolbar_ui/ui__settings_panel.php (modified) (2 diffs)
• includes/page-bookings/bookings__sql.php (modified) (3 diffs)
• includes/page-form-simple/page-form-simple.php (modified) (1 diff)
• includes/page-settings-form-options/page-settings-form-options.php (modified) (2 diffs)
• includes/ui_settings/class-menu-structure.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wpdev-booking.php (modified) (2 diffs)

booking/trunk/includes/_functions/admin_menu_url.php

@@ -370 +370 @@
 
 /**
+ * Check if this WP Booking Calendar > Settings > Booking Form Builder (BFB) page.
+ *
+ * @param string $server_param -  'REQUEST_URI' | 'HTTP_REFERER'  Default: 'REQUEST_URI'
+ *
+ * @return boolean true | false
+ */
+function wpbc_is_settings_bfb_page( $server_param = 'REQUEST_URI' ) {
+    // Regular  user overwrite settings.
+
+    // phpcs:ignore WordPress.Security.NonceVerification.Recommended, WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.InputNotValidated, WordPress.Security.ValidatedSanitizedInput.MissingUnslash, WordPress.Security.ValidatedSanitizedInput.InputNotSanitized
+    if ( ( is_admin() ) && ( strpos( $_SERVER[ $server_param ], 'page=wpbc-settings' ) !== false ) && ( ( strpos( $_SERVER[ $server_param ], '&tab=builder_booking_form' ) !== false ) || ( ( class_exists( 'wpdev_bk_multiuser' ) ) && ( ! empty( $_REQUEST['tab'] ) ) && ( 'builder_booking_form' === $_REQUEST['tab'] ) ) ) ) {
+        return true;
+    }
+
+    return false;
+}
+
+
+/**
  * Check if this WP Booking Calendar > Settings > Booking Form page
  *

booking/trunk/includes/_toolbar_ui/ui__settings_panel.php

@@ -599 +599 @@
         wpbc_ui_settings__panel_start();
 
+        if ( WPBC_Frontend_Settings::is_bfb_enabled( null ) ) {
+            wpbc_ui_settings_panel__card__bfb( $params );
+        } else {
             wpbc_ui_settings_panel__card__form_fields( $params );
             wpbc_ui_settings_panel__card__time_fields( $params );
             wpbc_ui_settings_panel__card__time_slots_options( $params );
             wpbc_ui_settings_panel__card__form_options( $params );
+        }
 
         wpbc_ui_settings__panel_end();
@@ -630 +634 @@
                     echo $url; ?>>
                         <span class="0wpbc_ui_settings__text_color__black2"><?php echo esc_html__('Booking Form Fields','booking'); ?></span>
+                    </a>
+                </h1>
+            </div>
+            <div class="wpbc_ui_settings__text_row">
+                <a class="wpbc_ui_settings__text_color__black" onclick="<?php
+    // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+    echo $onclick; ?>" <?php
+                // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                echo $url; ?>> <?php esc_html_e( 'Add, remove, or customize fields in your booking form.', 'booking' ); ?>
+                </a>
+            </div>
+        </div><?php
+
+    }
+
+
+    /**
+     * Show   == Dashboard Card  -  Booking Form Fields ==
+     *
+     * @return void
+     */
+    function wpbc_ui_settings_panel__card__bfb( $params = array() ){
+
+        $onclick = '';//  ' onclick="' . "javascript:wpbc_navigation_click_show_section(this,'#wpbc_general_settings_calendar_metabox' );" . '" ';
+        $url = ' href="' . esc_url( wpbc_get_settings_url() . '&tab=builder_booking_form' ) . '" ';
+
+        ?><div class="wpbc_ui_settings__card wpbc_ui_settings__card_text_small wpbc_ui_settings__card_divider_right wpbc_ui_settings_panel__card__form_fields">
+            <div class="wpbc_ui_settings__text_row">
+                <i class="menu_icon icon-1x wpbc_icn_dashboard"></i>
+                <h1>
+                    <a onclick="<?php
+    // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+    echo $onclick; ?>" <?php
+                    // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
+                    echo $url; ?>>
+                        <span class="0wpbc_ui_settings__text_color__black2"><?php echo esc_html__('Drag & Drop Booking Form Builder','booking'); ?></span>
                     </a>
                 </h1>

booking/trunk/includes/page-bookings/bookings__sql.php

@@ -1044 +1044 @@
 
                 } else if ($wh_booking_date  === '4') {                                     // Next
+                    $wh_booking_date2 = intval( $wh_booking_date2 );                      // FixIn: 10.14.16.1.
                     $sql_where  =               $and_pre."( ".$pref."booking_date <= (" . wpbc_sql_date_math_expr_explicit( "+ INTERVAL ". $wh_booking_date2 . " DAY", 'curdate' ) . ") ) ".$and_suf ;
                     // $sql_where .=               $and_pre."( ".$pref."booking_date >= (" . wpbc_sql_date_math_expr_explicit( "- INTERVAL 1 DAY", 'curdate' ) . ") ) ".$and_suf ;
@@ -1050 +1051 @@
                 } else if ($wh_booking_date  === '5') {                                     // Prior
                     $wh_booking_date2 = str_replace('-', '', $wh_booking_date2);
+                    $wh_booking_date2 = intval( $wh_booking_date2 );                      // FixIn: 10.14.16.1.
                     $sql_where  =               $and_pre."( ".$pref."booking_date >= (" . wpbc_sql_date_math_expr_explicit( "- INTERVAL ". $wh_booking_date2 . " DAY", 'curdate' ) . ") ) ".$and_suf ;
                     $sql_where .=               $and_pre."( ".$pref."booking_date <= (" . wpbc_sql_date_math_expr_explicit( "+ INTERVAL 1 DAY", 'curdate' ) . ") ) ".$and_suf ;
@@ -1126 +1128 @@
                 } else if ($wh_modification_date  === '5') {                                // Prior
                     $wh_modification_date2 = str_replace('-', '', $wh_modification_date2);
+                    $wh_modification_date2 = intval( $wh_modification_date2 );              // FixIn: 10.14.16.1.
                     $sql_where  =               $and_pre."( ".$pref."modification_date >= (" . wpbc_sql_date_math_expr_explicit( "- INTERVAL ". $wh_modification_date2 . " DAY", 'curdate' ) . ") ) ".$and_suf ;
                     $sql_where .=               $and_pre."( ".$pref."modification_date <= (" . wpbc_sql_date_math_expr_explicit( "+ INTERVAL 1 DAY", 'curdate' ) . ") ) ".$and_suf ;

booking/trunk/includes/page-form-simple/page-form-simple.php

@@ -47 +47 @@
 
     public function in_page() {
+
+        if ( WPBC_Frontend_Settings::is_bfb_enabled( null ) ) {
+            return 'test' . (string) wp_rand( 100000, 1000000 );
+        }
 
         if ( class_exists( 'wpdev_bk_personal' ) ) {

booking/trunk/includes/page-settings-form-options/page-settings-form-options.php

@@ -61 +61 @@
                                     'type'          => 'checkbox'
                                     , 'default'     => $default_options_values['booking_use_bfb_form']         // 'Off'
-                                    , 'title'       => __('New Booking Form Builder' ,'booking') . ' (Beta)'
+                                    , 'title'       =>  __('Drag & Drop Booking Form Builder' ,'booking') .
+                                                        '<span class="wpbc_new_label" style="padding: 3px 4px;margin: 0 10px;">' . esc_html__( 'New', 'booking' ) . '</span>' .
+                                                        '<span class="wpbc_new_label" style="padding: 3px 4px;background: #e18900;text-transform: none;">Beta</span> '
                                     , 'label'       => __('Enable the new drag & drop booking form builder.' ,'booking')
-                                    , 'description' => '<div style="font-size: 12px;margin: -25px 0;">' . '<strong>' . __( 'Beta feature.', 'booking' ) . '</strong> ' .
-                                                       __( 'Enables the new drag & drop form builder. Disable this option to use the classic booking form.', 'booking' )
-                                    . '</div>'
+                                    , 'description' => __( 'Enables the new drag & drop form builder. Disable this option to use the classic booking form.', 'booking' )
                                     , 'group'       => 'form'
                 );
@@ -254 +254 @@
     public function in_page() {
 
+        if ( WPBC_Frontend_Settings::is_bfb_enabled( null ) ) {
+            return 'test' . (string) wp_rand( 100000, 1000000 );
+        }
+
         if ( ! wpbc_is_mu_user_can_be_here( 'only_super_admin' ) ) {            // If this User not "super admin",  then  do  not load this page at all.
             return (string) wp_rand( 100000, 1000000 );

booking/trunk/includes/ui_settings/class-menu-structure.php

@@ -603 +603 @@
             }
         }
+
+        self::$nav_tabs = apply_filters( 'wpbc_plugin_menu_structure_arr', self::$nav_tabs, $this_page );
     }
 

booking/trunk/readme.txt

@@ -6 +6 @@
 Requires PHP: 5.6
 Tested up to: 6.9
-Stable tag: 10.14.15
+Stable tag: 10.14.16
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -301 +301 @@
 
 == Changelog ==
+= 10.14.16 =
+- Changes in **all** versions:
+    * **Fix**:  Resoved Improper Neutralization of Special Elements used in an SQL. (10.14.16.1.)
+
 = 10.14.15 =
 - Changes in **all** versions:

booking/trunk/wpdev-booking.php

@@ -8 +8 @@
 Text Domain: booking
 Domain Path: /languages/
-Version: 10.14.15
+Version: 10.14.16
 License: GPLv2 or later
 */
@@ -35 +35 @@
 
 if ( ! defined( 'WP_BK_VERSION_NUM' ) ) {
-    define( 'WP_BK_VERSION_NUM', '10.14.15' );
+    define( 'WP_BK_VERSION_NUM', '10.14.16' );
 }
 if ( ! defined( 'WP_BK_MINOR_UPDATE' ) ) {
-    define( 'WP_BK_MINOR_UPDATE',  true );
+    define( 'WP_BK_MINOR_UPDATE', true );
 }