Permalink
Browse files

association import, httpful

  • Loading branch information...
uwol committed Aug 6, 2016
1 parent a435014 commit 277c738a3a8b5ea3a2138a108d73b4076ac0ec35
Showing with 2,433 additions and 414 deletions.
  1. +2 −1 composer.json
  2. +1 −1 modules/mod_internet_home/meta.json
  3. +9 −2 modules/mod_internet_home/scripts/admin/announcement_list.php
  4. +1 −1 modules/mod_intranet_chargierkalender/meta.json
  5. +9 −2 modules/mod_intranet_chargierkalender/scripts/admin/list.php
  6. +0 −341 vendor/httpclient/HttpClient.class.php
  7. +0 −28 vendor/httpclient/autoload.php
  8. +7 −0 vendor/httpful/LICENSE.txt
  9. +4 −0 vendor/httpful/bootstrap.php
  10. +27 −0 vendor/httpful/composer.json
  11. +97 −0 vendor/httpful/src/Httpful/Bootstrap.php
  12. +7 −0 vendor/httpful/src/Httpful/Exception/ConnectionErrorException.php
  13. +51 −0 vendor/httpful/src/Httpful/Handlers/CsvHandler.php
  14. +30 −0 vendor/httpful/src/Httpful/Handlers/FormHandler.php
  15. +42 −0 vendor/httpful/src/Httpful/Handlers/JsonHandler.php
  16. +54 −0 vendor/httpful/src/Httpful/Handlers/MimeHandlerAdapter.php
  17. +44 −0 vendor/httpful/src/Httpful/Handlers/README.md
  18. +15 −0 vendor/httpful/src/Httpful/Handlers/XHtmlHandler.php
  19. +152 −0 vendor/httpful/src/Httpful/Handlers/XmlHandler.php
  20. +86 −0 vendor/httpful/src/Httpful/Http.php
  21. +47 −0 vendor/httpful/src/Httpful/Httpful.php
  22. +60 −0 vendor/httpful/src/Httpful/Mime.php
  23. +16 −0 vendor/httpful/src/Httpful/Proxy.php
  24. +1,186 −0 vendor/httpful/src/Httpful/Request.php
  25. +178 −0 vendor/httpful/src/Httpful/Response.php
  26. +98 −0 vendor/httpful/src/Httpful/Response/Headers.php
  27. +2 −1 vendor/vcms/initialize.php
  28. +104 −2 vendor/vcms/lib/LibAssociation.class.php
  29. +3 −1 vendor/vcms/lib/LibGlobal.class.php
  30. +32 −0 vendor/vcms/lib/LibHttp.class.php
  31. +7 −2 vendor/vcms/modules/base_intranet_dbadmin/scripts/person/personen.php
  32. +9 −1 vendor/vcms/modules/base_intranet_dbadmin/scripts/semester/semesters.php
  33. +9 −2 vendor/vcms/modules/base_intranet_dbadmin/scripts/veranstaltung/veranstaltungen.php
  34. +12 −1 vendor/vcms/modules/base_intranet_dbadmin/scripts/verein/vereine.php
  35. +9 −1 vendor/vcms/modules/base_intranet_dbadmin/scripts/vereinsmitgliedschaft/vereinsmitgliedschaften.php
  36. +9 −1 vendor/vcms/modules/base_intranet_dbadmin/scripts/vip/vips.php
  37. +14 −26 vendor/vcms/modules/base_intranet_modulemanager/scripts/modulemanager.php
View
@@ -6,7 +6,8 @@
"font-awesome": "^4.6.3",
"jquery": "^2.2.3",
"php": ">=5.5.0",
- "phpmailer/phpmailer": "~5.2"
+ "phpmailer/phpmailer": "~5.2",
+ "nategood/httpful": "*"
},
"license": "GPL-3.0+"
}
@@ -1,6 +1,6 @@
{
"moduleName": "Home",
- "version": 3.08,
+ "version": 3.09,
"installScript": "install/install.php",
"pages": [
{
@@ -45,8 +45,15 @@
echo $libString->getErrorBoxText();
echo $libString->getNotificationBoxText();
-echo '<p>Die aktuellsten nicht verfallenen Nachrichten werden auf der Startseite angezeigt. Wenn sie verfallen oder neuere Nachrichten existieren, werden sie automatisch archiviert.</p>';
-echo '<p><a href="index.php?pid=intranet_internethome_nachricht_adminankuendigung&amp;aktion=blank">Eine neue Ankündigung anlegen</a></p>';
+
+echo '<div class="panel panel-default">';
+echo '<div class="panel-body">';
+echo '<div class="btn-toolbar">';
+echo '<a href="index.php?pid=intranet_internethome_nachricht_adminankuendigung&amp;aktion=blank" class="btn btn-default">Eine neue Ankündigung anlegen</a>';
+echo '</div>';
+echo '</div>';
+echo '</div>';
+
/*
* semester selection
@@ -1,6 +1,6 @@
{
"moduleName": "Chargierkalender",
- "version": 2.38,
+ "version": 2.39,
"installScript": "install/install.php",
"pages": [
{
@@ -49,8 +49,15 @@
echo $libString->getErrorBoxText();
echo $libString->getNotificationBoxText();
-//new event
-echo '<p><a href="index.php?pid=intranet_chargierkalender_adminveranstaltung&amp;aktion=blank">Eine neue Chargierveranstaltung anlegen</a></p>';
+
+echo '<div class="panel panel-default">';
+echo '<div class="panel-body">';
+echo '<div class="btn-toolbar">';
+echo '<a href="index.php?pid=intranet_chargierkalender_adminveranstaltung&amp;aktion=blank" class="btn btn-default">Eine neue Chargierveranstaltung anlegen</a>';
+echo '</div>';
+echo '</div>';
+echo '</div>';
+
$stmt = $libDb->prepare("SELECT DATE_FORMAT(datum,'%Y-%m-01') AS datum FROM mod_chargierkalender_veranstaltung GROUP BY datum ORDER BY datum DESC");
$stmt->execute();
Oops, something went wrong.

0 comments on commit 277c738

Please sign in to comment.