Resolve "StEP00358 Schnittstelle zum OER Portal Niedersachsen"

app/controllers/course/timesrooms.php

@@ -1057,7 +1057,7 @@ class Course_TimesroomsController extends AuthenticatedController
             $end_semester = $this->course->semesters;
         }
 
-        $this->start_weeks = $this->course->start_semester->getStartWeeks($this->course->duration_time);
+        $this->start_weeks = $end_semester[count($end_semester) - 1]->getStartWeeks();
 
         if (!empty($end_semester)) {
             $this->end_semester_weeks = [];

app/controllers/oer/endpoints.php

@@ -131,6 +131,7 @@ class Oer_EndpointsController extends StudipController
             ];
             $data['data'] = $material->toArray();
             unset($data['data']['material_id']);
+            unset($data['data']['uri_hash']);
             $data['users'] = [];
             foreach ($material->users as $userdata) {
                 $user = $userdata['external_contact']
@@ -242,7 +243,8 @@ class Oer_EndpointsController extends StudipController
                     'player_url' => $material['player_url'],
                     'tool' => $material['tool'],
                     'structure' => ($material['structure'] ? $material['structure']->getArrayCopy() : null),
-                    'license' => $material['license']
+                    'license' => $material['license'],
+                    'uri' => $material['uri']
                 ],
                 'users' => $users,
                 'topics' => $topics,

app/controllers/oer/mymaterial.php

@@ -8,7 +8,6 @@ class Oer_MymaterialController extends AuthenticatedController
     {
         parent::before_filter($action, $args);
         PageLayout::setTitle(_('Lernmaterialien'));
-
     }
 
     public function index_action()
