Fix user personnal folder creation.

nilsteampassnet · Jul 26, 2024 · aadbe56 · aadbe56
1 parent c1d01fe
commit aadbe56
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/pages/tasks.php b/pages/tasks.php
@@ -233,15 +233,9 @@
                                             <button class="btn btn-primary task-define" data-task="users_personal_folder_task">
                                                 <i class="fa-solid fa-cogs"></i>
                                             </button>
-                                            <?php
-                                            if (defined('WIP') === true && WIP === true) {
-                                                ?>
                                             <button class="btn btn-primary task-perform ml-1" data-task="users_personal_folder_task">
                                                 <i class="fa-solid fa-play"></i>
                                             </button>
-                                            <?php
-                                            }
-                                            ?>
                                         </div>
                                     </div>
 

diff --git a/scripts/task_maintenance_users_personal_folder.php b/scripts/task_maintenance_users_personal_folder.php
@@ -30,6 +30,7 @@
 use TeampassClasses\SessionManager\SessionManager;
 use Symfony\Component\HttpFoundation\Request;
 use TeampassClasses\Language\Language;
+use TeampassClasses\ConfigManager\ConfigManager;
 
 // Load functions
 require_once __DIR__.'/../sources/main.functions.php';
@@ -75,26 +76,15 @@ function createUserPersonalFolder(): void
     //Libraries call
     $tree = new NestedTree(prefixTable('nested_tree'), 'id', 'parent_id', 'title');
 
-    //get through all users
+    //get through all users with enabled personnal folder.
     $users = DB::query(
         'SELECT id, login, email
         FROM ' . prefixTable('users') . '
         WHERE id NOT IN ('.OTV_USER_ID.', '.TP_USER_ID.', '.SSH_USER_ID.', '.API_USER_ID.')
+        AND personal_folder = 1
         ORDER BY login ASC'
     );
     foreach ($users as $user) {
-        /*
-        //update PF field for user
-        DB::update(
-            prefixTable('users'),
-            array(
-                'personal_folder' => '1',
-            ),
-            'id = %i',
-            $user['id']
-        );
-        */
-
         //if folder doesn't exist then create it
         $data = DB::queryfirstrow(
             'SELECT id

diff --git a/sources/items.queries.php b/sources/items.queries.php
@@ -3903,7 +3903,8 @@
             // Prepare tree
             $arbo = $tree->getPath($inputData['id'], true);
             foreach ($arbo as $elem) {
-                if ($elem->title === $session->get('user-id') && (int) $elem->nlevel === 1) {
+                // Personnal folder
+                if ((int) $elem->title === (int) $session->get('user-id') && (int) $elem->nlevel === 1) {
                     $elem->title = $session->get('user-login');
                 }
                 // Store path elements