Don't use the domain part in login anymore.
[platal.git] / modules / admin.php
index 0ce61e7..ad07d0e 100644 (file)
@@ -54,7 +54,8 @@ class AdminModule extends PLModule
             'admin/xnet_without_group'     => $this->make_hook('xnet_without_group',     AUTH_MDP,    'admin'),
             'admin/jobs'                   => $this->make_hook('jobs',                   AUTH_MDP,    'admin,edit_directory'),
             'admin/profile'                => $this->make_hook('profile',                AUTH_MDP,    'admin,edit_directory'),
-            'admin/phd'                    => $this->make_hook('phd',                    AUTH_MDP,    'admin')
+            'admin/phd'                    => $this->make_hook('phd',                    AUTH_MDP,    'admin'),
+            'admin/add_secondary_edu'      => $this->make_hook('add_secondary_edu',      AUTH_MDP,    'admin')
         );
     }
 
@@ -816,8 +817,6 @@ class AdminModule extends PLModule
             $lines = explode("\n", Env::t('people'));
             $separator = Env::t('separator');
             $promotion = Env::i('promotion');
-            $nameTypes = DirEnum::getOptions(DirEnum::NAMETYPES);
-            $nameTypes = array_flip($nameTypes);
 
             if (Env::t('add_type') == 'promo') {
                 $eduSchools = DirEnum::getOptions(DirEnum::EDUSCHOOLS);
@@ -877,15 +876,9 @@ class AdminModule extends PLModule
                                                VALUES  ({?}, {?}, {?}, {?}, {?})',
                                          $infos['hrid'], $xorgId, (isset($infos[5]) ? $infos[5] : null), $birthDate, $sex);
                             $pid = XDB::insertId();
-                            XDB::execute('INSERT INTO  profile_name (pid, name, typeid)
-                                               VALUES  ({?}, {?}, {?}),
-                                                       ({?}, {?}, {?}),
-                                                       ({?}, {?}, {?}),
-                                                       ({?}, {?}, {?})',
-                                         $pid, $infos[0], $nameTypes['name_ini'],
-                                         $pid, $infos[0], $nameTypes['lastname'],
-                                         $pid, $infos[1], $nameTypes['firstname_ini'],
-                                         $pid, $infos[1], $nameTypes['firstname']);
+                            XDB::execute('INSERT INTO  profile_public_names (pid, lastname_initial, lastname_main, firstname_initial, firstname_main)
+                                               VALUES  ({?}, {?}, {?}, {?}, {?})',
+                                         $pid, $infos[0], $infos[0], $infos[1], $infos[1]);
                             XDB::execute('INSERT INTO  profile_display (pid, yourself, public_name, private_name,
                                                                         directory_name, short_name, sort_name, promo)
                                                VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
@@ -976,14 +969,12 @@ class AdminModule extends PLModule
 
         // When we have a valid target, prepare emails.
         if ($target) {
-            require_once 'emails.inc.php';
             // Examine what operation needs to be performed.
             switch ($op) {
                 case 'mail':
                     S::assert_xsrf_token();
 
-                    send_warning_homonyme($user, $loginbis);
-                    fix_bestalias($user);
+                    send_warning_homonym($user, $loginbis);
                     $op = 'list';
                     $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . '.');
                     break;
@@ -991,16 +982,8 @@ class AdminModule extends PLModule
                 case 'correct':
                     S::assert_xsrf_token();
 
-                    XDB::execute('DELETE FROM  email_source_account
-                                        WHERE  email = {?} AND type = \'alias\'',
-                                 $loginbis);
-                    XDB::execute('INSERT INTO  email_source_other (hrmid, email, domain, type, expire)
-                                       SELECT  {?}, {?}, id, \'homonym\', NOW()
-                                         FROM  email_virtual_domains
-                                        WHERE  name = {?}',
-                                 User::makeHomonymHrmid($loginbis), $loginbis, $user->mainEmailDomain());
-                    fix_bestalias($user);
-                    send_robot_homonyme($user, $loginbis);
+                    fix_homonym($user, $loginbis);
+                    send_robot_homonym($user, $loginbis);
                     $op = 'list';
                     $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . ', alias supprimé.');
                     break;
