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

diff --git a/modules/admin.php b/modules/admin.php
index f007313..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');
@@ -675,10 +675,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');
+        $page->addJsLink('jquery.ui.xorg.js');
 
         // Displays last login and last host information.
         $res = XDB::query("SELECT  start, host
@@ -734,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) {
@@ -758,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':
@@ -778,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');
 
@@ -854,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);
@@ -920,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');
@@ -987,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');
@@ -1037,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');
@@ -1055,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);
@@ -1113,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');
@@ -1124,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');
@@ -1138,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');
@@ -1148,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');
@@ -1157,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');
@@ -1168,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');
@@ -1178,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');
@@ -1211,6 +1208,14 @@ class AdminModule extends PLModule
         return $warning;
     }
 
+    private static function updateCountry(array $item)
+    {
+        XDB::execute('UPDATE  geoloc_countries
+                         SET  countryPlain = {?}
+                       WHERE  iso_3166_1_a2 = {?}',
+                     mb_strtoupper(replace_accent($item['country'])), $item['iso_3166_1_a2']);
+    }
+
     private static function isLanguageIncomplete(array &$item)
     {
         if ($item['language'] == '') {
@@ -1220,7 +1225,9 @@ class AdminModule extends PLModule
         return false;
     }
 
-    function handler_geocoding(&$page, $action = null)
+    private static function updateLanguage(array $item) {}
+
+    function handler_geocoding(&$page, $category = null, $action = null, $id = null)
     {
         // Warning, this handler requires the following packages:
         //  * pkg-isocodes
@@ -1234,7 +1241,7 @@ class AdminModule extends PLModule
                 'id'           => 'iso_3166_1_a2',
                 'main_fields'  => array('iso_3166_1_a3', 'iso_3166_1_num', 'countryEn'),
                 'other_fields' => array('worldRegion', 'country', 'capital', 'nationality', 'nationalityEn',
-                                        'phonePrefix', 'phoneFormat', 'licensePlate', 'belongsTo', 'countryPlain')
+                                        'phonePrefix', 'phoneFormat', 'licensePlate', 'belongsTo')
             ),
             'language' => array(
                 'name'         => 'langages',
@@ -1246,16 +1253,94 @@ class AdminModule extends PLModule
 
             )
         );
-        //For  ISO  639,  the  first  three  columns are the ISO 639 2B code, the ISO 639 2T code and the ISO 639-1 code.  The third column may be
 
-        if (is_null($action) || !array_key_exists($action, $properties)) {
+        if (is_null($category) || !array_key_exists($category, $properties)) {
             pl_redirect('admin');
         }
 
-        $data = $properties[$action];
+        $data = $properties[$category];
+
+        if ($action == 'edit' || $action == 'add') {
+            $main_fields = array_merge(array($data['id']), $data['main_fields']);
+            $all_fields = array_merge($main_fields, $data['other_fields']);
+
+            if (is_null($id)) {
+                if (Post::has('new_id')) {
+                    $id = Post::v('new_id');
+                } else {
+                    pl_redirect('admin/geocoding/' . $category);
+                }
+            }
+
+            $list = array();
+            exec('isoquery --iso=' . $data['isocode'] . ' ' . $id, $list);
+            if (count($list) == 1) {
+                $array = explode("\t", $list[0]);
+                foreach ($main_fields as $i => $field) {
+                    $iso[$field] = $array[$i];
+                }
+            } else {
+                $iso = array();
+            }
+
+            if ($action == 'add') {
+                if (Post::has('new_id')) {
+                    S::assert_xsrf_token();
+                }
+
+                if (count($iso)) {
+                    $item = $iso;
+                } else {
+                    $item = array($data['id'] => $id);
+                }
+                XDB::execute('INSERT INTO  ' . $data['table'] . '(' . implode(', ', array_keys($item)) . ')
+                                   VALUES  ' . XDB::formatArray($item));
+                $page->trigSuccess($id . ' a bien été ajouté à la base.');
+            } elseif ($action == 'edit') {
+                if (Post::has('edit')) {
+                    S::assert_xsrf_token();
+
+                    $item = array();
+                    $set  = array();
+                    foreach ($all_fields as $field) {
+                        $item[$field] = Post::t($field);
+                        $set[] = $field . XDB::format(' = {?}', ($item[$field] ? $item[$field] : null));
+                    }
+                    XDB::execute('UPDATE  ' . $data['table'] . '
+                                     SET  ' . implode(', ', $set) . '
+                                   WHERE  ' . $data['id'] . ' = {?}',
+                                 $id);
+                    call_user_func_array(array('self', 'update' . ucfirst($category)), array($item));
+                    $page->trigSuccess($id . ' a bien été mis à jour.');
+                } elseif (Post::has('del')) {
+                    S::assert_xsrf_token();
+
+                    XDB::execute('DELETE FROM  ' . $data['table'] . '
+                                        WHERE  ' . $data['id'] . ' = {?}',
+                                 $id);
+                    $page->trigSuccessRedirect($id . ' a bien été supprimé.', 'admin/geocoding/' . $category);
+                } else {
+                    $item = XDB::fetchOneAssoc('SELECT  *
+                                                  FROM  ' . $data['table'] . '
+                                                 WHERE  ' . $data['id'] . ' = {?}',
+                                               $id);
+                }
+            }
+
+            $page->changeTpl('admin/geocoding_edit.tpl');
+            $page->setTitle('Administration - ' . ucfirst($data['name']));
+            $page->assign('category', $category);
+            $page->assign('name', $data['name']);
+            $page->assign('all_fields', $all_fields);
+            $page->assign('id', $id);
+            $page->assign('iso', $iso);
+            $page->assign('item', $item);
+            return;
+        }
 
         $page->changeTpl('admin/geocoding.tpl');
         $page->setTitle('Administration - ' . ucfirst($data['name']));
+        $page->assign('category', $category);
         $page->assign('name', $data['name']);
         $page->assign('id', $data['id']);
         $page->assign('main_fields', $data['main_fields']);
@@ -1308,7 +1393,7 @@ class AdminModule extends PLModule
                 }
                 if ($error == true) {
                     $erroneous[$id] = $item;
-                } elseif (call_user_func_array(array('self', 'is' . ucfirst($action) . 'Incomplete'), array(&$item))) {
+                } elseif (call_user_func_array(array('self', 'is' . ucfirst($category) . 'Incomplete'), array(&$item))) {
                     $incomplete[$id] = $item;
                 } else {
                     $remaining[$id] = $item;
@@ -1329,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();
@@ -1360,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');
@@ -1370,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',
@@ -1438,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');
 
@@ -1546,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');
@@ -1563,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,
@@ -1577,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');
 
@@ -1660,7 +1744,7 @@ class AdminModule extends PLModule
         }
     }
 
-    function handler_profile(&$page)
+    function handler_profile($page)
     {
         $page->changeTpl('admin/profile.tpl');