Merge pull request #292 from WoollyinWalesIT/nightly

Nightly
WoollyinWalesIT · Jun 13, 2018 · bc05fab · bc05fab
2 parents 5d0dd95 + 6a8489d
commit bc05fab
Show file tree

Hide file tree

Showing 778 changed files with 3,110 additions and 3,313 deletions.
diff --git a/CHANGELOG_JOMRES b/CHANGELOG_JOMRES
@@ -1,3 +1,21 @@
+<h3>Jomres 9.11.2 13/06/2018</h3>
+
+<span class="label label-warning">Change</span> Added code to the webhook watcher script to try to find a super property manager's id if we cannot find a normal manager's id for a property.
+<span class="label label-warning">Change</span> Changed how we find a reviewer's name so that manager created reviews (which personally I dislike, but some users love) also show the correct name. Saves a query too.
+<span class="label label-warning">Change</span> Use of "secret" in cron tasks removed. It's not necessary and is unreliable.
+<span class="label label-warning">Change</span> README.md updated with access level notes
+<span class="label label-warning">Change</span> Added a sanity check for ZipArchive
+<span class="label label-warning">Change</span> Modified webhook functionality so that it can handle webhooks where no manager id is set.
+<span class="label label-warning">Change</span> nl-NL.php language file fully updated, thanks Ruud.
+
+<span class="label label-important label-danger">Fix</span> Added jr_import('jomres_encryption'); to show_property_reviews script
+<span class="label label-important label-danger">Fix</span> Modified media centre handler so that if 'undefined' is passed by a hinky browser, the resource id is set to 0.
+<span class="label label-important label-danger">Fix</span> Resolved a bug with new GDPR related functionality that could cause 500 errors in obscure ways when making bookings.
+<span class="label label-important label-danger">Fix</span> Fixed a bug in new GDPR related functionality that prevented us from building the existing guests dropdown in the booking form.
+<span class="label label-important label-danger">Fix</span> Improved the BS2 modal so that it plays nice with the other elements of the page.
+<span class="label label-important label-danger">Fix</span> Removed port from function that finds the current url.
+
+
 <h3>Jomres 9.11.1 30/05/2018</h3>
 
 <span class="label label-warning">Change</span> Tweaked bs2 gdpr consent form so that it opens in a modal like bs3.

diff --git a/admin.php b/admin.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/index.php b/api/index.php
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/language/en-GB.php b/api/language/en-GB.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -8,7 +8,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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
@@ -6,7 +6,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/bootstrap/administrator/jomres_warnings.html b/assets/templates/bootstrap/administrator/jomres_warnings.html
@@ -8,6 +8,7 @@
 
 {MAX_INPUT_VARS_CHECK}
 {SUHOSIN_GET_MAX_VARS_CHECK}
+{ZIPARCHIVE_CHECK}
 {GMAPS_KEY_WARNING}
 <!-- {IPINFODB_KEY_WARNING}
 {OPENEXCHANGERATES_KEY_WARNING} -->

diff --git a/assets/templates/bootstrap/frontend/consent_form_wrapper.html b/assets/templates/bootstrap/frontend/consent_form_wrapper.html
@@ -13,14 +13,15 @@
     overflow-y: scroll;
 }
 </style>
-<div class="modal fade" tabindex="-1" role="dialog" id="consentForm" >
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-body">
+
+<div class="modal hide fade" id="consentForm">
+	<div class="modal-header">
+		<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+	</div>
+	<div class="modal-body">
 		{CONSENT_FORM}
-      </div>
-    </div><!-- /.modal-content -->
-  </div><!-- /.modal-dialog -->
-</div><!-- /.modal -->
+	</div>
+</div>
 
+
 </patTemplate:tmpl>
diff --git a/assets/templates/bootstrap4/administrator/jomres_warnings.html b/assets/templates/bootstrap4/administrator/jomres_warnings.html
@@ -6,6 +6,7 @@
 {DEVELOPMENT_MODE}
 {MAX_INPUT_VARS_CHECK}
 {SUHOSIN_GET_MAX_VARS_CHECK}
+{ZIPARCHIVE_CHECK}
 {GMAPS_KEY_WARNING}
 <!-- {IPINFODB_KEY_WARNING}
 {OPENEXCHANGERATES_KEY_WARNING} -->

diff --git a/core-minicomponents/README.md b/core-minicomponents/README.md
@@ -120,6 +120,15 @@ Menu sections (Frontend)
 * 80 : Settings
 * 90 : Help
 
+Menu Access Levels (Frontend)
+
+* 0  : unregistered
+* 1  : registered
+* 50 : receptionist
+* 70 : property manager
+* 90 : super property manager
+
+
 Menu sections (Administrator)
 
 * 1 :Dashboard

diff --git a/core-minicomponents/j00001define_template_paths.class.php b/core-minicomponents/j00001define_template_paths.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001functioncall_generateDateInput.class.php b/core-minicomponents/j00001functioncall_generateDateInput.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001functioncall_get_booking_url.class.php b/core-minicomponents/j00001functioncall_get_booking_url.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001functioncall_get_property_details_url.class.php b/core-minicomponents/j00001functioncall_get_property_details_url.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001functioncall_get_property_module_data.class.php b/core-minicomponents/j00001functioncall_get_property_module_data.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001functioncall_get_property_price_for_display_in_lists.class.php b/core-minicomponents/j00001functioncall_get_property_price_for_display_in_lists.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001functioncall_output_price.class.php b/core-minicomponents/j00001functioncall_output_price.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001functioncall_set_booking_number.class.php b/core-minicomponents/j00001functioncall_set_booking_number.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00001start.class.php b/core-minicomponents/j00001start.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00002usermanagement.class.php b/core-minicomponents/j00002usermanagement.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00003x_input_filtering.class.php b/core-minicomponents/j00003x_input_filtering.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00004a_init_javascript_css_files.class.php b/core-minicomponents/j00004a_init_javascript_css_files.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00005set_search_selections.class.php b/core-minicomponents/j00005set_search_selections.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00005x_build_javascript_lang_definitions.class.php b/core-minicomponents/j00005x_build_javascript_lang_definitions.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00005x_create_misc_common_strings.class.php b/core-minicomponents/j00005x_create_misc_common_strings.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00006sanity_checks.class.php b/core-minicomponents/j00006sanity_checks.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00012pathway.class.php b/core-minicomponents/j00012pathway.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00021colourscheme.class.php b/core-minicomponents/j00021colourscheme.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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/core-minicomponents/j00035tabcontent_01_main_details.class.php b/core-minicomponents/j00035tabcontent_01_main_details.class.php
@@ -4,7 +4,7 @@
  *
  * @author Vince Wooll <sales@jomres.net>
  *
- * @version Jomres 9.11.1
+ * @version Jomres 9.11.2
  *
  * @copyright	2005-2018 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