@@ -1035,6 +1018,14 @@ class AdminModule extends PLModule
             }
             $page->assign_by_ref('homonyms_to_fix', $homonyms_to_fix);
         }
+
+        if ($op == 'correct-conf') {
+            $page->assign('robot_mail_text', get_robot_mail_text($user, $loginbis));
+        }
+
+        if ($op == 'mail-conf') {
+            $page->assign('warning_mail_text', get_warning_mail_text($user, $loginbis));
+        }
     }
 
     function handler_deaths($page, $promo = 0, $validate = false)
@@ -1170,7 +1161,7 @@ class AdminModule extends PLModule
         $table_editor = new PLTableEditor('admin/validate/answers','requests_answers','id');
         $table_editor->describe('category','catégorie',true);
         $table_editor->describe('title','titre',true);
-        $table_editor->describe('answer','texte',false);
+        $table_editor->describe('answer','texte',false, true);
         $table_editor->apply($page, $action, $id);
     }
 
@@ -1181,10 +1172,10 @@ class AdminModule extends PLModule
         $table_editor = new PLTableEditor('admin/skins','skins','id');
         $table_editor->describe('name','nom',true);
         $table_editor->describe('skin_tpl','nom du template',true);
-        $table_editor->describe('auteur','auteur',false);
+        $table_editor->describe('auteur','auteur',false, true);
         $table_editor->describe('comment','commentaire',true);
-        $table_editor->describe('date','date',false);
-        $table_editor->describe('ext','extension du screenshot',false);
+        $table_editor->describe('date','date',false, true);
+        $table_editor->describe('ext','extension du screenshot',false, true);
         $table_editor->apply($page, $action, $id);
     }
 
@@ -1214,7 +1205,7 @@ class AdminModule extends PLModule
         $table_editor = new PLTableEditor('admin/mx/broken', 'mx_watch', 'host', true);
         $table_editor->describe('host', 'Masque', true);
         $table_editor->describe('state', 'Niveau', true);
-        $table_editor->describe('text', 'Description du problème', false);
+        $table_editor->describe('text', 'Description du problème', false, true);
         $table_editor->apply($page, $action, $id);
     }
 
@@ -1234,10 +1225,10 @@ class AdminModule extends PLModule
         $page->assign('title', 'Gestion des coupures');
         $table_editor = new PLTableEditor('admin/downtime','downtimes','id');
         $table_editor->describe('debut','date',true);
-        $table_editor->describe('duree','durée',false);
+        $table_editor->describe('duree','durée',false, true);
         $table_editor->describe('resume','résumé',true);
         $table_editor->describe('services','services affectés',true);
-        $table_editor->describe('description','description',false);
+        $table_editor->describe('description','description',false, true);
         $table_editor->apply($page, $action, $id);
     }
 
@@ -1893,6 +1884,118 @@ class AdminModule extends PLModule
         $page->assign('list', $list);
         $page->assign('promo', $promo);
     }
