X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=1a103c9713f96e617159ba00890f1edb7e216c34;hb=67f95129c935e3844b9ecf996bb29f979ef3ca7f;hp=5ee9ccbcbf83dd07d2e3fed6ec98c12e442aa996;hpb=020a95fa78dc544b3064739d409026a0056d98f4;p=platal.git

diff --git a/modules/admin.php b/modules/admin.php
index 5ee9ccb..1a103c9 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -56,13 +56,13 @@ class AdminModule extends PLModule
         );
     }
 
-    function handler_phpinfo(&$page)
+    function handler_phpinfo($page)
     {
         phpinfo();
         exit;
     }
 
-    function handler_get_rights(&$page)
+    function handler_get_rights($page)
     {
         if (S::suid()) {
             $page->kill('Déjà en SUID');
@@ -86,7 +86,7 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_set_skin(&$page)
+    function handler_set_skin($page)
     {
         S::assert_xsrf_token();
         S::set('skin', Post::s('change_skin'));
@@ -97,13 +97,13 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_default(&$page)
+    function handler_default($page)
     {
         $page->changeTpl('admin/index.tpl');
         $page->setTitle('Administration');
     }
 
-    function handler_postfix_delayed(&$page)
+    function handler_postfix_delayed($page)
     {
         $page->changeTpl('admin/postfix_delayed.tpl');
         $page->setTitle('Administration - Postfix : Retardés');
@@ -278,7 +278,7 @@ class AdminModule extends PLModule
 
     // }}}
 
-    function handler_logger(&$page, $action = null, $arg = null) {
+    function handler_logger($page, $action = null, $arg = null) {
         if ($action == 'session') {
 
             // we are viewing a session
@@ -380,7 +380,7 @@ class AdminModule extends PLModule
         $page->setTitle('Administration - Logs des sessions');
     }
 
-    function handler_user(&$page, $login = false)
+    function handler_user($page, $login = false)
     {
         global $globals;
         $page->changeTpl('admin/user.tpl');
@@ -676,7 +676,6 @@ class AdminModule extends PLModule
 
 
         $page->addJsLink('jquery.ui.xorg.js');
-        $page->addJsLink('password.js');
 
         // Displays last login and last host information.
         $res = XDB::query("SELECT  start, host
@@ -732,7 +731,7 @@ class AdminModule extends PLModule
         return null;
     }
 
-    private static function formatNewUser(&$page, $infosLine, $separator, $promo, $size)
+    private static function formatNewUser($page, $infosLine, $separator, $promo, $size)
     {
         $infos = explode($separator, $infosLine);
         if (sizeof($infos) > $size || sizeof($infos) < 2) {
@@ -756,7 +755,7 @@ class AdminModule extends PLModule
         return $infos;
     }
 
-    private static function formatSex(&$page, $sex, $line)
+    private static function formatSex($page, $sex, $line)
     {
         switch ($sex) {
           case 'F':
@@ -776,7 +775,7 @@ class AdminModule extends PLModule
         return date("Y-m-d", strtotime(str_replace('/', '-', $birthDate)));
     }
 
-    function handler_add_accounts(&$page, $action = null, $promo = null)
+    function handler_add_accounts($page, $action = null, $promo = null)
     {
         $page->changeTpl('admin/add_accounts.tpl');
 
@@ -852,9 +851,9 @@ class AdminModule extends PLModule
                                                                         directory_name, short_name, sort_name, promo)
                                                VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
                                          $pid, $infos[1], $fullName, $fullName, $directoryName, $fullName, $directoryName, $promo);
-                            XDB::execute('INSERT INTO  profile_education (pid, eduid, degreeid, entry_year, grad_year, flags)
-                                               VALUES  ({?}, {?}, {?}, {?}, {?}, {?})',
-                                         $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, 'primary');
+                            XDB::execute('INSERT INTO  profile_education (id, pid, eduid, degreeid, entry_year, grad_year, flags)
+                                               VALUES  (100, {?}, {?}, {?}, {?}, {?}, \'primary\')',
+                                         $pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year);
                             XDB::execute('INSERT INTO  accounts (hruid, type, is_admin, state, full_name, directory_name, display_name, sex)
                                                VALUES  ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
                                          $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, $infos[1], $sex);
@@ -918,7 +917,7 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_homonyms(&$page, $op = 'list', $target = null)
+    function handler_homonyms($page, $op = 'list', $target = null)
     {
         $page->changeTpl('admin/homonymes.tpl');
         $page->setTitle('Administration - Homonymes');
@@ -985,7 +984,7 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_deaths(&$page, $promo = 0, $validate = false)
+    function handler_deaths($page, $promo = 0, $validate = false)
     {
         $page->changeTpl('admin/deces_promo.tpl');
         $page->setTitle('Administration - Deces');
@@ -1035,7 +1034,7 @@ class AdminModule extends PLModule
         $page->assign('profileList', $res);
     }
 
-    function handler_dead_but_active(&$page)
+    function handler_dead_but_active($page)
     {
         $page->changeTpl('admin/dead_but_active.tpl');
         $page->setTitle('Administration - Décédés');
@@ -1053,11 +1052,11 @@ class AdminModule extends PLModule
         $page->assign('dead', $res);
     }
 
-    function handler_validate(&$page, $action = 'list', $id = null)
+    function handler_validate($page, $action = 'list', $id = null)
     {
         $page->changeTpl('admin/validation.tpl');
         $page->setTitle('Administration - Valider une demande');
-        $page->addCssLink('nl.css');
+        $page->addCssLink('nl.Polytechnique.org.css');
 
         if ($action == 'edit' && !is_null($id)) {
             $page->assign('preview_id', $id);
@@ -1111,7 +1110,7 @@ class AdminModule extends PLModule
         $page->assign('isAdmin', S::admin());
     }
 
-    function handler_validate_answers(&$page, $action = 'list', $id = null)
+    function handler_validate_answers($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - Réponses automatiques de validation');
         $page->assign('title', 'Gestion des réponses automatiques');
@@ -1122,7 +1121,7 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_skins(&$page, $action = 'list', $id = null)
+    function handler_skins($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - Skins');
         $page->assign('title', 'Gestion des skins');
@@ -1136,7 +1135,7 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_postfix_blacklist(&$page, $action = 'list', $id = null)
+    function handler_postfix_blacklist($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - Postfix : Blacklist');
         $page->assign('title', 'Blacklist de postfix');
@@ -1146,7 +1145,7 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_postfix_whitelist(&$page, $action = 'list', $id = null)
+    function handler_postfix_whitelist($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - Postfix : Whitelist');
         $page->assign('title', 'Whitelist de postfix');
@@ -1155,7 +1154,7 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_mx_broken(&$page, $action = 'list', $id = null)
+    function handler_mx_broken($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - MX Défaillants');
         $page->assign('title', 'MX Défaillant');
@@ -1166,7 +1165,7 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_logger_actions(&$page, $action = 'list', $id = null)
+    function handler_logger_actions($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - Actions');
         $page->assign('title', 'Gestion des actions de logger');
@@ -1176,7 +1175,7 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_downtime(&$page, $action = 'list', $id = null)
+    function handler_downtime($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - Coupures');
         $page->assign('title', 'Gestion des coupures');
@@ -1415,7 +1414,6 @@ class AdminModule extends PLModule
     {
         $page->changeTpl('admin/accounts.tpl');
         $page->setTitle('Administration - Comptes');
-        $page->addJsLink('password.js');
 
         if (Post::has('create_account')) {
             S::assert_xsrf_token();
@@ -1446,7 +1444,7 @@ class AdminModule extends PLModule
 
     }
 
-    function handler_account_types(&$page, $action = 'list', $id = null)
+    function handler_account_types($page, $action = 'list', $id = null)
     {
         $page->setTitle('Administration - Types de comptes');
         $page->assign('title', 'Gestion des types de comptes');
@@ -1456,7 +1454,7 @@ class AdminModule extends PLModule
         $table_editor->apply($page, $action, $id);
     }
 
-    function handler_wiki(&$page, $action = 'list', $wikipage = null, $wikipage2 = null)
+    function handler_wiki($page, $action = 'list', $wikipage = null, $wikipage2 = null)
     {
         if (S::hasAuthToken()) {
            $page->setRssLink('Changement Récents',
@@ -1524,7 +1522,7 @@ class AdminModule extends PLModule
         $page->assign('perms_opts', $perms);
     }
 
-    function handler_ipwatch(&$page, $action = 'list', $ip = null)
+    function handler_ipwatch($page, $action = 'list', $ip = null)
     {
         $page->changeTpl('admin/ipwatcher.tpl');
 
@@ -1632,7 +1630,7 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_icons(&$page)
+    function handler_icons($page)
     {
         $page->changeTpl('admin/icons.tpl');
         $dh = opendir('../htdocs/images/icons');
@@ -1649,7 +1647,7 @@ class AdminModule extends PLModule
         $page->assign('icons', $icons);
     }
 
-    function handler_account_watch(&$page)
+    function handler_account_watch($page)
     {
         $page->changeTpl('admin/accounts.tpl');
         $page->assign('disabled', XDB::iterator('SELECT  a.hruid, FIND_IN_SET(\'watch\', a.flags) AS watch,
@@ -1663,7 +1661,7 @@ class AdminModule extends PLModule
                                              ORDER BY  a.hruid'));
     }
 
-    function handler_jobs(&$page, $id = -1)
+    function handler_jobs($page, $id = -1)
     {
         $page->changeTpl('admin/jobs.tpl');
 
@@ -1746,7 +1744,7 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_profile(&$page)
+    function handler_profile($page)
     {
         $page->changeTpl('admin/profile.tpl');