.gitlab-ci.yml

@@ -252,7 +252,8 @@ test-functional:
     <<: *composer-cache
     policy: pull
   services:
-    - mariadb
+    - name: mariadb
+      command: ["--sql_mode="]
   allow_failure: false
   interruptible: true
   before_script:
@@ -276,7 +277,8 @@ test-jsonapi:
     <<: *composer-cache
     policy: pull
   services:
-    - mariadb
+    - name: mariadb
+      command: ["--sql_mode="]
   variables:
     JSONAPI_XML_REPORT: $REPORT_DIR/jsonapi-report.xml
   interruptible: true
@@ -310,7 +312,8 @@ test-e2e:
   #  needs: [lint-css, lint-js, lint-php]
   image: mcr.microsoft.com/playwright:v1.33.0-jammy
   services:
-    - mariadb
+    - name: mariadb
+      command: ["--sql_mode="]
   variables:
     PHP_WEBSERVER_URL: localhost:65432
     E2E_REPORT: $REPORT_DIR/e2e.xml

.gitlab/scripts/install_db.sh

 #!/bin/bash
 set -e
 
-if [ $(mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "show tables;" --batch | wc -l) -eq 0 ]; then
+if [ $(mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE -e "show tables;" --batch | wc -l) -eq 0 ]; then
 
     # Setup mysql database
     echo "INSTALL DB"
-    mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip.sql
+    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip.sql
     echo "INSTALL DEFAULT DATA"
-    mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_default_data.sql
-    mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_default_data.sql
+    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_default_data.sql
+    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_default_data.sql
 
     echo "INSTALL ROOTUSER"
-    mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_root_user.sql
+    mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_root_user.sql
 
     # Check if demodata is required
     if [ ! -z $DEMO_DATA ]; then
         echo "INSTALL DEMODATA"
-        mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_demo_data.sql
+        mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_demo_data.sql
         echo "INSTALL MVV_DEMODATA"
-        mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_mvv_demo_data.sql
+        mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_mvv_demo_data.sql
         echo "INSTALL RESOURCES-DEMODATA"
-        mysql -f -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_demo_data.sql
+        mysql -u $MYSQL_USER -h $MYSQL_HOST -p$MYSQL_PASSWORD $MYSQL_DATABASE < ./db/studip_resources_demo_data.sql
     fi
 
     echo "INSTALLATION FINISHED"

ChangeLog.md