@@ -36,6 +35,7 @@ class Oer_MymaterialController extends AuthenticatedController
             return;
         } elseif (Request::isPost()) {
             $was_new = $material->isNew();
+            $was_on_twillo = (bool) $material['published_id_on_twillo'];
             $material->setData(Request::getArray('data'));
             $material['host_id'] = null;
             $material['license_identifier'] = Request::get('license', 'CC-BY-SA-4.0');
@@ -131,6 +131,19 @@ class Oer_MymaterialController extends AuthenticatedController
 
             $material->pushDataToIndexServers();
 
+            if (Config::get()->OERCAMPUS_ENABLE_TWILLO && TwilloConnector::getTwilloUserID()) {
+                if (Request::bool('publish_on_twillo') || $_SESSION['NEW_OER']['publish_on_twillo']) {
+                    //upload it to twillo.de
+                    $succes_or_error = $material->uploadToTwillo($material);
+                    if (is_string($succes_or_error)) {
+                        PageLayout::postWarning(_('Konnte Material nicht zu twillo.de hochladen.'), [$succes_or_error]);
+                    }
+                } elseif ($was_on_twillo) {
+                    //remove it from twillo.de if able
+                    $material->deleteFromTwillo();
+                }
+            }
+
             unset($_SESSION['NEW_OER']);
 
             PageLayout::postSuccess(_('Lernmaterial erfolgreich gespeichert.'));

app/views/oer/mymaterial/edit.php

@@ -238,6 +238,15 @@
                        value="<?= htmlReady($template['module_id']) ?>">
             <? endif ?>
 
+            <? if (Config::get()->OERCAMPUS_ENABLE_TWILLO && TwilloConnector::getTwilloUserID()) : ?>
+                <input type="hidden" name="publish_on_twillo" value="0">
+                <label style="margin-top: 20px;">
+                    <input type="checkbox"
+                           name="publish_on_twillo"
+                           value="1"<?= $material['published_id_on_twillo'] ? " checked" : "" ?>>
+                    <?= _('Auf twillo.de veröffentlichen') ?>
+                </label>
+            <? endif ?>
         </fieldset>
 
         <? if (!Config::get()->OER_DISABLE_LICENSE) : ?>

cli/twillo_generate_keys.php

+#!/usr/bin/env php
+<?php
+require_once 'studip_cli_env.inc.php';
+
+$app_id = str_replace(" ", "-", Config::get()->UNI_NAME_CLEAN);
+
+$privatekey = @file_get_contents('../config/twillo-private.key');
+
+if (!$privatekey) {
+    $key = EduSharingHelper::generateKeyPair();
+    $success = file_put_contents(
+        '../config/twillo.properties.xml',
+        EduSharingHelper::generateEduAppXMLData($app_id, $key['publickey'])
+    );
+    if ($success !== false) {
+        file_put_contents(
+            '../config/twillo-private.key',
+            $key['privatekey']
+        );
+        Config::get()->store('OERCAMPUS_TWILLO_APPID', $app_id);
+        echo "Wrote config/twillo.properties.xml file. Next steps:
+
+- Send the file config/twillo.properties.xml to the twillo.de administrators support.twillo@tib.eu . If they ask you to change the app-ID, you can do this in the system at Admin -> System -> Configuration by editing the config value OERCAMPUS_TWILLO_APPID.
+- Leave the config/twillo-private.key file as it is in the config folder. This file is important for the API to work.
+- You need to either have or create a datafield for users which contains the DFN-AAI-ID of a person. Without this ID in the datafield a user cannot upload to twillo.de due to technical restrictions.
+- Copy the datafield_id of this datafield (you find this in the DB-table datafields). In Stud.IP go to Admin -> System -> Configuration and edit the config value OERCAMPUS_TWILLO_DFNAAIID_DATAFIELD. What you inserted, should look like 6a9ee3ca3685d2551698a3dc6f0f0eff.
+- Once the twillo.de adminstrators received your file and registered your Stud.IP, you can enable the connection to twillo: Go to Admin -> System -> Configuration and edit the config value OERCAMPUS_ENABLE_TWILLO and switch it on.
+
+There you go. From now on all your users with a given DFN-AAI-ID should be able to upload their OERs to twillo.de.
+";
+    } else {
+        echo "No permission to write into folder config. Cannot save private and public keys.\n";
+    }
+} else {
+    echo "Private key already exists. Remove it or be happy that it is there.\n";
+}

composer.json

@@ -7,18 +7,21 @@
     "require-dev": {
         "adlawson/vfs": "~0.12.1",
         "camspiers/json-pretty": "~1.0.2",
+        "codeception/codeception": "4.0.2",
         "monolog/monolog": "~1.21.0",
         "php-http/curl-client": "~1.7.0",
-        "woohoolabs/yang": "2.3.2",
-        "codeception/codeception": "~4.1.21",
-        "codeception/module-asserts": "^1.3"
+        "phpunit/phpunit": "6.5.14",
+        "woohoolabs/yang": "~0.9.0",
+        "codeception/module-phpbrowser": "^1.0",
+        "codeception/module-asserts": "^1.1"
     },
     "require": {
         "php": "^7.2",
         "guzzlehttp/psr7": "~1.4.2",
-        "neomerx/json-api": "4.0.1",
+        "neomerx/json-api": "~1.0.9",
+        "slim/slim": "~3.12.3",
         "spomky-labs/otphp": "^8.3.3",
-        "tuupola/cors-middleware": "1.2.1",
+        "tuupola/cors-middleware": "~0.5.2",
         "tecnickcom/tcpdf": "^6.3",
         "scssphp/scssphp": "^1.4",
         "symfony/yaml": "^3.4",
@@ -45,6 +48,7 @@
         "opis/json-schema": "^1.0",
         "slim/psr7": "1.4",
         "slim/slim": "4.7.1",
-        "php-di/php-di": "6.3.4"
+        "php-di/php-di": "6.3.4",
+        "league/oauth2-client": "^2.6"
     }
 }

lib/bootstrap-autoload.php

@@ -100,3 +100,21 @@ StudipAutoloader::addClassLookup(
     ['xmlrpc_server'],
     'composer/phpxmlrpc/phpxmlrpc/lib/xmlrpcs.inc'
 );
+
+//Edu-Sharing helper classes for twillo connector
+StudipAutoloader::addClassLookup(
+    'EduSharingHelper',
+    'vendor/edu-sharing-plugin/edu-sharing-helper.php'
+);
+StudipAutoloader::addClassLookup(
+    'EduSharingHelperBase',
+    'vendor/edu-sharing-plugin/edu-sharing-helper-base.php'
+);
+StudipAutoloader::addClassLookup(
+    'EduSharingAuthHelper',
+    'vendor/edu-sharing-plugin/edu-sharing-auth-helper.php'
+);
+StudipAutoloader::addClassLookup(
+    'EduSharingNodeHelper',
+    'vendor/edu-sharing-plugin/edu-sharing-node-helper.php'
+);

vendor/edu-sharing-plugin/readme.md

+This library is a changed version of https://github.com/edu-sharing/php-auth-plugin