Merge branch 'main' into issue-3911issue-3911

8 files changed, 19 insertions, 16 deletions

diff --git a/lib/cronjobs/check_admission.class.php b/lib/cronjobs/check_admission.php
index dfd493c..1be4c09 100644
--- a/lib/cronjobs/check_admission.class.php
+++ b/lib/cronjobs/check_admission.php
@@ -4,7 +4,7 @@ use Monolog\Logger;
 use Monolog\Handler\StreamHandler;
 
 /**
-* check_admission.class.php
+* check_admission.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
@@ -49,7 +49,7 @@ class CheckAdmissionJob extends CronJob
 
     public function setUp()
     {
-        require_once 'lib/classes/admission/CourseSet.class.php';
+        require_once 'lib/classes/admission/CourseSet.php';
         if (empty($GLOBALS['ABSOLUTE_URI_STUDIP'])) {
             throw new Exception('To use check_admission job you MUST set correct values for $ABSOLUTE_URI_STUDIP in config_local.inc.php!');
         }
diff --git a/lib/cronjobs/cleanup_log.class.php b/lib/cronjobs/cleanup_log.php
index 378a6ec..e88f803 100644
--- a/lib/cronjobs/cleanup_log.class.php
+++ b/lib/cronjobs/cleanup_log.php
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// cleanup_log.class.php
+// cleanup_log.php
 //
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
@@ -28,7 +28,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class CleanupLogJob extends CronJob
 {
diff --git a/lib/cronjobs/garbage_collector.class.php b/lib/cronjobs/garbage_collector.php
index 13d3029..eba57fc 100644
--- a/lib/cronjobs/garbage_collector.class.php
+++ b/lib/cronjobs/garbage_collector.php
@@ -1,12 +1,12 @@
 <?php
 /**
-* garbage_collector.class.php
+* garbage_collector.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
 * @since  2.4
 */
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class GarbageCollectorJob extends CronJob
 {
@@ -162,7 +162,7 @@ class GarbageCollectorJob extends CronJob
         ]);
 
         // clean db cache
-        $cache = new StudipDbCache();
+        $cache = new Studip\Cache\DbCache();
         $cache->purge();
 
         // Remove old plugin assets
@@ -195,5 +195,8 @@ class GarbageCollectorJob extends CronJob
             'mkdate < UNIX_TIMESTAMP() - ?',
             [TFASecret::getGreatestValidityDuration()]
         );
+
+        // Remove expired solved captcha challenges
+        CaptchaChallenge::gc();
     }
 }
diff --git a/lib/cronjobs/purge_cache.class.php b/lib/cronjobs/purge_cache.php
index 4e5682f..2e253e1 100644
--- a/lib/cronjobs/purge_cache.class.php
+++ b/lib/cronjobs/purge_cache.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * purge_cache.class.php - Purges the file cache.
+ * purge_cache.php - Purges the file cache.
  * 
  * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
  * @author Jan-Hendrik Willms <tleilax+studip@gmail.com>
@@ -10,7 +10,7 @@
 
 // +---------------------------------------------------------------------------+
 // This file is part of Stud.IP
-// purge_cache.class.php
+// purge_cache.php
 // 
 // Copyright (C) 2013 Jan-Hendrik Willms <tleilax+studip@gmail.com>
 // +---------------------------------------------------------------------------+
@@ -28,7 +28,7 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // +---------------------------------------------------------------------------+
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class PurgeCacheJob extends CronJob
 {
@@ -70,7 +70,7 @@ class PurgeCacheJob extends CronJob
      */
     public function setUp()
     {
-        require_once 'lib/classes/StudipFileCache.class.php';
+        require_once 'lib/classes/cache/FileCache.php';
     }
 
     /**
@@ -86,7 +86,7 @@ class PurgeCacheJob extends CronJob
      */
     public function execute($last_result, $parameters = [])
     {
-        $cache = new StudipFileCache();
+        $cache = new \Studip\Cache\FileCache();
         $cache->purge(empty($parameters['verbose']));
     }
 }
diff --git a/lib/cronjobs/remind_oer_upload.class.php b/lib/cronjobs/remind_oer_upload.php
index a1a8ee1..528d789 100644
--- a/lib/cronjobs/remind_oer_upload.class.php
+++ b/lib/cronjobs/remind_oer_upload.php
@@ -1,13 +1,13 @@
 <?php
 /**
- * remind_oer_upload.class.php - Sends reminder emails for uploading files to OER Campus.
+ * remind_oer_upload.php - Sends reminder emails for uploading files to OER Campus.
  *
  * @author Michaela Brückner <brueckner@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
  * @access public
  * @since  5.2
  */
 
-require_once 'lib/classes/CronJob.class.php';
+require_once 'lib/classes/CronJob.php';
 
 class RemindOerUpload extends CronJob
 {
diff --git a/lib/cronjobs/send_mail_notifications.class.php b/lib/cronjobs/send_mail_notifications.php
index 5565218..5565218 100644
--- a/lib/cronjobs/send_mail_notifications.class.php
+++ b/lib/cronjobs/send_mail_notifications.php
diff --git a/lib/cronjobs/send_mail_queue.class.php b/lib/cronjobs/send_mail_queue.php
index 8f72918..f9cdd94 100644
--- a/lib/cronjobs/send_mail_queue.class.php
+++ b/lib/cronjobs/send_mail_queue.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* send_mail_queue.class.php
+* send_mail_queue.php
 *
 * @author Rasmus Fuhse <fuhse@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public
diff --git a/lib/cronjobs/session_gc.class.php b/lib/cronjobs/session_gc.php
index 4289a29..54763ee 100644
--- a/lib/cronjobs/session_gc.class.php
+++ b/lib/cronjobs/session_gc.php
@@ -1,6 +1,6 @@
 <?php
 /**
-* session_gc.class.php
+* session_gc.php
 *
 * @author André Noack <noack@data-quest.de>, Suchi & Berg GmbH <info@data-quest.de>
 * @access public