Merge branch 'develop' of https://github.com/LibreBooking/app into de…

…velop
LibreBooking · Apr 18, 2023 · 5b520b6 · 5b520b6
2 parents 38cef54 + 15e2f78
commit 5b520b6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/WebServices/ResourcesWebService.php b/WebServices/ResourcesWebService.php
@@ -128,9 +128,10 @@ public function GetTypes()
      * @response ResourcesAvailabilityResponse
      * @return void
      */
-    public function GetAvailability($resourceId = null)
+    public function GetAvailability()
     {
         $dateQueryString = $this->server->GetQueryString(WebServiceQueryStringKeys::DATE_TIME);
+        $resourceId = $this->server->GetQueryString(WebServiceQueryStringKeys::RESOURCE_ID);
 
         if (!empty($dateQueryString)) {
             $requestedTime = WebServiceDate::GetDate($dateQueryString, $this->server->GetSession());
@@ -144,7 +145,7 @@ public function GetAvailability($resourceId = null)
             $resources[] = $this->resourceRepository->LoadById($resourceId);
         }
 
-        $lastDateSearched = $requestedTime->AddDays(30);
+        $lastDateSearched = $requestedTime->AddDays(7);
         $reservations = $this->GetReservations($this->reservationRepository->GetReservations($requestedTime, $lastDateSearched, null, null, null, $resourceId));
 
         $resourceAvailability = [];

diff --git a/doc/INSTALLATION.md b/doc/INSTALLATION.md
@@ -2,7 +2,20 @@
 
 Note: for users without web hosting service or existing environment, packages like [XAMMP](http://www.apachefriends.org/en/index.html) or [WampServer](http://www.wampserver.com/en/) can help you get set up quickly.
 
-## Fresh Installation
+# Fresh Installation
+
+## Server Configuration
+In an **Apache** or similar server environment, some required modules for LibreBooking may not be enabled by default. The following modules (or their equivalents) are often not enabled as part of a standard installation but should be enabled for proper operation of the LibreBooking application:
+* headers
+* rewrite
+
+The enabled modules in an **Apache2** environment can be verified as follows:<br>
+```$ apachectl -M```<br>
+
+If required modules are not present in the enabled list, modules can be enabled in an **Apache2** environment as follows:<br>
+```$ sudo a2enmod headers```<br>
+```$ sudo a2enmod rewrite```<br>
+```$ sudo service apache2 restart```
 
 ## Application Deployment to Server