2.1.27

Fix for #2472 and #2486
nilsteampassnet · Dec 2, 2018 · f80c081 · f80c081
1 parent 787954f
commit f80c081
Show file tree

Hide file tree

Showing 7 changed files with 1,139 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ ENV VOL ${VOL}
 VOLUME ${VOL}
 
 # Configure nginx-php-fpm image to use this dir.
-ENV WEBROOT ${VOL}/www
+ENV WEBROOT ${VOL}
 
 RUN apk add --no-cache --repository http://dl-3.alpinelinux.org/alpine/edge/testing gnu-libiconv
 ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php

diff --git a/changelog.txt b/changelog.txt
@@ -1,6 +1,8 @@
 2.1.27
 30/
+ #2486 Editing roles on users wipes dissimilar roles
  #2458 Items folder automatically changes to the personal one
+ #2472 Nginx webroot is incorrect in Docker image. Fixed by merging #2477 
 
 29/
  #2467, #2465 Cant login with normal user with hacking attempt message

diff --git a/includes/language/chinese_simplified.php b/includes/language/chinese_simplified.php
diff --git a/sources/checks.php b/sources/checks.php
@@ -94,9 +94,11 @@ function curPage()
 
 /**
  * Checks if user is allowed to open the page
- * @param  integer $userId      User's ID
- * @param  integer $userKey     User's temporary key
- * @param  String $pageVisited  Page visited
+ *
+ * @param integer $userId      User's ID
+ * @param integer $userKey     User's temporary key
+ * @param String  $pageVisited Page visited
+ *
  * @return Boolean              False/True
  */
 function checkUser($userId, $userKey, $pageVisited)

diff --git a/sources/main.functions.php b/sources/main.functions.php
@@ -810,7 +810,7 @@ function identifyUserRights(
                     // get all descendants
                     $ids = $tree->getDescendants($persoFld['id'], false, false);
                     foreach ($ids as $ident) {
-                        if ($ident->personal_folder === 1) {
+                        if ((int) $ident->personal_folder === 1) {
                             array_push($listAllowedFolders, $ident->id);
                             array_push($_SESSION['personal_visible_groups'], $ident->id);
                             array_push($_SESSION['personal_folders'], $ident->id);

diff --git a/sources/users.queries.php b/sources/users.queries.php
@@ -990,7 +990,7 @@
                 foreach ($rows as $record) {
                     if ($_SESSION['is_admin'] === '1'
                         || (($_SESSION['user_manager'] === '1' || $_SESSION['user_can_manage_all_users'] === "1")
-                        && (in_array($record['id'], $my_functions) || $record['creator_id'] == $_SESSION['user_id']))
+                        && (in_array($record['id'], $my_functions) || in_array($record['id'], $users_functions) || $record['creator_id'] == $_SESSION['user_id']))
                     ) {
                         if (in_array($record['id'], $users_functions)) {
                             $tmp = ' selected="selected"';

diff --git a/teampass-docker-start.sh b/teampass-docker-start.sh
@@ -1,16 +1,16 @@
 #!/bin/sh
-if [ ! -d ${VOL}/www/.git ];
+if [ ! -d ${VOL}/.git ];
 then
 	echo "Initial setup..."
-	git clone $REPO_URL ${VOL}/www
+	git clone $REPO_URL ${VOL}
 	mkdir ${VOL}/sk
 	chown -Rf nginx:nginx ${VOL}
 fi
 
-if [ -f ${VOL}/www/includes/config/settings.php ] ;
+if [ -f ${VOL}/includes/config/settings.php ] ;
 then
 	echo "Teampass is ready."
-	rm -rf ${VOL}/www/install
+	rm -rf ${VOL}/install
 else
 	echo "Teampass is not configured yet. Open it in a web browser to run the install process."
 	echo "Use ${VOL}/sk for the absolute path of your saltkey."