aboutsummaryrefslogtreecommitdiff
path: root/lib/models/resources
diff options
context:
space:
mode:
Diffstat (limited to 'lib/models/resources')
-rw-r--r--lib/models/resources/BrokenResource.php (renamed from lib/models/resources/BrokenResource.class.php)2
-rw-r--r--lib/models/resources/Building.php (renamed from lib/models/resources/Building.class.php)2
-rw-r--r--lib/models/resources/GlobalResourceLock.php (renamed from lib/models/resources/GlobalResourceLock.class.php)2
-rw-r--r--lib/models/resources/Location.php (renamed from lib/models/resources/Location.class.php)2
-rw-r--r--lib/models/resources/Resource.php (renamed from lib/models/resources/Resource.class.php)33
-rw-r--r--lib/models/resources/ResourceBooking.php (renamed from lib/models/resources/ResourceBooking.class.php)22
-rw-r--r--lib/models/resources/ResourceBookingInterval.php (renamed from lib/models/resources/ResourceBookingInterval.class.php)2
-rw-r--r--lib/models/resources/ResourceCategory.php (renamed from lib/models/resources/ResourceCategory.class.php)4
-rw-r--r--lib/models/resources/ResourceCategoryProperty.php (renamed from lib/models/resources/ResourceCategoryProperty.class.php)2
-rw-r--r--lib/models/resources/ResourceLabel.php (renamed from lib/models/resources/ResourceLabel.class.php)2
-rw-r--r--lib/models/resources/ResourcePermission.php (renamed from lib/models/resources/ResourcePermission.class.php)2
-rw-r--r--lib/models/resources/ResourceProperty.php (renamed from lib/models/resources/ResourceProperty.class.php)2
-rw-r--r--lib/models/resources/ResourcePropertyDefinition.php (renamed from lib/models/resources/ResourcePropertyDefinition.class.php)4
-rw-r--r--lib/models/resources/ResourcePropertyGroup.php (renamed from lib/models/resources/ResourcePropertyGroup.class.php)2
-rw-r--r--lib/models/resources/ResourceRequest.php (renamed from lib/models/resources/ResourceRequest.class.php)70
-rw-r--r--lib/models/resources/ResourceRequestAppointment.php (renamed from lib/models/resources/ResourceRequestAppointment.class.php)2
-rw-r--r--lib/models/resources/ResourceRequestProperty.php (renamed from lib/models/resources/ResourceRequestProperty.class.php)2
-rw-r--r--lib/models/resources/ResourceTemporaryPermission.php (renamed from lib/models/resources/ResourceTemporaryPermission.class.php)2
-rw-r--r--lib/models/resources/Room.php (renamed from lib/models/resources/Room.class.php)2
-rw-r--r--lib/models/resources/RoomRequest.php (renamed from lib/models/resources/RoomRequest.class.php)2
-rw-r--r--lib/models/resources/SeparableRoom.php (renamed from lib/models/resources/SeparableRoom.class.php)2
-rw-r--r--lib/models/resources/SeparableRoomPart.php (renamed from lib/models/resources/SeparableRoomPart.class.php)2
22 files changed, 75 insertions, 92 deletions
diff --git a/lib/models/resources/BrokenResource.class.php b/lib/models/resources/BrokenResource.php
index 5266b4f..fc44e82 100644
--- a/lib/models/resources/BrokenResource.class.php
+++ b/lib/models/resources/BrokenResource.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceLabel.class.php - model class for a resource label
+ * ResourceLabel.php - model class for a resource label
*
* The BrokenResource class represents resources whose class
* cannot be found due to missing Resource specialisations
diff --git a/lib/models/resources/Building.class.php b/lib/models/resources/Building.php
index 0edb983..a1c071a 100644
--- a/lib/models/resources/Building.class.php
+++ b/lib/models/resources/Building.php
@@ -1,7 +1,7 @@
<?php
/**
- * Building.class.php - model class for a resource which is a building
+ * Building.php - model class for a resource which is a building
*
* The building class is a derived class from the Resource class
* which includes specialisations for Building resource types.
diff --git a/lib/models/resources/GlobalResourceLock.class.php b/lib/models/resources/GlobalResourceLock.php
index b1753f5..ed748e1 100644
--- a/lib/models/resources/GlobalResourceLock.class.php
+++ b/lib/models/resources/GlobalResourceLock.php
@@ -1,7 +1,7 @@
<?php
/**
- * GlobalResourceLock.class.php - model class for resource locks
+ * GlobalResourceLock.php - model class for resource locks
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/Location.class.php b/lib/models/resources/Location.php
index 8e79382..9da2e11 100644
--- a/lib/models/resources/Location.class.php
+++ b/lib/models/resources/Location.php
@@ -1,7 +1,7 @@
<?php
/**
- * Location.class.php - model class for a resource which is a location
+ * Location.php - model class for a resource which is a location
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/Resource.class.php b/lib/models/resources/Resource.php
index 531bc4c..32fce2b 100644
--- a/lib/models/resources/Resource.class.php
+++ b/lib/models/resources/Resource.php
@@ -1,7 +1,7 @@
<?php
/**
- * Resource.class.php - model class for a resource
+ * Resource.php - model class for a resource
*
* The Resource class is the base class of the new
* Room and Resource management system in Stud.IP.
@@ -2296,29 +2296,14 @@ class Resource extends SimpleORMap implements StudipItem
return 'admin';
}
- //Check for a temporary permission first:
$perm_string = '';
$temp_perm = null;
$begin = time();
$end = $begin;
-
- //If $time range is set and contains two DateTime objects
- //we can include that in the search for temporary permissions.
- if ($time_range) {
- if ($time_range[0] instanceof DateTime) {
- $begin = $time_range[0]->getTimestamp();
- } else {
- $begin = $time_range[0];
- }
- if ($time_range[1] instanceof DateTime) {
- $end = $time_range[1]->getTimestamp();
- } else {
- $end = $time_range[1];
- }
- }
-
+ //Check for a temporary permission first:
+ //check only against current timestamp
if (!$permanent_only) {
$temp_perm = ResourceTemporaryPermission::findOneBySql(
'(resource_id = :resource_id) AND (user_id = :user_id)
@@ -2375,8 +2360,18 @@ class Resource extends SimpleORMap implements StudipItem
$perm_string = $global_perm;
}
//Now we must check for global resource locks:
-
if ($perm_string && $time_range && $this->lockable) {
+
+ if ($time_range[0] instanceof DateTime) {
+ $begin = $time_range[0]->getTimestamp();
+ } else {
+ $begin = $time_range[0];
+ }
+ if ($time_range[1] instanceof DateTime) {
+ $end = $time_range[1]->getTimestamp();
+ } else {
+ $end = $time_range[1];
+ }
if (GlobalResourceLock::isLocked($begin, $end)) {
//A permission level exists for the user.
//The user gets "user" permissions in case
diff --git a/lib/models/resources/ResourceBooking.class.php b/lib/models/resources/ResourceBooking.php
index f55b3b3..977cf32 100644
--- a/lib/models/resources/ResourceBooking.class.php
+++ b/lib/models/resources/ResourceBooking.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceBooking.class.php - model class for resource bookings
+ * ResourceBooking.php - model class for resource bookings
*
* The ResourceBooking class is responsible for storing
* bookings of resources in a specified time range
@@ -876,7 +876,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$deleted_c = 0;
- $template_factory = new Flexi_TemplateFactory(
+ $template_factory = new Flexi\Factory(
$GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
);
@@ -1755,18 +1755,16 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
//(lib/resources.js, method dropEventInRoomGroupBookingPlan)
$interval_api_urls = [
'resize' => \URLHelper::getURL(
- 'api.php/resources/booking/'
- . $this->id . '/move',
+ 'dispatch.php/resources/ajax/move_booking/' . $this->id,
[
- 'quiet' => '1',
+ 'quiet' => true,
'interval_id' => $interval->id
]
),
'move' => \URLHelper::getURL(
- 'api.php/resources/booking/'
- . $this->id . '/move',
+ 'dispatch.php/resources/ajax/move_booking/' . $this->id,
[
- 'quiet' => '1',
+ 'quiet' => true,
'interval_id' => $interval->id
]
)
@@ -1784,11 +1782,11 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
$text_colour,
$colour,
$booking_is_editable,
- 'ResourceBookingInterval',
+ ResourceBookingInterval::class,
$interval->id,
- 'ResourceBooking',
+ ResourceBooking::class,
$this->id,
- 'Resource',
+ Resource::class,
$this->resource_id,
$booking_view_urls,
$interval_api_urls,
@@ -1917,7 +1915,7 @@ class ResourceBooking extends SimpleORMap implements PrivacyObject, Studip\Calen
return;
}
- $template_factory = new Flexi_TemplateFactory(
+ $template_factory = new Flexi\Factory(
$GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
);
setTempLanguage($booking_user->id);
diff --git a/lib/models/resources/ResourceBookingInterval.class.php b/lib/models/resources/ResourceBookingInterval.php
index 7908e40..47f01cc 100644
--- a/lib/models/resources/ResourceBookingInterval.class.php
+++ b/lib/models/resources/ResourceBookingInterval.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceBookingInterval.class.php - model class for storing
+ * ResourceBookingInterval.php - model class for storing
* all resource bookings time intervals, including those for
* repetitions.
*
diff --git a/lib/models/resources/ResourceCategory.class.php b/lib/models/resources/ResourceCategory.php
index f4ae14d..cfe323a 100644
--- a/lib/models/resources/ResourceCategory.class.php
+++ b/lib/models/resources/ResourceCategory.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceCategory.class.php - model class for resource categories
+ * ResourceCategory.php - model class for resource categories
*
* The ResourceCategory class can be used as a Factory for
* Resource objects.
@@ -85,7 +85,7 @@ class ResourceCategory extends SimpleORMap
public static function find($id)
{
$all = self::findAll();
- return $all[$id] ?: null;
+ return $all[$id] ?? null;
}
/**
diff --git a/lib/models/resources/ResourceCategoryProperty.class.php b/lib/models/resources/ResourceCategoryProperty.php
index b1460cd..c9ac66e 100644
--- a/lib/models/resources/ResourceCategoryProperty.class.php
+++ b/lib/models/resources/ResourceCategoryProperty.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceCategoryProperty.class.php - model class for
+ * ResourceCategoryProperty.php - model class for
* resource category properties
*
* This program is free software; you can redistribute it and/or
diff --git a/lib/models/resources/ResourceLabel.class.php b/lib/models/resources/ResourceLabel.php
index d9c869f..c465723 100644
--- a/lib/models/resources/ResourceLabel.class.php
+++ b/lib/models/resources/ResourceLabel.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceLabel.class.php - model class for a resource label
+ * ResourceLabel.php - model class for a resource label
*
* The ResourceLabel class represents headings or subheadings whose
* only purpose is helping with organising the resource tree.
diff --git a/lib/models/resources/ResourcePermission.class.php b/lib/models/resources/ResourcePermission.php
index bd33708..044db83 100644
--- a/lib/models/resources/ResourcePermission.class.php
+++ b/lib/models/resources/ResourcePermission.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourcePermission.class.php - model class for resource permissions.
+ * ResourcePermission.php - model class for resource permissions.
*
* Description of the resources permission system:
* - admin: An admin may do everything in the resource management:
diff --git a/lib/models/resources/ResourceProperty.class.php b/lib/models/resources/ResourceProperty.php
index 4bbc4ec..4f7a329 100644
--- a/lib/models/resources/ResourceProperty.class.php
+++ b/lib/models/resources/ResourceProperty.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceProperty.class.php - model class for resource properties
+ * ResourceProperty.php - model class for resource properties
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourcePropertyDefinition.class.php b/lib/models/resources/ResourcePropertyDefinition.php
index 82d29c9..b87e8e6 100644
--- a/lib/models/resources/ResourcePropertyDefinition.class.php
+++ b/lib/models/resources/ResourcePropertyDefinition.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourcePropertyDefinition.class.php - model class for resource property definitions
+ * ResourcePropertyDefinition.php - model class for resource property definitions
*
* The ResourcePropertyDefinition class can be used as a Factory
* for ResourceProperty objects.
@@ -221,7 +221,7 @@ class ResourcePropertyDefinition extends SimpleORMap
);
}
} elseif ($type === 'position') {
- $factory = new Flexi_TemplateFactory($GLOBALS['STUDIP_BASE_PATH']);
+ $factory = new Flexi\Factory($GLOBALS['STUDIP_BASE_PATH']);
$template = $factory->open('templates/resources/position_attribute_form_part.php');
$template->set_attribute(
'input_name',
diff --git a/lib/models/resources/ResourcePropertyGroup.class.php b/lib/models/resources/ResourcePropertyGroup.php
index ad53902..f6ea825 100644
--- a/lib/models/resources/ResourcePropertyGroup.class.php
+++ b/lib/models/resources/ResourcePropertyGroup.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourcePropertyGroup.class.php - model class for resource property groups
+ * ResourcePropertyGroup.php - model class for resource property groups
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/ResourceRequest.class.php b/lib/models/resources/ResourceRequest.php
index 6b22b44..df77b19 100644
--- a/lib/models/resources/ResourceRequest.class.php
+++ b/lib/models/resources/ResourceRequest.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceRequest.class.php - Contains a model class for resource requests.
+ * ResourceRequest.php - Contains a model class for resource requests.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@ -1963,7 +1963,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
return;
}
- $factory = new Flexi_TemplateFactory(
+ $factory = new Flexi\Factory(
$GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
);
@@ -2020,7 +2020,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
*/
public function sendCloseRequestMailToRequester($bookings = [])
{
- $factory = new Flexi_TemplateFactory(
+ $factory = new Flexi\Factory(
$GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
);
@@ -2110,7 +2110,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
);
if ($lecturers) {
- $factory = new Flexi_TemplateFactory(
+ $factory = new Flexi\Factory(
$GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
);
@@ -2199,7 +2199,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
}
//Load the mail template:
- $factory = new Flexi_TemplateFactory(
+ $factory = new Flexi\Factory(
$GLOBALS['STUDIP_BASE_PATH'] . '/locale/'
);
$user_lang_path = getUserLanguagePath($user->id);
@@ -2244,24 +2244,19 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
protected function convertToEventData(array $time_intervals, User $user)
{
- $booking_plan_request_bg =
- ColourValue::find('Resources.BookingPlan.Request.Bg');
- $booking_plan_request_fg =
- ColourValue::find('Resources.BookingPlan.Request.Fg');
- $booking_plan_preparation_bg =
- ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
- $booking_plan_preparation_fg =
- ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
+ $booking_plan_request_bg = ColourValue::find('Resources.BookingPlan.Request.Bg');
+ $booking_plan_request_fg = ColourValue::find('Resources.BookingPlan.Request.Fg');
+ $booking_plan_preparation_bg = ColourValue::find('Resources.BookingPlan.PreparationTime.Bg');
+ $booking_plan_preparation_fg = ColourValue::find('Resources.BookingPlan.PreparationTime.Fg');
$user_is_resource_autor = false;
- if ($this->resource_id && ($this->resource instanceof Resource)) {
+ if ($this->resource_id && $this->resource instanceof Resource) {
$user_is_resource_autor = $this->resource->userHasPermission(
$user,
'autor'
);
}
- $request_is_editable =
- $user_is_resource_autor || ($user->id == $this->user_id);
+ $request_is_editable = $user_is_resource_autor || ($user->id == $this->user_id);
$request_api_urls = [];
$request_view_urls = [];
@@ -2269,18 +2264,12 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
if ($request_is_editable) {
$request_api_urls = [
'resize' => URLHelper::getURL(
- 'api.php/resources/request/'
- . $this->id . '/move',
- [
- 'quiet' => '1'
- ]
+ 'dispatch.php/resources/ajax/move_request/'. $this->id,
+ ['quiet' => true]
),
- 'move' => URLHelper::getURL(
- 'api.php/resources/request/'
- . $this->id . '/move',
- [
- 'quiet' => '1'
- ]
+ 'move' => URLHelper::getURL(
+ 'dispatch.php/resources/ajax/move_request/'. $this->id,
+ ['quiet' => true]
)
];
@@ -2290,13 +2279,14 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
. $this->id
)
];
- if ($this->resource_id && ($this->resource instanceof Resource)) {
- if ($this->resource->userHasBookingRights($user)) {
- $request_view_urls['edit'] = URLHelper::getURL(
- 'dispatch.php/resources/room_request/resolve/'
- . $this->id
- );
- }
+ if (
+ $this->resource_id
+ && $this->resource instanceof Resource
+ && $this->resource->userHasBookingRights($user)
+ ) {
+ $request_view_urls['edit'] = URLHelper::getURL(
+ 'dispatch.php/resources/room_request/resolve/'. $this->id
+ );
}
}
@@ -2306,7 +2296,7 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$real_begin = $interval['begin'];
if ($this->preparation_time) {
$real_begin += (int)$this->preparation_time;
- $begin = new DateTime();
+ $begin = new DateTime();
$begin->setTimestamp($interval['begin']);
$end = new DateTime();
$end->setTimestamp($real_begin);
@@ -2320,9 +2310,9 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$request_is_editable,
'',
'',
- 'ResourceRequest',
+ ResourceRequest::class,
$this->id,
- 'Resource',
+ Resource::class,
$this->resource_id,
$request_view_urls,
$request_api_urls
@@ -2342,11 +2332,11 @@ class ResourceRequest extends SimpleORMap implements PrivacyObject, Studip\Calen
$booking_plan_request_fg->__toString(),
$booking_plan_request_bg->__toString(),
$request_is_editable,
- 'ResourceRequest',
+ ResourceRequest::class,
$this->id,
- 'Resource',
+ Resource::class,
$this->resource_id,
- 'Resource',
+ Resource::class,
$this->resource_id,
$request_view_urls,
$request_api_urls
diff --git a/lib/models/resources/ResourceRequestAppointment.class.php b/lib/models/resources/ResourceRequestAppointment.php
index 929733b..63384a2 100644
--- a/lib/models/resources/ResourceRequestAppointment.class.php
+++ b/lib/models/resources/ResourceRequestAppointment.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceRequestAppointment.class.php - Contains a model class for
+ * ResourceRequestAppointment.php - Contains a model class for
* the resource_request_appointments table.
*
* ResourceRequestAppointment is a model class to connect
diff --git a/lib/models/resources/ResourceRequestProperty.class.php b/lib/models/resources/ResourceRequestProperty.php
index 2952be9..c387daa 100644
--- a/lib/models/resources/ResourceRequestProperty.class.php
+++ b/lib/models/resources/ResourceRequestProperty.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceRequestProperty.class.php - model class for
+ * ResourceRequestProperty.php - model class for
* resource request properties
*
* This program is free software; you can redistribute it and/or
diff --git a/lib/models/resources/ResourceTemporaryPermission.class.php b/lib/models/resources/ResourceTemporaryPermission.php
index ddbc397..ad7b33a 100644
--- a/lib/models/resources/ResourceTemporaryPermission.class.php
+++ b/lib/models/resources/ResourceTemporaryPermission.php
@@ -1,7 +1,7 @@
<?php
/**
- * ResourceTemporaryPermission.class.php
+ * ResourceTemporaryPermission.php
* Contains the ResourceTemporaryPermission class
*
* The ResourceTemporaryPermission class represents temporary permissions
diff --git a/lib/models/resources/Room.class.php b/lib/models/resources/Room.php
index 7f1668e..c8e393c 100644
--- a/lib/models/resources/Room.class.php
+++ b/lib/models/resources/Room.php
@@ -1,7 +1,7 @@
<?php
/**
- * Room.class.php - model class for a resource which is a room
+ * Room.php - model class for a resource which is a room
*
* The Room class is a derived class of the Resource class.
* It containts specialisations for room resources.
diff --git a/lib/models/resources/RoomRequest.class.php b/lib/models/resources/RoomRequest.php
index 6db9c38..4ba11bc 100644
--- a/lib/models/resources/RoomRequest.class.php
+++ b/lib/models/resources/RoomRequest.php
@@ -1,7 +1,7 @@
<?php
/**
- * RoomRequest.class.php - model class for table resource_requests
+ * RoomRequest.php - model class for table resource_requests
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/SeparableRoom.class.php b/lib/models/resources/SeparableRoom.php
index 9ec1ccf..d1bf125 100644
--- a/lib/models/resources/SeparableRoom.class.php
+++ b/lib/models/resources/SeparableRoom.php
@@ -1,7 +1,7 @@
<?php
/**
- * SeparableRoom.class.php - model class for a separable room
+ * SeparableRoom.php - model class for a separable room
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
diff --git a/lib/models/resources/SeparableRoomPart.class.php b/lib/models/resources/SeparableRoomPart.php
index e7e99e7..8a45ce7 100644
--- a/lib/models/resources/SeparableRoomPart.class.php
+++ b/lib/models/resources/SeparableRoomPart.php
@@ -1,7 +1,7 @@
<?php
/**
- * SeparableRoomItem.class.php - model class for a separable room item
+ * SeparableRoomItem.php - model class for a separable room item
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
generated by cgit v1.0 at 2026-05-27 07:24:38 +0000