Merge pull request #528 from WoollyinWalesIT/nightly

Nightly
WoollyinWalesIT · Oct 2, 2022 · 50d335d · 50d335d
2 parents 73925c8 + 3a4a669
commit 50d335d
Show file tree

Hide file tree

Showing 1,079 changed files with 1,698 additions and 1,192 deletions.
diff --git a/CHANGELOG_JOMRES b/CHANGELOG_JOMRES
@@ -1,3 +1,18 @@
+<h3>Jomres 10.5.5 02/10/2022</h3>
+
+<span class="label label-success">Feature</span> Updated the no-Bootstrap code so that Jomres itself uses Bootstrap 5 for layout if the theme doesn't support it.
+<span class="label label-success">Feature</span> Added new Core API Endpoint that reports all available endpoints.
+<span class="label label-success">Feature</span> Added ability to set X-JOMRES-NO-ENVELOPE in headers that tells Jomres api to not use the response envelope, just respond with the data.
+<span class="label label-success">Feature</span> Added ability to set payment_success_redirect_url in the url when calling the show confirmation page (must be base64 encoded). Once the booking payment has been processed then where normally the booking completed page would be shown instead the user can be redirected to that success url. Allows plugins such as NBE to hit the confirmation page (where the booking is finally constructed), payment taken, and the user redirected onwards based on the success of the payment.
+<span class="label label-success">Feature</span> Added ability to add bypass_confirmation=1 to the url used when calling the booking confirmation page. This allows remote sites to force calls to this page to automatically redirect to a payment gateway as needed.
+
+<span class="label label-warning">Change</span> Changed the BS3 review star icon so that it works in leohtian
+<span class="label label-warning">Change</span> Stripe plugins now pass the JSID variable in urls. This allows the NBE to be used on a different site (or in an app?) and we can ensure that the session data is used correctly throughout.
+<span class="label label-warning">Change</span> Changed how jomSearch class determines the Bootstrap version to use the built-in function which does some magic, instead of using the BS setting in jrConfig.
+<span class="label label-warning">Change</span> Disable wptexturize when running Jomres scripts, otherwise wp will mangle javascript in Jomres templates.
+
+<span class="label label-important label-danger">Fix</span> Quashed an error that could come up when SRPs save room types. Related to occupancy levels.
+
 <h3>Jomres 10.5.4 26/09/2022</h3>
 
 <span class="label label-success">Feature</span> Stripe Standard payment gateway added to Jomres Core.

diff --git a/admin.php b/admin.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/classes/all_api_features.class.php b/api/classes/all_api_features.class.php
@@ -9,7 +9,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/classes/call.class.php b/api/classes/call.class.php
@@ -9,7 +9,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/classes/call_self.class.php b/api/classes/call_self.class.php
@@ -7,7 +7,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/classes/logging.class.php b/api/classes/logging.class.php
@@ -5,7 +5,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/classes/validate_property_access.class.php b/api/classes/validate_property_access.class.php
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/classes/validate_scope.class.php b/api/classes/validate_scope.class.php
@@ -5,7 +5,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/custom_methods.php b/api/custom_methods.php
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly.
@@ -26,6 +26,17 @@
 
 	Flight::map('json', function ($response_name, $data, $code = 200, $encode = true, $charset = 'utf-8') {
 
+		$headers = jomres_api_postrun_get_headers();
+
+		if (isset($headers['X-JOMRES-NO-ENVELOPE']) && $headers['X-JOMRES-NO-ENVELOPE'] == 1) {
+			Flight::response()
+				->status($code)
+				->header('Content-Type', 'application/json; charset='.$charset)
+				->write(json_encode($data))
+				->send();
+			exit;
+		}
+
 		$envelope_data = Flight::response_envelope_data();
 
 		if (class_exists('mcHandler')) {  // The framework has been included, therefore there's a chance a webhook has been triggered. Let's fire up the watcher to respond to any events
@@ -122,3 +133,21 @@
 
 		return $data;
 	});
+
+	/*
+	 * Here and not in core functions.php because framework isn't always loaded
+	 *
+	 */
+	function jomres_api_postrun_get_headers()
+	{
+		$all_headers = getallheaders();
+
+		if (!empty($all_headers)) {
+			foreach ($all_headers as $key => $val ) {
+				$new_index = strtoupper($key);
+				unset($all_headers[$key]);
+				$all_headers[$new_index] = $val;
+			}
+		}
+		return $all_headers;
+	}
diff --git a/api/index.php b/api/index.php
@@ -8,7 +8,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  *

diff --git a/api/language/en-GB.php b/api/language/en-GB.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/oauth/inc_configs.php b/api/oauth/inc_configs.php
@@ -7,7 +7,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/oauth/resource.php b/api/oauth/resource.php
@@ -7,7 +7,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/oauth/server.php b/api/oauth/server.php
@@ -7,7 +7,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/oauth/token.php b/api/oauth/token.php
@@ -7,7 +7,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/put_method_handling.php b/api/put_method_handling.php
@@ -5,7 +5,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/api/routes.php b/api/routes.php
@@ -9,7 +9,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- *  @version Jomres 10.5.4
+ *  @version Jomres 10.5.5
  *
  * @copyright	2005-2022 Vince Wooll
  * Jomres (tm) PHP, CSS & Javascript files are released under both MIT and GPL2 licenses. This means that you can choose the license that best suits your project, and use it accordingly

diff --git a/assets/templates/bootstrap3/frontend/review_star_icon.html b/assets/templates/bootstrap3/frontend/review_star_icon.html
@@ -1,2 +1,3 @@
-<patTemplate:tmpl name="pageoutput" unusedvars="strip"><i class="fas fa-check-circle"></i>
+<patTemplate:tmpl name="pageoutput" unusedvars="strip"><i class="fa fa-check"></i>
+
 </patTemplate:tmpl>
diff --git a/assets/templates/bootstrap3/frontend/top.html b/assets/templates/bootstrap3/frontend/top.html
@@ -15,8 +15,6 @@
 });
 </script>
 
-{WORDPRESS_NON_BOOTSTRAP_TWEAKS}
-
 <div id="jomres_alternate_menu_position"></div>
 
 <!-- available if required by a plugin -->