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

3 files changed, 93 insertions, 89 deletions

diff --git a/config/config.inc.php.dist b/config/config.inc.php.dist
index 1562248..aaed66b 100644
--- a/config/config.inc.php.dist
+++ b/config/config.inc.php.dist
@@ -38,7 +38,6 @@ global
   $INST_ADMIN_DATAFIELDS_VIEW,
   $INST_MODULES,
   $INST_TYPE,
-  $LIT_LIST_FORMAT_TEMPLATE,
   $NAME_FORMAT_DESC,
   $PERS_TERMIN_KAT,
   $SCM_PRESET,
@@ -69,7 +68,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.4 - Studienbegleitender Internetsupport von Präsenzlehre";
+$UNI_INFO = "Stud.IP 6.0 - Studienbegleitender Internetsupport von Präsenzlehre";
 
 
 /* $SEM_CLASS and $SEM_TYPE configuration moved to database
diff --git a/config/config_defaults.inc.php b/config/config_defaults.inc.php
index 4a362ad..78d5356 100644
--- a/config/config_defaults.inc.php
+++ b/config/config_defaults.inc.php
@@ -10,11 +10,11 @@ please fill in your database connection settings.
 */
 
 // default Stud.IP database (DB_Seminar)
-$DB_STUDIP_HOST = "localhost";
-$DB_STUDIP_USER = "";
-$DB_STUDIP_PASSWORD = "";
-$DB_STUDIP_DATABASE = "studip";
-$DEBUG_ALL_DB_QUERIES_WITH_TRACE = false;
+$DB_STUDIP_HOST = $_ENV['MYSQL_HOST'] ?? 'localhost';
+$DB_STUDIP_USER = $_ENV['MYSQL_USER'] ?? '';
+$DB_STUDIP_PASSWORD = $_ENV['MYSQL_PASSWORD'] ?? '';
+$DB_STUDIP_DATABASE = $_ENV['MYSQL_DATABASE'] ?? 'studip';
+
 /*
 // optional Stud.IP slave database
 $DB_STUDIP_SLAVE_HOST = "localhost";
@@ -66,9 +66,9 @@ $TMP_PATH ="/tmp";                                  //the system temp path
 $MEDIA_CACHE_PATH = $STUDIP_BASE_PATH . '/data/media_cache';
 
 //caching
-$CACHING_ENABLE = true;
+$CACHING_ENABLE = $_ENV['STUDIP_CACHING_ENABLE'] ?? true;
 $CACHING_FILECACHE_PATH = $TMP_PATH . '/studip_cache';
-$CACHE_IS_SESSION_STORAGE = false;                 //store session data in cache
+$CACHE_IS_SESSION_STORAGE = $_ENV['STUDIP_CACHE_IS_SESSION_STORAGE'] ?? false; //store session data in cache
 
 /*Stud.IP modules
 ----------------------------------------------------------------
@@ -78,88 +78,89 @@ $FOP_SH_CALL = "/usr/bin/fop";                        //path to fop
 
 $EXTERN_SERVER_NAME = "";                               //define name, if you use special setup
 
-$ELEARNING_INTERFACE_MODULES = [
-    "ilias5" => [
-        "name" => "ILIAS 5",
-        "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your Ilias installation>/",
-        "ABSOLUTE_PATH_SOAP" => "http://<your Ilias installation>/webservice/soap/server.php?wsdl",
-        "CLASS_PREFIX" => "Ilias5",
-        "auth_necessary" => true,
-        "USER_AUTO_CREATE" => true,
-        "USER_PREFIX" => "",
-        "target_file" => "studip_referrer.php",
-        "logo_file" => "assets/images/logos/ilias_logo.png",
-        "soap_data" => [
-                        "username" => "<username>",     //this credentials are used to communicate with your Ilias 3 installation over SOAP
-                        "password" => "<password>",
-                        "client" => "<ilias client id>"],
-        "types" => [
-                   "webr" => ["name" => "ILIAS-Link", "icon" => "learnmodule"],
-                   "htlm" => ["name" => "HTML-Lerneinheit", "icon" => "learnmodule"],
-                   "sahs" => ["name" => "SCORM/AICC-Lerneinheit", "icon" => "learnmodule"],
-                   "lm" => ["name" => "ILIAS-Lerneinheit", "icon" => "learnmodule"],
-                   "glo" => ["name" => "ILIAS-Glossar", "icon" => "learnmodule"],
-                   "tst" => ["name" => "ILIAS-Test", "icon" => "learnmodule"],
-                   "svy" => ["name" => "ILIAS-Umfrage", "icon" => "learnmodule"],
-                   "exc" => ["name" => "ILIAS-Übung", "icon" => "learnmodule"]
-                   ],
-        "global_roles" => [4,5,14], // put here the ilias role-ids for User, Guest and Anonymous
-        "roles" =>  [
-                        "autor" => "4",
-                        "tutor" => "4",
-                        "dozent" => "4",
-                        "admin" => "4",
-                        "root" => "2"
-                        ],
-        "crs_roles" =>  [
-                        "autor" => "member",
-                        "tutor" => "tutor",
-                        "dozent" => "admin",
-                        "admin" => "admin",
-                        "root" => "admin"
-                        ]
-        ]
-    ];
+$ELEARNING_INTERFACE_MODULES = [];
 
 // example entry for wikifarm as server for elearning modules
+// Copy them into your customized config_local.inc.php and adjust them.
 // remember to activate studip-webservices with WEBSERVICES_ENABLE and to set STUDIP_INSTALLATION_ID
 
-$ELEARNING_INTERFACE_MODULES["pmwiki-farm"] =   [
-                        "name" => "Wikifarm",
-                        "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your PmWiki farm server>/<path to wiki fields>/",
-
-                        "WEBSERVICE_CLASS" => "xml_rpc_webserviceclient",
-                        "ABSOLUTE_PATH_SOAP" => "http://<your PmWiki farm server>/<path to PmWiki farm>/pmwiki.php",  // url to farm webservices
-                        "URL_PARAMS" => "action=xmlrpc",
-
-                        "CLASS_PREFIX" => "PmWiki",
-                        "auth_necessary" => false,
-
-                        "field_script" => "field.php",
-                        "logo_file" => $ASSETS_URL."/images/logos/pmwiki-32.gif",
-
-                        "soap_data" => [
-              "api-key" => "<api-key for wiki webservices>",
-            ],
-                        "types" =>  [
-              "wiki" => ["name" => "PmWiki-Lernmodul", "icon" => "learnmodule"],
-            ]
-];
-
-$ELEARNING_INTERFACE_MODULES["loncapa"] =
-[
-    "name" => "LonCapa",
-    "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://127.0.0.1/loncapa",
-    "CLASS_PREFIX" => "LonCapa",
-    "auth_necessary" => false,
-    "logo_file" => "assets/images/logos/lon-capa.gif",
-    "types" =>  [
-        "loncapa" => ["name" => "LonCapa-Lernmodul",
-                           "icon" => "learnmodule"],
-        ]
-];
-
-$PLUGINS_UPLOAD_ENABLE = TRUE;      //Upload of Plugins is enabled
+// $ELEARNING_INTERFACE_MODULES["ilias5"] = [
+//     "name" => "ILIAS 5",
+//     "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your Ilias installation>/",
+//     "ABSOLUTE_PATH_SOAP" => "http://<your Ilias installation>/webservice/soap/server.php?wsdl",
+//     "CLASS_PREFIX" => "Ilias5",
+//     "auth_necessary" => true,
+//     "USER_AUTO_CREATE" => true,
+//     "USER_PREFIX" => "",
+//     "target_file" => "studip_referrer.php",
+//     "logo_file" => "assets/images/logos/ilias_logo.png",
+//     "soap_data" => [
+//         "username" => "<username>",     //this credentials are used to communicate with your Ilias 3 installation over SOAP
+//         "password" => "<password>",
+//         "client" => "<ilias client id>"],
+//     "types" => [
+//         "webr" => ["name" => "ILIAS-Link", "icon" => "learnmodule"],
+//         "htlm" => ["name" => "HTML-Lerneinheit", "icon" => "learnmodule"],
+//         "sahs" => ["name" => "SCORM/AICC-Lerneinheit", "icon" => "learnmodule"],
+//         "lm" => ["name" => "ILIAS-Lerneinheit", "icon" => "learnmodule"],
+//         "glo" => ["name" => "ILIAS-Glossar", "icon" => "learnmodule"],
+//         "tst" => ["name" => "ILIAS-Test", "icon" => "learnmodule"],
+//         "svy" => ["name" => "ILIAS-Umfrage", "icon" => "learnmodule"],
+//         "exc" => ["name" => "ILIAS-Übung", "icon" => "learnmodule"]
+//     ],
+//     "global_roles" => [4,5,14], // put here the ilias role-ids for User, Guest and Anonymous
+//     "roles" =>  [
+//         "autor" => "4",
+//         "tutor" => "4",
+//         "dozent" => "4",
+//         "admin" => "4",
+//         "root" => "2"
+//     ],
+//     "crs_roles" =>  [
+//         "autor" => "member",
+//         "tutor" => "tutor",
+//         "dozent" => "admin",
+//         "admin" => "admin",
+//         "root" => "admin"
+//     ]
+// ];
+//
+// $ELEARNING_INTERFACE_MODULES["pmwiki-farm"] =   [
+//                         "name" => "Wikifarm",
+//                         "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://<your PmWiki farm server>/<path to wiki fields>/",
+//
+//                         "WEBSERVICE_CLASS" => "xml_rpc_webserviceclient",
+//                         "ABSOLUTE_PATH_SOAP" => "http://<your PmWiki farm server>/<path to PmWiki farm>/pmwiki.php",  // url to farm webservices
+//                         "URL_PARAMS" => "action=xmlrpc",
+//
+//                         "CLASS_PREFIX" => "PmWiki",
+//                         "auth_necessary" => false,
+//
+//                         "field_script" => "field.php",
+//                         "logo_file" => $ASSETS_URL."/images/logos/pmwiki-32.gif",
+//
+//                         "soap_data" => [
+//               "api-key" => "<api-key for wiki webservices>",
+//             ],
+//                         "types" =>  [
+//               "wiki" => ["name" => "PmWiki-Lernmodul", "icon" => "learnmodule"],
+//             ]
+// ];
+//
+// $ELEARNING_INTERFACE_MODULES["loncapa"] =
+// [
+//     "name" => "LonCapa",
+//     "ABSOLUTE_PATH_ELEARNINGMODULES" => "http://127.0.0.1/loncapa",
+//     "CLASS_PREFIX" => "LonCapa",
+//     "auth_necessary" => false,
+//     "logo_file" => "assets/images/logos/lon-capa.gif",
+//     "types" =>  [
+//         "loncapa" => ["name" => "LonCapa-Lernmodul",
+//                            "icon" => "learnmodule"],
+//         ]
+// ];
+
+$PLUGINS_UPLOAD_ENABLE = $_ENV['STUDIP_PLUGIN_UPLOAD_ENABLE'] ?? true;      //Upload of Plugins is enabled
 
 $PLUGIN_REPOSITORIES = [
     'https://develop.studip.de/studip/plugins.php/pluginmarket/extern/xml',
@@ -193,7 +194,7 @@ sendmail  use local sendmail script
 qmail     use local Qmail MTA
 debug     mails are only written to a file in $TMP_PATH
 */