+# 02.11.2023 v 5.3.3
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.3.3&state=all
+- CKEditor mit mehrsprachiger Eingabe: Toolbar bricht um [#2471]
+- Sidebar rutscht beim Öffnen von Dialogen nach unten [#2929]
+- Positionierung der Sidebar beim Scrollen gelegentlich falsch [#2930]
+- Sidebar rutscht beim Anspringen von Elementen auf der Seite nach unten [#2934]
+- Sidebar nur auf der Veranstaltungsübersicht für Admins/Roots scrollbar machen, falls sie zu lang ist [#2936]
+- CKEditor: zweite Zeile der Toolbar hat Abstand nach links [#3211]
+- CKEditor: Toolbar läuft nach links aus dem Eingabefeld hinaus [#3212]
+- PHP-Warnungen in der Detailansicht von Studiengruppen [#3308]
+- Fragebögen: linke Navigation schiebt sich aus dem Dialog heraus [#3330]
+- Mathematische Formel wird in den Ankündigungen nicht/falsch gerendert [#3362]
+- Zusatzangaben: Fehler beim Löschen von Eingaben [#3368]
+- Fehlermeldung TypeError: this.initialNavigation is null auf Seiten, die sich nicht in die Navigation einhängen [#3399]
+- Fatal Error in ResponsiveHelper, leere Anzeige auf allen Seiten [#3403]
+
+# 02.11.2023 v 5.2.5
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.2.5&state=all
+- Paket league/oauth2-server sollte aufgrund eines Sicherheitsupdate aktualisiert werden [#3334]
+- Nicht mehr verwendete JS-Dateien der Ankündigungen entfernen [#3351]
+- XSS-Schwachstelle bei der globalen Suche [#3353]
+
+# 01.11.2023 v 5.1.6
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.1.6&state=all
+- Insecure header validation in slim/psr7 [#3304]
+
+# 01.11.2023 v 5.0.8
+
+https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.0.8&state=all
+- Dateibereich: „Im OER Campus veröffentlichen“ wird angezeigt, obwohl der OER-Campus erst ab einer höheren Rechtestufe verfügbar ist [#2638]
+- Raumverwaltung: Fehler beim Hinzufügen von Dokumenten zu Räumen [#2829]
+- Hauptnavigation: Größeres Logo macht Probleme [#2920]
+- Kopierte Fragebögen sollen mit „[Kopie]“ am Ende des Titels gekennzeichnet werden [#3198]
+- Tutor kann Dozenten austragen [#3250]
+- Wert von meta.page.total in der Route /users ist falsch [#3281]
+- Ressourcenverwaltung: Löschen eines Attributs löscht die Werte nicht aus der DB [#3282]
+- Fatal Error bei Anzeige von Trails_RoutingError [#3284]
+- code injection in phpxmlrpc/phpxmlrpc [#3299]
+- XML-RPC for PHP allows access to local files via malicious argument to the Client::send method [#3300]
+- XML-RPC for PHP's `Wrapper::buildClientWrapperCode` method allows code injection via malicious `$client` argument [#3301]
+- XML-RPC for PHP's debugger vulnerable to possible XSS attack [#3302]
+- phpxmlrpc vulnerable to argument injection [#3303]
+- Regular Expression Denial of Service (ReDoS) in lodash [#3305]
+- Command Injection in lodash [#3306]
+- CLI-Skript db:migrate-engine wirft einen Fatal Error am Ende [#3335]
+- JSON-API: Abfrage nach Gruppen in einer Einrichtung liefert defekten self-Link [#3357]
+- Bearbeiten von Raumanfragen öffnet sich nicht in einem Dialog [#3363]
+- fehlendes Escaping bei der Anzeige in der globalen Suche [#3366]
+- Mail schreiben: QuickSearch zur Empfängersuche erhält alle Felder des Dialoges [#3381]
+- Admins mit admin-Rechten in der Raumverwaltung sehen eine Exception in der Übersicht der Raumverwaltung, wenn es eine freie Raumanfrage (ohne Veranstaltungsbezug) gibt [#3385]
+- public/assets/images/oernds_oer_use_blue.svg wird nicht verwendet [#3389]
+- Migration von 5.0 auf 5.4: Base table or view not found: 1051 Unknown table 'studip_test54.globalsearch_buzzwords' [#3407]
+- JSZip-Version ist zu alt [#3410]
+
 # 04.10.2023 v 5.3.2
 
 https://gitlab.studip.de/studip/studip/-/issues?milestone_title=Stud.IP+5.3.2&state=all

app/controllers/questionnaire.php

@@ -204,6 +204,7 @@ class QuestionnaireController extends AuthenticatedController
         }
         $this->questionnaire = new Questionnaire();
         $this->questionnaire->setData($this->old_questionnaire->toArray());
+        $this->questionnaire->title .= sprintf(' [%s]', _('Kopie'));
         $this->questionnaire->setId($this->questionnaire->getNewId());
         $this->questionnaire['user_id'] = $GLOBALS['user']->id;
         $this->questionnaire['startdate'] = null;

config/.htaccess.dist

@@ -4,15 +4,11 @@
 #RewriteRule ^download/(normal|force_download|zip)/([0-467])/([^/]+)/(.+)$ sendfile.php?$1=1&type=$2&file_id=$3&file_name=$4 [L,B]
 #RewriteRule ^download/(normal|force_download|zip)/5/([^/]+)/([^/]+)/(.+)$ sendfile.php?$1=1&type=5&range_id=$2&list_id=$3&file_name=$4 [L,B]
 
-#Apache 2.2
-#Order Allow,Deny
-#Allow from all
-
 #Apache 2.4
 Require all granted
 
-php_value upload_max_filesize 8M
-php_value post_max_size 9M
+php_value upload_max_filesize 250M
+php_value post_max_size 250M
 php_value memory_limit 128M
 php_value max_execution_time 300
 php_flag short_open_tag On
@@ -23,6 +19,3 @@ php_value max_input_vars 10000
 # 22519 = E_ALL & ~(E_NOTICE|E_DEPRECATED) PHP 5.3.x
 php_value error_reporting 22519
 
-# PHP 5.5 (ab 5.6 Standardeinstellung)
-php_value default_charset utf-8
-php_value mbstring.internal_encoding utf-8

config/config.inc.php.dist

@@ -69,7 +69,7 @@ $UNI_URL = "http://www.studip.de";
 $UNI_LOGIN_ADD='';
 $UNI_LOGOUT_ADD=sprintf(_("Und hier geht's zur %sStud.IP Portalseite%s&nbsp;"), "<a href=\"http://www.studip.de\"><b>", "</b></a>");
 $UNI_CONTACT = "<please insert your general contact mail-adress here>";
-$UNI_INFO = "Stud.IP 5.1 - Studienbegleitender Internetsupport von Präsenzlehre";
+$UNI_INFO = "Stud.IP 5.4 - Studienbegleitender Internetsupport von Präsenzlehre";
 
 
 /* $SEM_CLASS and $SEM_TYPE configuration moved to database
@@ -264,6 +264,7 @@ $SYMBOL_SHORT = array(
 this options are only needed, if you are using the addional Stud.IP modules (please see in config_local.inc.php
 which modules are activated). It's a good idea to leave this settings untouched...*/
 
+
 /*
  * use this to customize the fields shown in the standard/extended view on the instiute member page
  * valid values are 'raum', 'sprechzeiten', 'telefon', 'email', 'homepage' and userinstrole datafield ids

config/studip-httpd.conf.dist

@@ -11,15 +11,10 @@
     #RewriteRule ^download/(normal|force_download|zip)/([0-467])/([^/]+)/(.+)$ /studip/sendfile.php?$1=1&type=$2&file_id=$3&file_name=$4 [L]
     #RewriteRule ^download/(normal|force_download|zip)/5/([^/]+)/([^/]+)/(.+)$ /studip/sendfile.php?$1=1&type=5&range_id=$2&list_id=$3&file_name=$4 [L]
 
-    #Apache 2.2
-    #Order Allow,Deny
-    #Allow from all
-
-    #Apache 2.4
     Require all granted
 
-    php_value upload_max_filesize 8M
-    php_value post_max_size 9M
+    php_value upload_max_filesize 250M
+    php_value post_max_size 250M
     php_value memory_limit 128M
     php_value max_execution_time 300
     php_flag short_open_tag On
@@ -29,8 +24,4 @@
     # 22519 = E_ALL & ~(E_NOTICE|E_DEPRECATED) PHP 5.3.x
     php_value error_reporting 22519
 
-    # PHP 5.5 (ab 5.6 Standardeinstellung)
-    php_value default_charset utf-8
-    php_value mbstring.internal_encoding utf-8
-
 </Directory>

db/migrations/5.1.52_fix_for_biest3366.php

@@ -9,12 +9,12 @@ class FixForBiest3366 extends Migration
 
     public function up()
     {
-        DBManager::get()->exec('DROP TABLE `globalsearch_buzzwords`');
+        DBManager::get()->exec('DROP TABLE IF EXISTS `globalsearch_buzzwords`');
     }
 
     public function down()
     {
-        DBManager::get()->exec("CREATE TABLE `globalsearch_buzzwords` (
+        DBManager::get()->exec("CREATE TABLE IF NOT EXISTS `globalsearch_buzzwords` (
             `id` CHAR(32) COLLATE latin1_bin NOT NULL,
             `rights` ENUM('user','autor','tutor','dozent','admin','root') NOT NULL DEFAULT 'user',
             `name` varchar(255) NOT NULL DEFAULT '',

db/studip_root_user.sql

@@ -2,7 +2,7 @@
 
 # Benutzer: root@studip ; Password: testing
 INSERT IGNORE INTO `auth_user_md5` (`user_id`, `username`, `password`, `perms`, `Vorname`, `Nachname`, `Email`, `validation_key`, `auth_plugin`, `locked`, `lock_comment`, `locked_by`, `visible`) VALUES('76ed43ef286fb55cf9e41beadb484a9f', 'root@studip', '$2a$08$E2oDjsPcmCrnJT3GiSvHGugLhyUc1mlpcB3FstDzgMwgnIdzi8iSW', 'root', 'Root', 'Studip', 'root@localhost', '', 'standard', 0, NULL, NULL, 'unknown');
-INSERT IGNORE INTO `user_info` (`user_id`, `hobby`, `lebenslauf`, `publi`, `schwerp`, `Home`, `privatnr`, `privatcell`, `privadr`, `score`, `geschlecht`, `mkdate`, `chdate`, `title_front`, `title_rear`, `preferred_language`, `smsforward_copy`, `smsforward_rec`, `email_forward`, `smiley_favorite`, `motto`, `lock_rule`) VALUES('76ed43ef286fb55cf9e41beadb484a9f', '', '', '', '', '', '', '', '', 0, 0, 0, 0, '', '', NULL, 1, '', 0, '', '', '');
+INSERT IGNORE INTO `user_info` (`user_id`, `hobby`, `lebenslauf`, `publi`, `schwerp`, `Home`, `privatnr`, `privatcell`, `privadr`, `score`, `geschlecht`, `mkdate`, `chdate`, `title_front`, `title_rear`, `preferred_language`, `smsforward_copy`, `smsforward_rec`, `email_forward`, `motto`, `lock_rule`) VALUES('76ed43ef286fb55cf9e41beadb484a9f', '', '', '', '', '', '', '', '', 0, 0, 0, 0, '', '', NULL, 1, '', 0, '', '');
 
 #
 # wichtige News
@@ -22,4 +22,3 @@ Wenn Sie das System selbst installiert haben und diese News sehen, haben Sie die
 
 INSERT IGNORE INTO news_range VALUES ('29f2932ce32be989022c6f43b866e744', '76ed43ef286fb55cf9e41beadb484a9f', UNIX_TIMESTAMP(), UNIX_TIMESTAMP());
 INSERT IGNORE INTO news_range VALUES ('29f2932ce32be989022c6f43b866e744', 'studip', UNIX_TIMESTAMP(), UNIX_TIMESTAMP());
-

lib/classes/ActionMenu.php

@@ -199,7 +199,6 @@ class ActionMenu
                 'icon'       => $icon,
                 'label'      => $label,
                 'attributes' => $attributes,
-                'index'      => ''
             ];
         }
 
@@ -218,7 +217,6 @@ class ActionMenu
             $this->actions[] = [
                 'type'   => 'multi-person-search',
                 'object' => $mp,
-                'index'  => ''
             ];
         }
 
@@ -235,7 +233,6 @@ class ActionMenu
         if ($this->checkCondition()) {
             $this->actions[] = [
                 'type'   => 'separator',
-                'index'  => ''
             ];
         }
 

lib/classes/ResponsiveHelper.php

@@ -254,10 +254,10 @@ class ResponsiveHelper
                     if ($studip_module instanceof StudipModule) {
                         $tool_nav = $studip_module->getTabNavigation($course->id) ?: [];
                         foreach ($tool_nav as $nav_name => $navigation) {
-                            if (!empty($tool->metadata['displayname'])) {
-                                $navigation->setTitle($tool->getDisplayname());
-                            }
                             if ($nav_name && is_a($navigation, 'Navigation')) {
+                                if (!empty($tool->metadata['displayname'])) {
+                                    $navigation->setTitle($tool->getDisplayname());
+                                }
                                 $cnav['children'][$path . '/' . $nav_name] = [
                                     'icon'     => $navigation->getImage() ? $navigation->getImage()->asImagePath() : '',
                                     'title'    => $navigation->getTitle(),

lib/classes/StudipSemTreeView.class.php

@@ -146,7 +146,7 @@ class StudipSemTreeView extends TreeView {
         $content .= "<tr><td colspan=\"2\" class=\"table_row_even\">" . sprintf(_("Alle Veranstaltungen innerhalb dieses Bereiches in der %sÜbersicht%s"),
                 "<a href=\"" . URLHelper::getLink($this->getSelf("cmd=show_sem_range&item_id=$item_id")) ."\">","</a>") . "</td></tr>";
         $content .= "<tr><td colspan=\"2\">&nbsp;</td></tr>";
-        if ($this->tree->getNumEntries($item_id) - $this->tree->tree_data[$item_id]['lonely_sem']){
+        if ($this->tree->getNumEntries($item_id)){
             $content .= "<tr><td class=\"table_row_even\" align=\"left\" colspan=\"2\"><b>" . _("Einträge auf dieser Ebene:");
             $content .= "</b>\n</td></tr>";
             $entries = $this->tree->getSemData($item_id);
@@ -154,12 +154,6 @@ class StudipSemTreeView extends TreeView {
         } else {
             $content .= "\n<tr><td class=\"table_row_even\" colspan=\"2\">" . _("Keine Einträge auf dieser Ebene vorhanden!") . "</td></tr>";
         }
-        if ($this->tree->tree_data[$item_id]['lonely_sem']){
-            $content .= "<tr><td class=\"table_row_even\" align=\"left\" colspan=\"2\"><b>" . _("Nicht zugeordnete Veranstaltungen auf dieser Ebene:");
-            $content .= "</b>\n</td></tr>";
-            $entries = $this->tree->getLonelySemData($item_id);
-            $content .= $this->getSemDetails($entries->getGroupedResult("seminar_id"));
-        }
         $content .= "</table>";
         return $content;
     }

lib/classes/StudipSemTreeViewAdmin.class.php

@@ -46,8 +46,8 @@ class StudipSemTreeViewAdmin extends TreeView
     var $marked_item;
     var $marked_sem;
     var $mode;
-    var $move_item_id;
-    var $edit_item_id;
+    var $move_item_id = null;
+    var $edit_item_id = null;
 
     /**
     * constructor
@@ -492,12 +492,14 @@ class StudipSemTreeViewAdmin extends TreeView
     }
 
     function getItemContent($item_id){
-        if (!empty($this->edit_item_id) && ($item_id == $this->edit_item_id)) return $this->getEditItemContent();
-        if(empty($GLOBALS['SEM_TREE_TYPES'][$this->tree->getValue($item_id, 'type')]['editable'])){
+        if ($item_id == $this->edit_item_id) {
+            return $this->getEditItemContent();
+        }
+        if (empty($GLOBALS['SEM_TREE_TYPES'][$this->tree->getValue($item_id, 'type')]['editable'])){
             $is_not_editable = true;
             $this->msg[$item_id] = "info§" . sprintf(_("Der Typ dieses Elementes verbietet eine Bearbeitung."));
         }
-        if (!empty($this->move_item_id) && ($item_id == $this->move_item_id)) {
+        if ($item_id == $this->move_item_id) {
             $this->msg[$item_id] = "info§" . sprintf(_("Dieses Element wurde zum Verschieben / Kopieren markiert. Bitte wählen Sie ein Einfügesymbol %s aus, um das Element zu verschieben / kopieren."), Icon::create('arr_2right', 'sort', ['title' => "Einfügesymbol"])->asImg(16, ["alt" => "Einfügesymbol"]));
         }
         $content = "\n<table width=\"90%\" cellpadding=\"2\" cellspacing=\"2\" align=\"center\" style=\"font-size:10pt;\">";
@@ -521,7 +523,7 @@ class StudipSemTreeViewAdmin extends TreeView
                         URLHelper::getURL($this->getSelf('cmd=AssertDeleteItem&item_id=' . $item_id)),
                         ['title' => _('Dieses Element löschen')]) . '&nbsp;';
 
-                if (!empty($this->move_item_id) && ($this->move_item_id == $item_id) && ($this->mode == "MoveItem" || $this->mode == "CopyItem")){
+                if ($this->move_item_id == $item_id && ($this->mode == "MoveItem" || $this->mode == "CopyItem")){
                     $content .= LinkButton::create(_('Abbrechen'),
                             URLHelper::getURL($this->getSelf('cmd=Cancel&item_id=' . $item_id)),
                             ['title' => _('Verschieben / Kopieren abbrechen')]) . '&nbsp;';
@@ -562,7 +564,7 @@ class StudipSemTreeViewAdmin extends TreeView
             $content .= formatReady($this->tree->tree_data[$item_id]['info']) . "</td></tr>";
         }
         $content .= "<tr><td style=\"font-size:10pt;\"colspan=\"3\">&nbsp;</td></tr>";
-        if (!empty($this->tree->tree_data[$item_id]['lonely_sem']) && ($this->tree->getNumEntries($item_id) - $this->tree->tree_data[$item_id]['lonely_sem'])) {
+        if ($this->tree->getNumEntries($item_id)) {
             $content .= "<tr><td class=\"table_row_even\" style=\"font-size:10pt;\" align=\"left\" colspan=\"3\"><b>" . _("Einträge auf dieser Ebene:");
             $content .= "</b>\n</td></tr>";
             $entries = $this->tree->getSemData($item_id);
@@ -570,12 +572,6 @@ class StudipSemTreeViewAdmin extends TreeView
         } else {
             $content .= "\n<tr><td class=\"table_row_even\" style=\"font-size:10pt;\" colspan=\"3\">" . _("Keine Einträge auf dieser Ebene vorhanden!") . "</td></tr>";
         }
-        if (!empty($this->tree->tree_data[$item_id]['lonely_sem'])) {
-            $content .= "<tr><td class=\"table_row_even\" align=\"left\" style=\"font-size:10pt;\" colspan=\"3\"><b>" . _("Nicht zugeordnete Veranstaltungen auf dieser Ebene:");
-            $content .= "</b>\n</td></tr>";
-            $entries = $this->tree->getLonelySemData($item_id);
-            $content .= $this->getSemDetails($entries,$item_id,true);
-        }
         $content .= "</table>";
         return $content;
     }
@@ -776,7 +772,7 @@ class StudipSemTreeViewAdmin extends TreeView
         if ($item_id != "root"){
             $head .= " (" . $this->tree->getNumEntries($item_id,true) . ") " ;
         }
-        if ($item_id != $this->start_item_id && $this->isParentAdmin($item_id) && !empty($this->edit_item_id) && ($item_id != $this->edit_item_id)){
+        if ($item_id != $this->start_item_id && $this->isParentAdmin($item_id) && $item_id != $this->edit_item_id){
             $head .= "</td><td nowrap align=\"right\" valign=\"bottom\" class=\"printhead\">";
             if (!$this->tree->isFirstKid($item_id)){
                 $head .= "<a href=\"". URLHelper::getLink($this->getSelf("cmd=OrderItem&direction=up&item_id=$item_id")) .

lib/classes/searchtypes/RangeSearch.class.php

@@ -4,17 +4,8 @@
  * @license     GPL2 or any later version
  * @category    Stud.IP
  */
-class RangeSearch extends SQLSearch
+class RangeSearch extends SearchType
 {
-    public $search;
-
-    public function __construct()
-    {
-        $this->avatarLike = $this->search = '';
-        $this->sql = $this->getSQL();
-    }
-
-
     /**
      * returns the title/description of the searchfield
      *

lib/classes/searchtypes/SQLSearch.class.php

@@ -37,7 +37,6 @@ class SQLSearch extends SearchType
     protected $sql;
     protected $avatarLike;
     protected $title;
-    public $extendedLayout = false;
 
     /**
      *

lib/extern/modules/ExternModuleTemplateLecturedetails.class.php

@@ -401,7 +401,7 @@ class ExternModuleTemplateLecturedetails extends ExternModule {
             $content['LECTUREDETAILS']['STUDIP-DATA'] = $this->getStudipData();
 
             // generic data fields
-            if ($generic_datafields = $this->config->getValue('Main', 'genericdatafields')) {
+            if ($generic_datafields = $this->config->getValue('TemplateLectureData', 'genericdatafields')) {
                 $localEntries = DataFieldEntry::getDataFieldEntries($this->seminar_id, 'sem');
                 $k = 1;
                 foreach ($generic_datafields as $datafield) {