Merge pull request #346 from RRZE-Webteam/dev

Dev
RRZE-Webteam · Feb 27, 2024 · a6e905f · a6e905f
2 parents 1c9d080 + ef0c9a8
commit a6e905f
Show file tree

Hide file tree

Showing 122 changed files with 762 additions and 235 deletions.
diff --git a/composer.json b/composer.json
@@ -1,9 +1,9 @@
 {
     "name": "rrze/rrze-rsvp",
-    "version": "2.11.3",
+    "version": "2.11.4",
     "require": {
-        "cmb2/cmb2": "^2.10.0",
-        "tecnickcom/tcpdf": "6.4.4"
+        "cmb2/cmb2": "^2.10.1",
+        "tecnickcom/tcpdf": "^6.6.5"
     },
     "autoload": {
         "psr-4": {

diff --git a/includes/Actions.php b/includes/Actions.php
@@ -10,6 +10,10 @@ class Actions
 
 	protected $template;
 
+    protected $settings;
+
+    protected $options;
+
 	public function __construct()
 	{
 		$this->email = new Email;

diff --git a/includes/Auth/LDAP.php b/includes/Auth/LDAP.php
@@ -86,10 +86,10 @@ public function getCustomerData(): array
 
     public function login()
     {
-        $username = filter_input(INPUT_POST, 'username', FILTER_SANITIZE_STRING);
-        $username = ($username ? $username : filter_input(INPUT_GET, 'username', FILTER_SANITIZE_STRING));
-        $password = filter_input(INPUT_POST, 'password', FILTER_SANITIZE_STRING);
-        $password = ($password ? $password : filter_input(INPUT_GET, 'password', FILTER_SANITIZE_STRING));
+        $username = sanitize_text_field($_POST['username'] ?? '');
+        $username = $username ? $username : sanitize_text_field($_GET['username'] ?? '');
+        $password = sanitize_text_field($_POST['password'] ?? '');
+        $password = $password ? $password : sanitize_text_field($_GET['password'] ?? '');
 
         if ($username && $password) {
             $this->connection = @ldap_connect($this->server, $this->port);

diff --git a/includes/CPT/Bookings.php b/includes/CPT/Bookings.php
@@ -11,7 +11,6 @@
 use RRZE\RSVP\Capabilities;
 use RRZE\RSVP\Functions;
 use function RRZE\RSVP\Config\isAllowedSearchForGuest;
-// use RRZE\RSVP\Carbon;
 
 class Bookings
 {
@@ -317,8 +316,8 @@ public function addFilters($post_type)
         $sAllDates = __('Show all dates', 'rrze-rsvp');
         $sAllTimeslots = __('Show all time slots', 'rrze-rsvp');
         $sAllRoomes = __('Show all rooms', 'rrze-rsvp');
-        $sSelectedDate = (string) filter_input(INPUT_GET, $this->sDate, FILTER_SANITIZE_STRING);
-        $sSelectedTimeslot = (string) filter_input(INPUT_GET, $this->sTimeslot, FILTER_SANITIZE_STRING);
+        $sSelectedDate = sanitize_text_field($_GET[$this->sDate] ?? '');
+        $sSelectedTimeslot = sanitize_text_field($_GET[$this->sTimeslot] ?? '');
         $sSelectedRoom = (string) filter_input(INPUT_GET, $this->sRoom, FILTER_VALIDATE_INT);
 
         // 1. get all booking IDs
@@ -381,8 +380,8 @@ private function getBookingIDsBySeatRoomTitle($sSearch)
     private function setFilterParams()
     {
         $this->filterRoomIDs = filter_input(INPUT_GET, $this->sRoom, FILTER_VALIDATE_INT);
-        $this->filterDate = filter_input(INPUT_GET, $this->sDate, FILTER_SANITIZE_STRING);
-        $filterTime = filter_input(INPUT_GET, $this->sTimeslot, FILTER_SANITIZE_STRING);
+        $this->filterDate = sanitize_text_field($_GET[$this->sDate] ?? '');
+        $filterTime = sanitize_text_field($_GET[$this->sTimeslot] ?? '');
         if ($filterTime) {
             $parts = explode(" - ", $filterTime);
             $this->filterStart = $parts[0];

diff --git a/includes/CPT/Seats.php b/includes/CPT/Seats.php
@@ -146,7 +146,7 @@ public function applyFilters($postType)
 		}
 
 		$allRooms = __('Show all rooms', 'rrze-rsvp');
-		$selectedRoom = (string) filter_input(INPUT_GET, 'rrze-rsvp-seat-room', FILTER_SANITIZE_STRING);
+		$selectedRoom = sanitize_text_field($_GET['rrze-rsvp-seat-room'] ?? '');
 
 		$seatIds = get_posts([
 			'post_type' => 'seat',

diff --git a/includes/Email.php b/includes/Email.php
@@ -26,6 +26,8 @@ class Email
      */
     protected $isLocaleEnglish;
 
+    protected $settings;
+
     /**
      * __construct
      */

diff --git a/includes/Metaboxes.php b/includes/Metaboxes.php
@@ -9,6 +9,8 @@
 
 class Metaboxes
 {
+    protected $settings;
+
     public function __construct()
     {
         $this->settings = new Settings(plugin()->getFile());

diff --git a/includes/Schedule.php b/includes/Schedule.php
@@ -18,6 +18,10 @@ class Schedule
      */
     protected $email;
 
+    protected $settings;
+
+    protected $options;
+
     /**
      * __construct
      */

diff --git a/includes/Settings.php b/includes/Settings.php
@@ -74,6 +74,8 @@ class Settings
      */
     protected $settingsPrefix;
 
+    protected $optionsPage;
+
     /**
      * Variablen Werte zuweisen.
      * @param string $pluginFile [description]
@@ -720,7 +722,7 @@ public function callbackSelect($args)
      */
     public function callbackMultiSelect($args)
     {
-        $value = $this->getOption($args['section'], $args['id'], $args['default']);
+        $value = (array) $this->getOption($args['section'], $args['id'], $args['default']);
         $size  = isset($args['size']) && !is_null($args['size']) ? $args['size'] : 'regular';
         $html  = sprintf(
             '<select class="%1$s" id="%3$s-%4$s" name="%2$s[%3$s_%4$s][]" multiple="multiple">',

diff --git a/includes/Shortcodes/Availability.php b/includes/Shortcodes/Availability.php
@@ -12,7 +12,9 @@
  */
 class Availability extends Shortcodes
 {
-    private $shortcodesettings = '';
+    protected $options;
+
+    protected $shortcodesettings = '';
 
     public function __construct($settings)
     {

diff --git a/includes/Tracking.php b/includes/Tracking.php
@@ -117,11 +117,11 @@ public function admin_page_tracking_form()
         echo '<h1>' . esc_html_x('Contact tracking', 'admin page title', 'rrze-rsvp') . '</h1>';
 
         if (isset($_GET['submit'])) {
-            $searchdate = filter_input(INPUT_GET, 'searchdate', FILTER_SANITIZE_STRING); // filter stimmt nicht
+            $searchdate = sanitize_text_field($_GET['searchdate'] ?? '');
             $delta = filter_input(INPUT_GET, 'delta', FILTER_VALIDATE_INT, ['min_range' => 0]);
             $guest_email = filter_input(INPUT_GET, 'guest_email', FILTER_VALIDATE_EMAIL);
             $hash_guest_email = ($guest_email ? Functions::crypt($guest_email, 'encrypt') : '');
-            $guest_phone = filter_input(INPUT_GET, 'guest_phone', FILTER_SANITIZE_STRING);
+            $guest_phone = sanitize_text_field($_GET['guest_phone'] ?? '');
             $guest_phone = preg_replace('/[^0-9]/', '', $guest_phone);
             $hash_guest_phone = ($guest_phone ? Functions::crypt($guest_phone, 'encrypt') : '');
 
@@ -181,10 +181,10 @@ public function admin_page_tracking_info()
 
     public function tracking_csv_pull()
     {
-        $searchdate = filter_input(INPUT_GET, 'searchdate', FILTER_SANITIZE_STRING); // filter stimmt nicht
+        $searchdate = sanitize_text_field($_GET['searchdate'] ?? '');
         $delta = filter_input(INPUT_GET, 'delta', FILTER_VALIDATE_INT, ['min_range' => 0]);
-        $hash_guest_email = filter_input(INPUT_GET, 'hash_guest_email', FILTER_SANITIZE_STRING);
-        $hash_guest_phone = filter_input(INPUT_GET, 'hash_guest_phone', FILTER_SANITIZE_STRING);
+        $hash_guest_email = sanitize_text_field($_GET['hash_guest_email'] ?? '');
+        $hash_guest_phone = sanitize_text_field($_GET['hash_guest_phone'] ?? '');
 
         $aGuests = Tracking::getUsersInRoomAtDate($searchdate, $delta, $hash_guest_email, $hash_guest_phone);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rrze-rsvp",
-    "version": "2.11.1",
+    "version": "2.11.4",
     "main": "rrze-rsvp.php",
     "scripts": {
         "start": "webpack --mode=development --watch",

diff --git a/rrze-rsvp.php b/rrze-rsvp.php
@@ -4,7 +4,7 @@
 Plugin Name:     RRZE RSVP
 Plugin URI:      https://github.com/RRZE-Webteam/rrze-rsvp
 Description:     FAU Reservation Tool
-Version:         2.11.3
+Version:         2.11.4
 Author:          RRZE-Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License v2

diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -22,4 +22,4 @@
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5::getLoader();
+return ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41::getLoader();
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5
+class ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41
 {
     private static $loader;
 
@@ -24,16 +24,16 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInit054facfc9bc4fec553c9ce2df648c3a5', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderIniteb38d2a4fe1cc61870b3ca588e7feb41', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::getInitializer($loader));
 
         $loader->register(true);
 
-        $filesToLoad = \Composer\Autoload\ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$files;
+        $filesToLoad = \Composer\Autoload\ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$files;
         $requireFile = \Closure::bind(static function ($fileIdentifier, $file) {
             if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
                 $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5
+class ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41
 {
     public static $files = array (
         'beb2970633d960a1478cd41d6deb1e45' => __DIR__ . '/..' . '/cmb2/cmb2/init.php',
@@ -47,9 +47,9 @@ class ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInit054facfc9bc4fec553c9ce2df648c3a5::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticIniteb38d2a4fe1cc61870b3ca588e7feb41::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -64,23 +64,23 @@
         },
         {
             "name": "tecnickcom/tcpdf",
-            "version": "6.4.4",
-            "version_normalized": "6.4.4.0",
+            "version": "6.6.5",
+            "version_normalized": "6.6.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320"
+                "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/42cd0f9786af7e5db4fcedaa66f717b0d0032320",
-                "reference": "42cd0f9786af7e5db4fcedaa66f717b0d0032320",
+                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/5fce932fcee4371865314ab7f6c0d85423c5c7ce",
+                "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
-            "time": "2021-12-31T08:39:24+00:00",
+            "time": "2023-09-06T15:09:26+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -105,7 +105,7 @@
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
-                "LGPL-3.0-only"
+                "LGPL-3.0-or-later"
             ],
             "authors": [
                 {
@@ -127,7 +127,7 @@
             ],
             "support": {
                 "issues": "https://github.com/tecnickcom/TCPDF/issues",
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.4.4"
+                "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.5"
             },
             "funding": [
                 {

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'rrze/rrze-rsvp',
-        'pretty_version' => '2.10.1',
-        'version' => '2.10.1.0',
+        'pretty_version' => '2.11.3',
+        'version' => '2.11.3.0',
         'reference' => null,
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -20,18 +20,18 @@
             'dev_requirement' => false,
         ),
         'rrze/rrze-rsvp' => array(
-            'pretty_version' => '2.10.1',
-            'version' => '2.10.1.0',
+            'pretty_version' => '2.11.3',
+            'version' => '2.11.3.0',
             'reference' => null,
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'tecnickcom/tcpdf' => array(
-            'pretty_version' => '6.4.4',
-            'version' => '6.4.4.0',
-            'reference' => '42cd0f9786af7e5db4fcedaa66f717b0d0032320',
+            'pretty_version' => '6.6.5',
+            'version' => '6.6.5.0',
+            'reference' => '5fce932fcee4371865314ab7f6c0d85423c5c7ce',
             'type' => 'library',
             'install_path' => __DIR__ . '/../tecnickcom/tcpdf',
             'aliases' => array(),

diff --git a/vendor/tecnickcom/tcpdf/CHANGELOG.TXT b/vendor/tecnickcom/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,55 @@
+6.6.5 (2023-09-06)
+	- Fix corrupted file.
+
+6.6.4 (2023-09-06)
+	- Fix GitHub automation tests.
+
+6.6.3 (2023-09-06)
+	- Fix SPDX license ID (#591)
+	- Fix warning "array offset on value of type null" (#620)
+	- Improve the README about the status of this library (#589)
+	- Fix deprecation warning with PHP 8.1 (#614)
+	- Fixes for PHP 8.2 in tcpdf_fonts.php (#632)
+	- Fix some php 8+ edge cases (#630)
+	- Fix composite glyph output (#581)
+	- Fix "access array offset on value of type bool" with PDF/A (#583)
+	- Fix non-numeric value warning (#627)
+	- Fix issues with S25 barcode (#611)
+	- Fix return type annotations (#613)
+	- Fix some inconsistencies in type hints (#598)
+
+6.6.2 (2022-12-17)
+	- Ensure pregSplit return type is always array.
+	- Add ability to run tests on various operating systems (#566)
+	- Avoid a deprecated error from PHP8.1 (#573)
+
+6.6.1 (2022-12-12)
+	- Add PHPStan and fix level 1 errors (#307)
+
+6.6.0 (2022-12-06)
+	- Multi-byte character support for filename during output (#561). (#562)
+	- Fix garbage collection (#509)
+	- FIX: PDF417 corrupt output problem, solution set bcmath scale parameter to zero (#534)
+	- Fix TypeError: count() in PHP8 (#556)
+	- Fix-getHTMLFontUnits (#547)
+	- Improved embedded image in HTML allowing src="data:..." format (#552)
+	- Fix image abscissa when in RTL (#510)
+	- fix: php 8.1 notices (#548)
+	- Optimize PNG files (#563)
+	- Update documentation for a known issue. (#569)
+	- Fix for PHP 8.1 (#571)
+
+6.5.0 (2022-08-12)
+	- encodeUrlQuery takes into account the port (#493)
+	- Fixing undefined offset error in writeHTML() when last DOM element ha…
+	- correct some type hints (#495)
+	- fix: php 8.1 notices (#481)
+	- Fixed: null check for PHP 8.1 (#476)
+	- Fix Infinite Loop in Multicell with Auto Page Breaks Off (#473)
+	- GetCssBorderStyle Has Problem When !important Is Specified (#467)
+	- Support Apache 2.4 directives in htaccess file (#530)
+	- Remove examples from dist package (#542)
+
 6.4.4 (2021-12-31)
 	- PHP 8.1 fixes
 

diff --git a/vendor/tecnickcom/tcpdf/LICENSE.TXT b/vendor/tecnickcom/tcpdf/LICENSE.TXT
@@ -7,7 +7,7 @@
   published by the Free Software Foundation, either version 3 of the
   License, or (at your option) any later version.
 
-  2002-2019 Nicola Asuni - Tecnick.com LTD
+  2002-2023 Nicola Asuni - Tecnick.com LTD
 
 **********************************************************************
 **********************************************************************