X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=d98ef4eb12653fb2657eb47a04315316304a1ab5;hb=905cda00459649fa751c2ea292e079f5f05cae81;hp=c2a590103501aedc04536a9b5699b890fc1363b2;hpb=93e38398135982277064700519f0dd284df1eb0d;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index c2a5901..d98ef4e 100644 --- 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'); @@ -115,23 +127,6 @@ class AdminModule extends PLModule $page->assign_by_ref('mails', $sql); } - function handler_postfix_regexpsbounces(&$page, $new = null) { - $page->changeTpl('admin/emails_bounces_re.tpl'); - $page->setTitle('Administration - Postfix : Regexps Bounces'); - $page->assign('new', $new); - - if (Post::has('submit')) { - foreach (Env::v('lvl') as $id=>$val) { - XDB::query( - "REPLACE INTO emails_bounces_re (id,pos,lvl,re,text) VALUES ({?}, {?}, {?}, {?}, {?})", - $id, $_POST['pos'][$id], $_POST['lvl'][$id], $_POST['re'][$id], $_POST['text'][$id] - ); - } - } - - $page->assign('bre', XDB::iterator("SELECT * FROM emails_bounces_re ORDER BY pos")); - } - // {{{ logger view /** Retrieves the available days for a given year and month. @@ -285,10 +280,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 +299,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 +342,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 +369,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 +674,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 +740,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 +749,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 +771,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) @@ -798,25 +799,31 @@ class AdminModule extends PLModule $entry_year = $promotion; $grad_year = $promotion + 3; $promo = 'X' . $promotion; + $hrpromo = $promotion; break; case 'M': $degreeid = $eduDegrees[Profile::DEGREE_M]; $grad_year = $promotion; $entry_year = $promotion - 2; $promo = 'M' . $promotion; + $hrpromo = $promo; + $type = 'master'; break; case 'D': $degreeid = $eduDegrees[Profile::DEGREE_D]; $grad_year = $promotion; $entry_year = $promotion - 3; $promo = 'D' . $promotion; + $hrpromo = $promo; + $type = 'phd'; break; default: $page->killError("La formation n'est pas reconnue:" . Env::t('edu_type') . '.'); } + XDB::startTransaction(); foreach ($lines as $line) { - if ($infos = self::formatNewUser($page, $line, $separator, $promotion, 6)) { + if ($infos = self::formatNewUser($page, $line, $separator, $hrpromo, 6)) { $sex = self::formatSex($page, $infos[3], $line); if (!is_null($sex)) { $fullName = $infos[1] . ' ' . $infos[0]; @@ -833,11 +840,14 @@ class AdminModule extends PLModule $infos['hrid'], $xorgId, $infos[5], $birthDate, $sex); $pid = XDB::insertId(); XDB::execute('INSERT INTO profile_name (pid, name, typeid) - VALUES ({?}, {?}, {?})', - $pid, $infos[0], $nameTypes['name_ini']); - XDB::execute('INSERT INTO profile_name (pid, name, typeid) - VALUES ({?}, {?}, {?})', - $pid, $infos[1], $nameTypes['firstname_ini']); + 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_display (pid, yourself, public_name, private_name, directory_name, short_name, sort_name, promo) VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', @@ -846,15 +856,17 @@ class AdminModule extends PLModule VALUES ({?}, {?}, {?}, {?}, {?}, {?})', $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, 'primary'); XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, directory_name, display_name, sex) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $type, 0, 'active', $fullName, $directoryName, $infos[1], $sex); + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, $infos[1], $sex); $uid = XDB::insertId(); XDB::execute('INSERT INTO account_profiles (uid, pid, perms) VALUES ({?}, {?}, {?})', $uid, $pid, 'owner'); + Profile::rebuildSearchTokens($pid, false); } } } + XDB::commit(); } else if (Env::t('add_type') == 'account') { $type = Env::t('type'); $newAccounts = array(); @@ -864,9 +876,14 @@ class AdminModule extends PLModule if (!is_null($sex)) { $fullName = $infos[1] . ' ' . $infos[0]; $directoryName = $infos[0] . ' ' . $infos[1]; - XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, directory_name, display_name, sex) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $type, 0, 'active', $infos[2], $fullName, $directoryName, $infos[1], $sex); + XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, + email, full_name, directory_name, + display_name, sex) + VALUES ({?}, {?}, {?}, {?}, + {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', + $infos[2], $fullName, $directoryName, + $infos[1], $sex); $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0]; } } @@ -940,8 +957,8 @@ class AdminModule extends PLModule XDB::execute("UPDATE aliases SET type = 'homonyme', expire=NOW() WHERE alias = {?}", $loginbis); - XDB::execute("REPLACE INTO homonyms (homonyme_id, uid) - VALUES ({?}, {?})", $target, $target); + XDB::execute('INSERT IGNORE INTO homonyms (homonyme_id, uid) + VALUES ({?}, {?})', $target, $target); send_robot_homonyme($user, $loginbis); $op = 'list'; $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . ', alias supprimé.'); @@ -1041,7 +1058,6 @@ class AdminModule extends PLModule $page->changeTpl('admin/validation.tpl'); $page->setTitle('Administration - Valider une demande'); $page->addCssLink('nl.css'); - $page->addJsLink('ajax.js'); if ($action == 'edit' && !is_null($id)) { $page->assign('preview_id', $id); @@ -1077,8 +1093,9 @@ class AdminModule extends PLModule $hide[] = $cat; } $hide_requests = join(',', $hide); - XDB::query('REPLACE INTO requests_hidden (uid, hidden_requests) - VALUES ({?}, {?})', + XDB::query('INSERT INTO requests_hidden (uid, hidden_requests) + VALUES ({?}, {?}) + ON DUPLICATE KEY UPDATE hidden_requests = VALUES(hidden_requests)', S::v('uid'), $hide_requests); } elseif ($hide_requests) { foreach (explode(',', $hide_requests) as $hide_type) @@ -1181,7 +1198,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); @@ -1448,7 +1465,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 = {?} @@ -1465,7 +1482,9 @@ class AdminModule extends PLModule NAF_code = {?}, AX_code = {?}, holdingid = {?} WHERE id = {?}', Env::t('name'), Env::t('acronym'), Env::t('url'), Env::t('email'), - Env::t('NAF_code'), Env::i('AX_code'), Env::i('holdingId'), $id); + (Env::t('NAF_code') == 0 ? null : Env::t('NAF_code')), + (Env::i('AX_code') == 0 ? null : Env::t('AX_code')), + (Env::i('holdingId') == 0 ? null : Env::t('holdingId')), $id); $phone = new Phone(array('display' => Env::v('tel'), 'link_id' => $id, 'id' => 0, 'type' => 'fixed', 'link_type' => Phone::LINK_COMPANY, 'pub' => 'public'));