Merge remote branch 'origin/platal-1.0.1'

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index 1adab45..e16538e 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -26,6 +26,7 @@ class AdminModule extends PLModule
         return array(
             'phpinfo'                      => $this->make_hook('phpinfo',                AUTH_MDP, 'admin'),
             'get_rights'                   => $this->make_hook('get_rights',             AUTH_COOKIE, 'admin'),
+            'set_skin'                     => $this->make_hook('set_skin',               AUTH_COOKIE, 'admin'),
             'admin'                        => $this->make_hook('default',                AUTH_MDP, 'admin'),
             'admin/dead-but-active'        => $this->make_hook('dead_but_active',        AUTH_MDP, 'admin'),
             'admin/deaths'                 => $this->make_hook('deaths',                 AUTH_MDP, 'admin'),
@@ -83,6 +84,17 @@ class AdminModule extends PLModule
         }
     }
 
+    function handler_set_skin(&$page)
+    {
+        S::assert_xsrf_token();
+        S::set('skin', Post::s('change_skin'));
+        if (!empty($_SERVER['HTTP_REFERER'])) {
+            http_redirect($_SERVER['HTTP_REFERER']);
+        } else {
+            pl_redirect('/');
+        }
+    }
+
     function handler_default(&$page)
     {
         $page->changeTpl('admin/index.tpl');
@@ -285,10 +297,10 @@ class AdminModule extends PLModule
         if ($action == 'session') {
 
             // we are viewing a session
-            $res = XDB::query("SELECT  ls.*, a.alias AS username, sa.alias AS suer
+            $res = XDB::query("SELECT  ls.*, a.hruid AS username, sa.hruid AS suer
                                  FROM  log_sessions AS ls
-                            LEFT JOIN  aliases   AS a  ON (a.uid = ls.uid AND a.type='a_vie')
-                            LEFT JOIN  aliases   AS sa ON (sa.uid = ls.suid AND sa.type='a_vie')
+                           INNER JOIN  accounts   AS a  ON (a.uid = ls.uid)
+                            LEFT JOIN  accounts   AS sa ON (sa.uid = ls.suid)
                                 WHERE  ls.id = {?}", $arg);
 
             $page->assign('session', $a = $res->fetchOneAssoc());
@@ -304,9 +316,12 @@ class AdminModule extends PLModule
         } else {
             $loguser = $action == 'user' ? $arg : Env::v('loguser');
 
-            $res = XDB::query('SELECT uid FROM aliases WHERE alias={?}',
-                              $loguser);
-            $loguid  = $res->fetchOneCell();
+            if ($loguser) {
+                $user = User::get($loguser);
+                $loguid = $user->id();
+            } else {
+                $loguid = null;
+            }
 
             if ($loguid) {
                 $year  = Env::i('year');
@@ -344,9 +359,9 @@ class AdminModule extends PLModule
                 // get the requested sessions
                 $where  = $this->_makeWhere($year, $month, $day, $loguid);
                 $select = "SELECT  s.id, s.start, s.uid,
-                                   a.alias as username
+                                   a.hruid as username
                              FROM  log_sessions AS s
-                        LEFT JOIN  aliases   AS a  ON (a.uid = s.uid AND a.type='a_vie')
+                       INNER JOIN  accounts   AS a  ON (a.uid = s.uid)
                     $where
                     ORDER BY start DESC";
                 $res = XDB::iterator($select);
@@ -371,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");
             }
         }
 
@@ -676,6 +691,7 @@ class AdminModule extends PLModule
 
 
         $page->addJsLink('jquery.ui.core.js');
+        $page->addJsLink('jquery.ui.widget.js');
         $page->addJsLink('jquery.ui.tabs.js');
         $page->addJsLink('password.js');
 
@@ -741,7 +757,7 @@ class AdminModule extends PLModule
             return false;
         }
 
-        array_map('trim', $infos);
+        $infos = array_map('trim', $infos);
         $hrid = self::getHrid($infos[1], $infos[0], $promo);
         $res1 = XDB::query('SELECT  COUNT(*)
                               FROM  accounts
@@ -750,7 +766,7 @@ class AdminModule extends PLModule
                               FROM  profiles
                              WHERE  hrpid = {?}', $hrid);
         if (is_null($hrid) || $res1->fetchOneCell() > 0 || $res2->fetchOneCell() > 0) {
-            $page->trigError("La ligne $infosLine n'a pas été ajoutée.");
+            $page->trigError("La ligne $infosLine n'a pas été ajoutée: une entrée similaire existe déjà");
             return false;
         }
         $infos['hrid'] = $hrid;
@@ -772,7 +788,9 @@ class AdminModule extends PLModule
 
     private static function formatBirthDate($birthDate)
     {
-        return date("Y-m-d", strtotime($birthDate));
+        // strtotime believes dd/mm/yyyy to be an US date (i.e mm/dd/yyyy), and
+        // dd-mm-yyyy to be a normal date (i.e dd-mm-yyyy)...
+        return date("Y-m-d", strtotime(str_replace('/', '-', $birthDate)));
     }
 
     function handler_add_accounts(&$page, $action = null, $promo = null)
@@ -820,8 +838,7 @@ class AdminModule extends PLModule
                     $page->killError("La formation n'est pas reconnue:" . Env::t('edu_type') . '.');
                 }
 
-                XDB::execute("SET AUTOCOMMIT = 0");
-                XDB::execute("START TRANSACTION");
+                XDB::startTransaction();
                 foreach ($lines as $line) {
                     if ($infos = self::formatNewUser($page, $line, $separator, $hrpromo, 6)) {
                         $sex = self::formatSex($page, $infos[3], $line);
@@ -862,11 +879,11 @@ class AdminModule extends PLModule
                             XDB::execute('INSERT INTO  account_profiles (uid, pid, perms)
                                                VALUES  ({?}, {?}, {?})',
                                          $uid, $pid, 'owner');
-                            Profile::rebuildSearchTokens($pid);
+                            Profile::rebuildSearchTokens($pid, false);
                         }
                     }
                 }
-                XDB::execute("COMMIT");
+                XDB::commit();
             } else if (Env::t('add_type') == 'account') {
                 $type = Env::t('type');
                 $newAccounts = array();
@@ -1198,7 +1215,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);
@@ -1465,7 +1482,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 = {?}