fixes #1004

Author: tgloeggl

app/controllers/redirect.php

@@ -58,7 +58,7 @@ public function perform_action($action, $token)
 
         // get correct endpoint for redirect type
         if ($action == 'video' || $action == 'share') {
-            $ltilink = self::getLtiLinkFor($lti, 'search');
+            $ltilink = self::getLtiLinkFor($lti, 'play');
         } else {
             $ltilink = self::getLtiLinkFor($lti, 'apievents');
         }

lib/Models/Config.php

@@ -16,21 +16,6 @@ class Config extends \SimpleOrMap
         'lti_consumerkey', 'lti_consumersecret', 'debug'
     ];
 
-    const SERVICES = [
-        "apievents", // alles admin-node
-        "apiseries",
-        "apiworkflows",
-        "apiplaylists",
-        "capture-admin",
-        "ingest",
-        "recordings",
-        "search", // ausser hier: engage-node
-        "series",
-        "services",
-        "upload",
-        "workflow",
-    ];
-
     protected static function configure($config = [])
     {
         $config['db_table'] = 'oc_config';
@@ -265,15 +250,7 @@ public function updateEndpoints()
                 } else {
 
                     foreach($services as $service_url => $service_type) {
-                        if (in_array(
-                                strtolower($service_type),
-                                self::SERVICES
-                            ) !== false
-                        ) {
-                            Endpoints::setEndpoint($this->id, $service_url, $service_type);
-                        } else {
-                            unset($services[$service_url]);
-                        }
+                        Endpoints::setEndpoint($this->id, $service_url, $service_type);
                     }
 
                     // create new entries for workflow_config table

lib/Models/REST/Config.php

@@ -6,6 +6,22 @@
 
 class Config
 {
+    const SERVICES = [
+        'org.opencastproject.external.events'              => 'apievents',
+        'org.opencastproject.external'                     => 'apiseries',
+        'org.opencastproject.external.workflows.instances' => 'apiworkflows',
+        'org.opencastproject.external.playlists'           => 'apiplaylists',
+        'org.opencastproject.capture.admin'                => 'capture-admin',
+        'org.opencastproject.ingest'                       => 'ingest',
+        'org.opencastproject.scheduler'                    => 'recordings',
+        'org.opencastproject.engage.ui.player.redirect'    => 'play',                 // ausser hier: engage-node
+        'org.opencastproject.search'                       => 'search',               // ausser hier: engage-node
+        'org.opencastproject.series'                       => 'series',
+        'org.opencastproject.serviceregistry'              => 'services',
+        'org.opencastproject.fileupload'                   => 'upload',
+        'org.opencastproject.workflow'                     => 'workflow',
+    ];
+
     /**
      * Get the connected opencast instance version
      *
@@ -39,14 +55,26 @@ public static function getOCBaseVersion($config_id)
 
     public static function retrieveRESTservices($components, $match_protocol)
     {
-        $services = array();
+        $oc_services = self::SERVICES;
+        $services   = [];
+
         foreach ($components as $service) {
-            if (!preg_match('/remote/', $service->type)
-                && !preg_match('#https?://localhost.*#', $service->host)
+            if (!preg_match('#https?://localhost.*#', $service->host)
                 && mb_strpos($service->host, $match_protocol) === 0
             ) {
-                $services[preg_replace(array("/\/docs/"), array(''), $service->host.$service->path)]
-                         = preg_replace("/\//", '', $service->path);
+                // check if service is wanted, active and online
+                if (isset($oc_services[$service->type])
+                    && $service->online && $service->active
+                ) {
+                    // TODO: check duplicate entries for same service-type
+                    $services[$service->host . $service->path]
+                        = $oc_services[$service->type];
+                }
+
+                if ($service->path == '/admin-ng/event') {
+                    $services[$service->host . $service->path]
+                        = 'adming-ngevent';
+                }
             }
         }