Update to 2021-12-01 19:13

This commit is contained in:
Daniel Berteaud
2021-12-01 19:13:34 +01:00
commit 4c4556c660
2153 changed files with 60999 additions and 0 deletions

View File

@@ -0,0 +1,19 @@
--- /usr/share/php/openmediavault/session.inc.orig 2018-10-02 18:57:00.324000000 +0200
+++ /usr/share/php/openmediavault/session.inc 2018-10-02 18:58:04.188000000 +0200
@@ -91,8 +91,14 @@
* @return Returns TRUE if the session is authenticated, otherwise FALSE.
*/
public function isAuthenticated() {
- if (!isset($_SESSION['authenticated']) || !$_SESSION['authenticated'])
- return FALSE;
+ if (!isset($_SESSION['authenticated']) || !$_SESSION['authenticated']){
+ if (isset($_SERVER['HTTP_AUTH_USER'])){
+ $role = (isset($_SERVER['HTTP_OMV_ROLE']) && $_SERVER['HTTP_OMV_ROLE'] === 'admin') ? OMV_ROLE_ADMINISTRATOR : OMV_ROLE_USER;
+ $this->initialize($_SERVER['HTTP_AUTH_USER'], $role);
+ } else {
+ return FALSE;
+ }
+ }
return TRUE;
}

View File

@@ -0,0 +1,13 @@
--- /usr/share/openmediavault/engined/rpc/sharemgmt.inc.orig 2018-11-27 16:51:05.412000000 +0100
+++ /usr/share/openmediavault/engined/rpc/sharemgmt.inc 2018-11-27 16:52:19.960000000 +0100
@@ -914,8 +914,8 @@
if (array_key_exists("owner", $params) || array_key_exists(
"group", $params)) {
$ownerGroupArg = "";
- if (array_key_exists("owner", $params))
- $ownerGroupArg = str_replace(' ', '\ ', $params['owner']);
+ //if (array_key_exists("owner", $params))
+ // $ownerGroupArg = str_replace(' ', '\ ', $params['owner']);
if (array_key_exists("group", $params))
$ownerGroupArg = sprintf("%s:%s", $ownerGroupArg,
str_replace(' ', '\ ', $params['group']));