Skip to content

fix(capabilities): Expose if mod-rewrite is working via capabilities #44799

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 1 commit into from
Apr 12, 2024
+7 −1
Merged

fix(capabilities): Expose if mod-rewrite is working via capabilities #44799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
feat(capabilities): Expose if mod-rewrite is working via capabilities 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Apr 12, 2024
commit bbaaaf4b91beb6ade321c082d3f8231216eb368b
6 changes: 5 additions & 1 deletion core/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,8 @@
"pollinterval",
"webdav-root",
"reference-api",
"reference-regex"
"reference-regex",
"mod-rewrite-working"
],
"properties": {
"pollinterval": {
Expand All @@ -113,6 +114,9 @@
},
"reference-regex": {
"type": "string"
},
"mod-rewrite-working": {
"type": "boolean"
}
}
}
Expand Down
2 changes: 2 additions & 0 deletions lib/private/OCS/CoreCapabilities.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public function __construct(
* webdav-root: string,
* reference-api: boolean,
* reference-regex: string,
* mod-rewrite-working: boolean,
* },
* }
*/
Expand All @@ -59,6 +60,7 @@ public function getCapabilities(): array {
'webdav-root' => $this->config->getSystemValueString('webdav-root', 'remote.php/webdav'),
'reference-api' => true,
'reference-regex' => IURLGenerator::URL_REGEX_NO_MODIFIERS,
'mod-rewrite-working' => $this->config->getSystemValueBool('htaccess.IgnoreFrontController') || getenv('front_controller_active') === 'true',
Copy link
Contributor

@ShGKme ShGKme Apr 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like a copy-paste of

server/lib/private/Template/JSConfigHelper.php

Line 176 in 715077e

'modRewriteWorking' => $this->config->getSystemValue('htaccess.IgnoreFrontController', false) === true || getenv('front_controller_active') === 'true',

Can we then use capabilities there to define modRewriteWorking in JSConfig?

Copy link
Member Author

@nickvergessen nickvergessen Apr 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could

],
];
}
Expand Down