-$MAIL_TRANSPORT = "smtp";
+$MAIL_TRANSPORT = $_ENV['STUDIP_MAIL_TRANSPORT'] ?? 'smtp';
 
 /*smtp settings
 ----------------------------------------------------------------
@@ -268,6 +269,10 @@ $STUDIP_AUTH_PLUGIN[] = "Standard";
 // $STUDIP_AUTH_PLUGIN[] = "IP";
 
 $STUDIP_AUTH_CONFIG_STANDARD = ["error_head" => "intern"];
+
+// Example configurations
+// Copy them into your customized config_local.inc.php and adjust them.
+
 /*
 $STUDIP_AUTH_CONFIG_LDAPREADANDBIND = array("host" => "localhost",
                                         "base_dn" => "dc=studip,dc=de",
diff --git a/config/config_develop.inc.php b/config/config_develop.inc.php
index a38726a..655fd4b 100644
--- a/config/config_develop.inc.php
+++ b/config/config_develop.inc.php
@@ -329,7 +329,7 @@ $INST_ADMIN_DATAFIELDS_VIEW = [
 /*
  * Fields that may not be hidden by users in their privacy settings.
  * Can be configured per permission level.
- * @see lib/models/User.class.php in function getHomepageElements for
+ * @see lib/models/User.php in function getHomepageElements for
  * available fields.
  * Entries look like "'field_name' => true".
  */