Merge remote-tracking branch 'origin/master'

.gitignore

@@ -19,6 +19,7 @@ application/libraries/extensions/
 application/models/extensions/
 application/views/extensions/
 application/widgets/extensions/
+application/logs/
 tests/codeception/_output/*
 !/tests/codeception/_output/.placeholder
 tests/codeception/codeception.yml
@@ -26,8 +27,5 @@ tests/codeception/tests/api.suite.yml
 tests/codeception/tests/functional.suite.yml
 tests/codeception/tests/acceptance.suite.yml
 tests/codeception/tests/unit.suite.yml
-/submodules/d3
-bin
-/application/logs/
 /sparks/*
 /webdav/google.php

cis/private/lehre/swd.php

@@ -3,6 +3,9 @@ $url = "http://xgnd.bsz-bw.de/";
 $zielfeld = "kontrollschlagwoerter";
 $url = $url."?zielfeld=".$zielfeld;
 header('Content-Type: text/html; charset=utf-8');
-print file_get_contents($url);
+$content = file_get_contents($url);
+if($content)
+	print $content;
+else
+	echo "Der Schlagwortdienst ist derzeit nicht erreichbar. Bitte füllen Sie die Schlagwörter manuell aus um den Upload abzuschließen";
 ?>
-