X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=891602af9ff17c1b461a74332531b469d18fd805;hb=7cfaf4944d96d5665e56151065431c2b63634889;hp=5eb630a72c20d116fb3476579d3005277dbede59;hpb=1bf36cd12647c3d2eb8f9ec2a1f0eaad0b5f7e81;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 5eb630a..891602a 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -395,7 +395,7 @@ class AdminModule extends PLModule pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m')); } - if(Post::has('su_button') && $registered) { + if(Post::has('su_account') && $registered) { if (!Platal::session()->startSUID($user)) { $page->trigError('Impossible d\'effectuer un SUID sur ' . $user->login()); } else { @@ -433,8 +433,8 @@ class AdminModule extends PLModule if (Post::i('token_access', 0) != ($user->token_access ? 1 : 0)) { $to_update['token'] = Post::i('token_access') ? rand_url_id(16) : null; } - if (Post::i('skin', 0) != $user->skin) { - $to_update['skin'] = Post::i('skin', 0); + if (Post::i('skin') != $user->skin) { + $to_update['skin'] = Post::i('skin'); if ($to_update['skin'] == 0) { $to_update['skin'] = null; } @@ -598,8 +598,8 @@ class AdminModule extends PLModule // }}} - $page->addJsLink('ui.core.js'); - $page->addJsLink('ui.tabs.js'); + $page->addJsLink('jquery.ui.core.js'); + $page->addJsLink('jquery.ui.tabs.js'); // Displays last login and last host information. $res = XDB::query("SELECT start, host @@ -697,7 +697,6 @@ class AdminModule extends PLModule $page->changeTpl('admin/add_accounts.tpl'); if (Env::has('add_type') && Env::has('people')) { - require_once 'directory.enums.inc.php'; $lines = explode("\n", Env::t('people')); $separator = Env::t('separator'); $promotion = Env::i('promotion'); @@ -901,9 +900,9 @@ class AdminModule extends PLModule WHERE hrpid = {?}', $val, $pid); $page->trigSuccess('Ajout du décès de ' . $name . ' le ' . $val . '.'); if($death == '0000-00-00' || empty($death)) { - // TODO: FIX THIS DEPRECATED CALL - require_once('user.func.inc.php'); - user_clear_all_subs($uid, false); // by default, dead ppl do not loose their email + $profile = Profile::get($pid); + $profile->clear(); + $profile->owner()->clear(false); } } } @@ -936,7 +935,7 @@ class AdminModule extends PLModule function handler_validate(&$page, $action = 'list', $id = null) { - $page->changeTpl('admin/valider.tpl'); + $page->changeTpl('admin/validation.tpl'); $page->setTitle('Administration - Valider une demande'); $page->addCssLink('nl.css'); $page->addJsLink('ajax.js');