Merge remote branch 'origin/platal-1.0.1'

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index f203d78..6b5fc43 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -315,8 +315,13 @@ class AdminModule extends PLModule
 
         } else {
             $loguser = $action == 'user' ? $arg : Env::v('loguser');
-            $user = User::get($loguser);
-            $loguid  = $user->id();
+
+            if ($loguser) {
+                $user = User::get($loguser);
+                $loguid = $user->id();
+            } else {
+                $loguid = null;
+            }
 
             if ($loguid) {
                 $year  = Env::i('year');
@@ -381,7 +386,7 @@ class AdminModule extends PLModule
                 }
                 $page->assign_by_ref('sessions', $sessions);
             } else {
-                $page->assign('msg_nofilters', "Sélectionner une annuée et/ou un utilisateur");
+                $page->assign('msg_nofilters', "Sélectionner une année et/ou un utilisateur");
             }
         }
 
@@ -871,7 +876,7 @@ class AdminModule extends PLModule
                             XDB::execute('INSERT INTO  account_profiles (uid, pid, perms)
                                                VALUES  ({?}, {?}, {?})',
                                          $uid, $pid, 'owner');
-                            Profile::rebuildSearchTokens($pid);
+                            Profile::rebuildSearchTokens($pid, false);
                         }
                     }
                 }
@@ -1207,7 +1212,7 @@ class AdminModule extends PLModule
             S::assert_xsrf_token();
             $firstname = Post::t('firstname');
             $lastname = strtoupper(Post::t('lastname'));
-            $sex = Post::b('sex') ? User::GENDER_FEMALE : User::GENDER_MALE;
+            $sex = Post::s('sex');
             $email = Post::t('email');
             $type = Post::s('type');
             $login = PlUser::makeHrid($firstname, $lastname, $type);
@@ -1474,7 +1479,7 @@ class AdminModule extends PLModule
             $selectedJob = Env::has('selectedJob');
 
             Phone::deletePhones(0, Phone::LINK_COMPANY, $id);
-            Address::delete(null, Address::LINK_COMPANY, $id);
+            Address::deleteAddresses(null, Address::LINK_COMPANY, $id);
             if (Env::has('change')) {
                 XDB::execute('UPDATE  profile_job
                                  SET  jobid = {?}