Skip to content

Commit a6e905f

Browse files
rvdforstrvdforst
authored
Merge pull request #346 from RRZE-Webteam/dev
Dev
2 parents 1c9d080 + ef0c9a8 commit a6e905f

File tree

122 files changed

+762
-235
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+762
-235
lines changed

‎composer.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"name": "rrze/rrze-rsvp",
3-
"version": "2.11.3",
3+
"version": "2.11.4",
44
"require": {
5-
"cmb2/cmb2": "^2.10.0",
6-
"tecnickcom/tcpdf": "6.4.4"
5+
"cmb2/cmb2": "^2.10.1",
6+
"tecnickcom/tcpdf": "^6.6.5"
77
},
88
"autoload": {
99
"psr-4": {

‎includes/Actions.php

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ class Actions
1010

1111
protected $template;
1212

13+
protected $settings;
14+
15+
protected $options;
16+
1317
public function __construct()
1418
{
1519
$this->email = new Email;

‎includes/Auth/LDAP.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ public function getCustomerData(): array
8686

8787
public function login()
8888
{
89-
$username = filter_input(INPUT_POST, 'username', FILTER_SANITIZE_STRING);
90-
$username = ($username ? $username : filter_input(INPUT_GET, 'username', FILTER_SANITIZE_STRING));
91-
$password = filter_input(INPUT_POST, 'password', FILTER_SANITIZE_STRING);
92-
$password = ($password ? $password : filter_input(INPUT_GET, 'password', FILTER_SANITIZE_STRING));
89+
$username = sanitize_text_field($_POST['username'] ?? '');
90+
$username = $username ? $username : sanitize_text_field($_GET['username'] ?? '');
91+
$password = sanitize_text_field($_POST['password'] ?? '');
92+
$password = $password ? $password : sanitize_text_field($_GET['password'] ?? '');
9393

9494
if ($username && $password) {
9595
$this->connection = @ldap_connect($this->server, $this->port);

‎includes/CPT/Bookings.php

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
use RRZE\RSVP\Capabilities;
1212
use RRZE\RSVP\Functions;
1313
use function RRZE\RSVP\Config\isAllowedSearchForGuest;
14-
// use RRZE\RSVP\Carbon;
1514

1615
class Bookings
1716
{
@@ -317,8 +316,8 @@ public function addFilters($post_type)
317316
$sAllDates = __('Show all dates', 'rrze-rsvp');
318317
$sAllTimeslots = __('Show all time slots', 'rrze-rsvp');
319318
$sAllRoomes = __('Show all rooms', 'rrze-rsvp');
320-
$sSelectedDate = (string) filter_input(INPUT_GET, $this->sDate, FILTER_SANITIZE_STRING);
321-
$sSelectedTimeslot = (string) filter_input(INPUT_GET, $this->sTimeslot, FILTER_SANITIZE_STRING);
319+
$sSelectedDate = sanitize_text_field($_GET[$this->sDate] ?? '');
320+
$sSelectedTimeslot = sanitize_text_field($_GET[$this->sTimeslot] ?? '');
322321
$sSelectedRoom = (string) filter_input(INPUT_GET, $this->sRoom, FILTER_VALIDATE_INT);
323322

324323
// 1. get all booking IDs
@@ -381,8 +380,8 @@ private function getBookingIDsBySeatRoomTitle($sSearch)
381380
private function setFilterParams()
382381
{
383382
$this->filterRoomIDs = filter_input(INPUT_GET, $this->sRoom, FILTER_VALIDATE_INT);
384-
$this->filterDate = filter_input(INPUT_GET, $this->sDate, FILTER_SANITIZE_STRING);
385-
$filterTime = filter_input(INPUT_GET, $this->sTimeslot, FILTER_SANITIZE_STRING);
383+
$this->filterDate = sanitize_text_field($_GET[$this->sDate] ?? '');
384+
$filterTime = sanitize_text_field($_GET[$this->sTimeslot] ?? '');
386385
if ($filterTime) {
387386
$parts = explode(" - ", $filterTime);
388387
$this->filterStart = $parts[0];

‎includes/CPT/Seats.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function applyFilters($postType)
146146
}
147147

148148
$allRooms = __('Show all rooms', 'rrze-rsvp');
149-
$selectedRoom = (string) filter_input(INPUT_GET, 'rrze-rsvp-seat-room', FILTER_SANITIZE_STRING);
149+
$selectedRoom = sanitize_text_field($_GET['rrze-rsvp-seat-room'] ?? '');
150150

151151
$seatIds = get_posts([
152152
'post_type' => 'seat',

‎includes/Email.php

+2
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ class Email
2626
*/
2727
protected $isLocaleEnglish;
2828

29+
protected $settings;
30+
2931
/**
3032
* __construct
3133
*/

‎includes/Metaboxes.php

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
class Metaboxes
1111
{
12+
protected $settings;
13+
1214
public function __construct()
1315
{
1416
$this->settings = new Settings(plugin()->getFile());

‎includes/Schedule.php

+4
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ class Schedule
1818
*/
1919
protected $email;
2020

21+
protected $settings;
22+
23+
protected $options;
24+
2125
/**
2226
* __construct
2327
*/

‎includes/Settings.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ class Settings
7474
*/
7575
protected $settingsPrefix;
7676

77+
protected $optionsPage;
78+
7779
/**
7880
* Variablen Werte zuweisen.
7981
* @param string $pluginFile [description]
@@ -720,7 +722,7 @@ public function callbackSelect($args)
720722
*/
721723
public function callbackMultiSelect($args)
722724
{
723-
$value = $this->getOption($args['section'], $args['id'], $args['default']);
725+
$value = (array) $this->getOption($args['section'], $args['id'], $args['default']);
724726
$size = isset($args['size']) && !is_null($args['size']) ? $args['size'] : 'regular';
725727
$html = sprintf(
726728
'<select class="%1$s" id="%3$s-%4$s" name="%2$s[%3$s_%4$s][]" multiple="multiple">',

‎includes/Shortcodes/Availability.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
*/
1313
class Availability extends Shortcodes
1414
{
15-
private $shortcodesettings = '';
15+
protected $options;
16+
17+
protected $shortcodesettings = '';
1618

1719
public function __construct($settings)
1820
{

‎includes/Tracking.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ public function admin_page_tracking_form()
117117
echo '<h1>' . esc_html_x('Contact tracking', 'admin page title', 'rrze-rsvp') . '</h1>';
118118

119119
if (isset($_GET['submit'])) {
120-
$searchdate = filter_input(INPUT_GET, 'searchdate', FILTER_SANITIZE_STRING); // filter stimmt nicht
120+
$searchdate = sanitize_text_field($_GET['searchdate'] ?? '');
121121
$delta = filter_input(INPUT_GET, 'delta', FILTER_VALIDATE_INT, ['min_range' => 0]);
122122
$guest_email = filter_input(INPUT_GET, 'guest_email', FILTER_VALIDATE_EMAIL);
123123
$hash_guest_email = ($guest_email ? Functions::crypt($guest_email, 'encrypt') : '');
124-
$guest_phone = filter_input(INPUT_GET, 'guest_phone', FILTER_SANITIZE_STRING);
124+
$guest_phone = sanitize_text_field($_GET['guest_phone'] ?? '');
125125
$guest_phone = preg_replace('/[^0-9]/', '', $guest_phone);
126126
$hash_guest_phone = ($guest_phone ? Functions::crypt($guest_phone, 'encrypt') : '');
127127

@@ -181,10 +181,10 @@ public function admin_page_tracking_info()
181181

182182
public function tracking_csv_pull()
183183
{
184-
$searchdate = filter_input(INPUT_GET, 'searchdate', FILTER_SANITIZE_STRING); // filter stimmt nicht
184+
$searchdate = sanitize_text_field($_GET['searchdate'] ?? '');
185185
$delta = filter_input(INPUT_GET, 'delta', FILTER_VALIDATE_INT, ['min_range' => 0]);
186-
$hash_guest_email = filter_input(INPUT_GET, 'hash_guest_email', FILTER_SANITIZE_STRING);
187-
$hash_guest_phone = filter_input(INPUT_GET, 'hash_guest_phone', FILTER_SANITIZE_STRING);
186+
$hash_guest_email = sanitize_text_field($_GET['hash_guest_email'] ?? '');
187+
$hash_guest_phone = sanitize_text_field($_GET['hash_guest_phone'] ?? '');
188188

189189
$aGuests = Tracking::getUsersInRoomAtDate($searchdate, $delta, $hash_guest_email, $hash_guest_phone);
190190

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "rrze-rsvp",
3-
"version": "2.11.1",
3+
"version": "2.11.4",
44
"main": "rrze-rsvp.php",
55
"scripts": {
66
"start": "webpack --mode=development --watch",

‎rrze-rsvp.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
Plugin Name: RRZE RSVP
55
Plugin URI: https://github.com/RRZE-Webteam/rrze-rsvp
66
Description: FAU Reservation Tool
7-
Version: 2.11.3
7+
Version: 2.11.4
88
Author: RRZE-Webteam
99
Author URI: https://blogs.fau.de/webworking/
1010
License: GNU General Public License v2

‎vendor/autoload.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@
2222

2323
require_once __DIR__ . '/composer/autoload_real.php';
2424

25-
return ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5::getLoader();
25+
return ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41::getLoader();

‎vendor/composer/autoload_real.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// autoload_real.php @generated by Composer
44

5-
class ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5
5+
class ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41
66
{
77
private static $loader;
88

@@ -24,16 +24,16 @@ public static function getLoader()
2424

2525
require __DIR__ . '/platform_check.php';
2626

27-
spl_autoload_register(array('ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5', 'loadClassLoader'), true, true);
27+
spl_autoload_register(array('ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41', 'loadClassLoader'), true, true);
2828
self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
29-
spl_autoload_unregister(array('ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5', 'loadClassLoader'));
29+
spl_autoload_unregister(array('ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41', 'loadClassLoader'));
3030

3131
require __DIR__ . '/autoload_static.php';
32-
call_user_func(\Composer\Autoload\ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::getInitializer($loader));
32+
call_user_func(\Composer\Autoload\ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::getInitializer($loader));
3333

3434
$loader->register(true);
3535

36-
$filesToLoad = \Composer\Autoload\ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$files;
36+
$filesToLoad = \Composer\Autoload\ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$files;
3737
$requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
3838
if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
3939
$GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

‎vendor/composer/autoload_static.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace Composer\Autoload;
66

7-
class ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5
7+
class ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41
88
{
99
public static $files = array (
1010
'beb2970633d960a1478cd41d6deb1e45' => __DIR__ . '/..' . '/cmb2/cmb2/init.php',
@@ -47,9 +47,9 @@ class ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5
4747
public static function getInitializer(ClassLoader $loader)
4848
{
4949
return \Closure::bind(function () use ($loader) {
50-
$loader->prefixLengthsPsr4 = ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$prefixLengthsPsr4;
51-
$loader->prefixDirsPsr4 = ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$prefixDirsPsr4;
52-
$loader->classMap = ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$classMap;
50+
$loader->prefixLengthsPsr4 = ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$prefixLengthsPsr4;
51+
$loader->prefixDirsPsr4 = ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$prefixDirsPsr4;
52+
$loader->classMap = ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$classMap;
5353

5454
}, null, ClassLoader::class);
5555
}

‎vendor/composer/installed.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@
6464
},
6565
{
6666
"name": "tecnickcom/tcpdf",
67-
"version": "6.4.4",
68-
"version_normalized": "6.4.4.0",
67+
"version": "6.6.5",
68+
"version_normalized": "6.6.5.0",
6969
"source": {
7070
"type": "git",
7171
"url": "https://github.com/tecnickcom/TCPDF.git",
72-
"reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320"
72+
"reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce"
7373
},
7474
"dist": {
7575
"type": "zip",
76-
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/42cd0f9786af7e5db4fcedaa66f717b0d0032320",
77-
"reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320",
76+
"url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/5fce932fcee4371865314ab7f6c0d85423c5c7ce",
77+
"reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce",
7878
"shasum": ""
7979
},
8080
"require": {
8181
"php": ">=5.3.0"
8282
},
83-
"time": "2021-12-31T08:39:24+00:00",
83+
"time": "2023-09-06T15:09:26+00:00",
8484
"type": "library",
8585
"installation-source": "dist",
8686
"autoload": {
@@ -105,7 +105,7 @@
105105
},
106106
"notification-url": "https://packagist.org/downloads/",
107107
"license": [
108-
"LGPL-3.0-only"
108+
"LGPL-3.0-or-later"
109109
],
110110
"authors": [
111111
{
@@ -127,7 +127,7 @@
127127
],
128128
"support": {
129129
"issues": "https://github.com/tecnickcom/TCPDF/issues",
130-
"source": "https://github.com/tecnickcom/TCPDF/tree/6.4.4"
130+
"source": "https://github.com/tecnickcom/TCPDF/tree/6.6.5"
131131
},
132132
"funding": [
133133
{

‎vendor/composer/installed.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php return array(
22
'root' => array(
33
'name' => 'rrze/rrze-rsvp',
4-
'pretty_version' => '2.10.1',
5-
'version' => '2.10.1.0',
4+
'pretty_version' => '2.11.3',
5+
'version' => '2.11.3.0',
66
'reference' => null,
77
'type' => 'library',
88
'install_path' => __DIR__ . '/../../',
@@ -20,18 +20,18 @@
2020
'dev_requirement' => false,
2121
),
2222
'rrze/rrze-rsvp' => array(
23-
'pretty_version' => '2.10.1',
24-
'version' => '2.10.1.0',
23+
'pretty_version' => '2.11.3',
24+
'version' => '2.11.3.0',
2525
'reference' => null,
2626
'type' => 'library',
2727
'install_path' => __DIR__ . '/../../',
2828
'aliases' => array(),
2929
'dev_requirement' => false,
3030
),
3131
'tecnickcom/tcpdf' => array(
32-
'pretty_version' => '6.4.4',
33-
'version' => '6.4.4.0',
34-
'reference' => '42cd0f9786af7e5db4fcedaa66f717b0d0032320',
32+
'pretty_version' => '6.6.5',
33+
'version' => '6.6.5.0',
34+
'reference' => '5fce932fcee4371865314ab7f6c0d85423c5c7ce',
3535
'type' => 'library',
3636
'install_path' => __DIR__ . '/../tecnickcom/tcpdf',
3737
'aliases' => array(),

‎vendor/tecnickcom/tcpdf/CHANGELOG.TXT

+52
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,55 @@
1+
6.6.5 (2023-09-06)
2+
- Fix corrupted file.
3+
4+
6.6.4 (2023-09-06)
5+
- Fix GitHub automation tests.
6+
7+
6.6.3 (2023-09-06)
8+
- Fix SPDX license ID (#591)
9+
- Fix warning "array offset on value of type null" (#620)
10+
- Improve the README about the status of this library (#589)
11+
- Fix deprecation warning with PHP 8.1 (#614)
12+
- Fixes for PHP 8.2 in tcpdf_fonts.php (#632)
13+
- Fix some php 8+ edge cases (#630)
14+
- Fix composite glyph output (#581)
15+
- Fix "access array offset on value of type bool" with PDF/A (#583)
16+
- Fix non-numeric value warning (#627)
17+
- Fix issues with S25 barcode (#611)
18+
- Fix return type annotations (#613)
19+
- Fix some inconsistencies in type hints (#598)
20+
21+
6.6.2 (2022-12-17)
22+
- Ensure pregSplit return type is always array.
23+
- Add ability to run tests on various operating systems (#566)
24+
- Avoid a deprecated error from PHP8.1 (#573)
25+
26+
6.6.1 (2022-12-12)
27+
- Add PHPStan and fix level 1 errors (#307)
28+
29+
6.6.0 (2022-12-06)
30+
- Multi-byte character support for filename during output (#561). (#562)
31+
- Fix garbage collection (#509)
32+
- FIX: PDF417 corrupt output problem, solution set bcmath scale parameter to zero (#534)
33+
- Fix TypeError: count() in PHP8 (#556)
34+
- Fix-getHTMLFontUnits (#547)
35+
- Improved embedded image in HTML allowing src="data:..." format (#552)
36+
- Fix image abscissa when in RTL (#510)
37+
- fix: php 8.1 notices (#548)
38+
- Optimize PNG files (#563)
39+
- Update documentation for a known issue. (#569)
40+
- Fix for PHP 8.1 (#571)
41+
42+
6.5.0 (2022-08-12)
43+
- encodeUrlQuery takes into account the port (#493)
44+
- Fixing undefined offset error in writeHTML() when last DOM element ha…
45+
- correct some type hints (#495)
46+
- fix: php 8.1 notices (#481)
47+
- Fixed: null check for PHP 8.1 (#476)
48+
- Fix Infinite Loop in Multicell with Auto Page Breaks Off (#473)
49+
- GetCssBorderStyle Has Problem When !important Is Specified (#467)
50+
- Support Apache 2.4 directives in htaccess file (#530)
51+
- Remove examples from dist package (#542)
52+
153
6.4.4 (2021-12-31)
254
- PHP 8.1 fixes
355

‎vendor/tecnickcom/tcpdf/LICENSE.TXT

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
published by the Free Software Foundation, either version 3 of the
88
License, or (at your option) any later version.
99

10-
2002-2019 Nicola Asuni - Tecnick.com LTD
10+
2002-2023 Nicola Asuni - Tecnick.com LTD
1111

1212
**********************************************************************
1313
**********************************************************************

0 commit comments

Comments
 (0)