Fix requested changes

Signed-off-by: Tim Obert <tobert@w-commerce.de>

diff --git a/core/routes.php b/core/routes.php
index f802b64448515b2ae2f6bf72c8dfe42ca9665a9d..829fa8576c87800f94ef1aeda9099ae1fb076228 100644 (file)
--- a/core/routes.php
+++ b/core/routes.php
@@ -86,10 +86,10 @@ $application->registerRoutes($this, [
 
                // Legacy routes that need to be globally available while they are handled by an app
                ['name' => 'viewcontroller#showFile', 'url' => '/f/{fileid}', 'verb' => 'GET', 'app' => 'files'],
-               ['name' => 'share#showShare', 'url' => '/s/{token}', 'verb' => 'GET', 'app' => 'files_sharing'],
-               ['name' => 'share#showAuthenticate', 'url' => '/s/{token}/authenticate/{redirect}', 'verb' => 'GET', 'app' => 'files_sharing'],
-               ['name' => 'share#authenticate', 'url' => '/s/{token}/authenticate/{redirect}', 'verb' => 'POST', 'app' => 'files_sharing'],
-               ['name' => 'share#downloadShare', 'url' => '/s/{token}/download', 'verb' => 'GET', 'app' => 'files_sharing'],
+               ['name' => 'sharecontroller#showShare', 'url' => '/s/{token}', 'verb' => 'GET', 'app' => 'files_sharing'],
+               ['name' => 'sharecontroller#showAuthenticate', 'url' => '/s/{token}/authenticate/{redirect}', 'verb' => 'GET', 'app' => 'files_sharing'],
+               ['name' => 'sharecontroller#authenticate', 'url' => '/s/{token}/authenticate/{redirect}', 'verb' => 'POST', 'app' => 'files_sharing'],
+               ['name' => 'sharecontroller#downloadShare', 'url' => '/s/{token}/download', 'verb' => 'GET', 'app' => 'files_sharing'],
                ['name' => 'publicpreview#directLink', 'url' => '/s/{token}/preview', 'verb' => 'GET', 'app' => 'files_sharing'],
                ['name' => 'requesthandlercontroller#addShare', 'url' => '/ocm/shares', 'verb' => 'POST', 'app' => 'cloud_federation_api'],
                ['name' => 'requesthandlercontroller#receiveNotification', 'url' => '/ocm/notifications', 'verb' => 'POST', 'app' => 'cloud_federation_api'],

diff --git a/lib/public/AppFramework/AuthPublicShareController.php b/lib/public/AppFramework/AuthPublicShareController.php
index 8bc2da301c2adcb39b2c5bc9fb05a92c6658f07a..0ccac7cbe6320cfe0acef72c515099ac18f2883b 100644 (file)
--- a/lib/public/AppFramework/AuthPublicShareController.php
+++ b/lib/public/AppFramework/AuthPublicShareController.php
@@ -156,15 +156,6 @@ abstract class AuthPublicShareController extends PublicShareController {
                );
        }
 
-       /**
-        * @param $string
-        * @return string
-        */
-       private function camelCaseToLowerCaseUnderscored($string)
-       {
-               $value = preg_replace('/(?<=\\w)([A-Z])/', '_\\1', $string);
-               return mb_strtolower($value, 'utf-8');
-       }
 
        /**
         * @since 14.0.0
@@ -172,7 +163,11 @@ abstract class AuthPublicShareController extends PublicShareController {
        private function getRoute(string $function): string {
                $app = strtolower($this->appName);
                $class = (new \ReflectionClass($this))->getShortName();
-               // $class = $this->camelCaseToLowerCaseUnderscored(substr($class, 0, strpos($class, 'Controller')));
+               if ($this->appName === 'files_sharing') {
+                       $class = strtolower($class);
+               } else if (substr($class, -10) === 'Controller') {
+                       $class = substr($class, 0, -10);
+               }
                return $app .'.'. $class .'.'. $function;
        }