+
+    function handler_add_secondary_edu($page)
+    {
+        $page->changeTpl('admin/add_secondary_edu.tpl');
+
+        if (!(Post::has('verify') || Post::has('add'))) {
+            return;
+        } elseif (!Post::has('people')) {
+            $page->trigWarning("Aucune information n'a été fournie.");
+            return;
+        }
+
+        require_once 'name.func.inc.php';
+        $lines = explode("\n", Post::t('people'));
+        $separator = Post::t('separator');
+        $degree = Post::v('degree');
+        $promotion = Post::i('promotion');
+        $schoolsList = array_flip(DirEnum::getOptions(DirEnum::EDUSCHOOLS));
+        $degreesList = array_flip(DirEnum::getOptions(DirEnum::EDUDEGREES));
+        $edu_id = $schoolsList[Profile::EDU_X];
+        $degree_id = $degreesList[$degree];
+
+        $res = array(
+            'incomplete' => array(),
+            'empty'      => array(),
+            'multiple'   => array(),
+            'already'    => array(),
+            'new'        => array()
+        );
+        $old_pids = array();
+        $new_pids = array();
+        foreach ($lines as $line) {
+            $line = trim($line);
+            $line_array = explode($separator, $line);
+            array_walk($line_array, 'trim');
+            if (count($line_array) != 3) {
+                $page->trigError("La ligne « $line » est incomplète.");
+                $res['incomplete'][] = $line;
+                continue;
+            }
+            $cond = new PFC_And(new UFC_NameTokens(split_name_for_search($line_array[0]), array(), false, false, Profile::LASTNAME));
+            $cond->addChild(new UFC_NameTokens(split_name_for_search($line_array[1]), array(), false, false, Profile::FIRSTNAME));
+            $cond->addChild(new UFC_Promo('=', UserFilter::DISPLAY, $line_array[2]));
+            $uf = new UserFilter($cond);
+            $pid = $uf->getPIDs();
+            $count = count($pid);
+            if ($count == 0) {
+                $page->trigError("La ligne « $line » ne correspond à aucun profil existant.");
+                $res['empty'][] = $line;
+                continue;
+            } elseif ($count > 1) {
+                $page->trigError("La ligne « $line » correspond à plusieurs profils existant.");
+                $res['multiple'][] = $line;
+                continue;
+            } else {
+                $count = XDB::fetchOneCell('SELECT  COUNT(*) AS count
+                                              FROM  profile_education
+                                             WHERE  pid = {?} AND eduid = {?} AND degreeid = {?}',
+                                      $pid, $edu_id, $degree_id);
+                if ($count == 1) {
+                    $res['already'][] = $line;
+                    $old_pids[] = $pid[0];
+                } else {
+                    $res['new'][] = $line;
+                    $new_pids[] = $pid[0];
+                }
+            }
+        }
+
+        $display = array();
+        foreach ($res as $type => $res_type) {
+            if (count($res_type) > 0) {
+                $display = array_merge($display, array('--------------------' . $type . ':'), $res_type);
+            }
+        }
+        $page->assign('people', implode("\n", $display));
+        $page->assign('promotion', $promotion);
+        $page->assign('degree', $degree);
+
+        if (Post::has('add')) {
+            $entry_year = $promotion - Profile::educationDuration($degree);
+
+            if (Post::b('force_addition')) {
+                $pids = array_unique(array_merge($old_pids, $new_pids));
+            } else {
+                $pids = array_unique($new_pids);
+
+                // Updates years.
+                if (count($old_pids)) {
+                    XDB::execute('UPDATE  profile_education
+                                     SET  entry_year = {?}, grad_year = {?}, promo_year = {?}
+                                   WHERE  pid IN {?} AND eduid = {?} AND degreeid = {?}',
+                                 $entry_year, $promotion, $promotion, $old_pids, $edu_id, $degree_id);
+                }
+            }
+
+            // Precomputes values common to all users.
+            $select = XDB::format('MAX(id) + 1, pid, {?}, {?}, {?}, {?}, {?}, \'secondary\'',
+                                  $edu_id, $degree_id, $entry_year, $promotion, $promotion );
+            XDB::startTransaction();
+            foreach ($pids as $pid) {
+                XDB::execute('INSERT INTO  profile_education (id, pid, eduid, degreeid, entry_year, grad_year, promo_year, flags)
+                                   SELECT  ' . $select . '
+                                     FROM  profile_education
+                                    WHERE  pid = {?}
+                                 GROUP BY  pid',
+                             $pid);
+            }
+            XDB::commit();
+        }
+
+    }
 }
 
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: