'admin/wiki' => $this->make_hook('wiki', AUTH_MDP, 'admin'),
'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_MDP, 'admin'),
'admin/icons' => $this->make_hook('icons', AUTH_MDP, 'admin'),
+ 'admin/geocoding' => $this->make_hook('geocoding', AUTH_MDP, 'admin'),
'admin/accounts' => $this->make_hook('accounts', AUTH_MDP, 'admin'),
'admin/account/watch' => $this->make_hook('account_watch', AUTH_MDP, 'admin'),
'admin/account/types' => $this->make_hook('account_types', AUTH_MDP, 'admin'),
);
}
- 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');
}
}
- function handler_set_skin(&$page)
+ function handler_set_skin($page)
{
S::assert_xsrf_token();
S::set('skin', Post::s('change_skin'));
}
}
- 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');
$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.
// }}}
- function handler_logger(&$page, $action = null, $arg = null) {
+ function handler_logger($page, $action = null, $arg = null) {
if ($action == 'session') {
// we are viewing a session
$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');
} else if (!Post::blank('del_fwd')) {
$redirect->delete_email(Post::t('del_fwd'));
} else if (!Post::blank('activate_fwd')) {
- $redirect->modify_one_email(Post::t('activate_fwd', true));
+ $redirect->modify_one_email(Post::t('activate_fwd'), true);
} else if (!Post::blank('deactivate_fwd')) {
- $redirect->modify_one_email(Post::t('deactivate_fwd', false));
+ $redirect->modify_one_email(Post::t('deactivate_fwd'), false);
} else if (Post::has('disable_fwd')) {
$redirect->disable();
} else if (Post::has('enable_fwd')) {
if (strpos($alias, '@') !== false) {
list($alias, $domain) = explode('@', $alias);
} else {
- $domain = $globals->mail->domain;
+ $domain = $user->mainEmailDomain();
}
// Checks for alias' user validity.
if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) {
$req = new AliasReq($user, $alias, 'Admin request', false);
if ($req->commit()) {
- $page->trigSuccess("Nouvel alias '$alias@$domain' attribué");
+ $page->trigSuccess("Nouvel alias '$alias@$domain' attribué.");
} else {
- $page->trigError("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué");
+ $page->trigError("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué.");
}
- } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) {
- $res = XDB::execute("INSERT INTO aliases (uid, alias, type)
- VALUES ({?}, {?}, 'alias')",
- $user->id(), $alias);
+ } elseif ($domain == $user->mainEmailDomain()) {
+ XDB::execute('INSERT INTO email_source_account (email, uid, domain, type, flags)
+ SELECT {?}, {?}, id, \'alias\', \'\'
+ FROM email_virtual_domains
+ WHERE name = {?}',
+ $alias, $user->id(), $domain);
$page->trigSuccess("Nouvel alias '$alias' ajouté");
} else {
- $page->trigError("Le domaine '$domain' n'est pas valide");
+ $page->trigError("Le domaine '$domain' n'est pas valide pour cet utilisateur.");
}
} else if (!Post::blank('del_alias')) {
- XDB::execute("DELETE FROM aliases
- WHERE uid = {?} AND alias = {?} AND
- type NOT IN ('a_vie', 'homonyme')",
- $user->id(), $val);
- XDB::execute("UPDATE emails
- SET rewrite = ''
- WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')",
- $user->id(), $val);
+ $delete_alias = Post::t('del_alias');
+ list($email, $domain) = explode('@', $delete_alias);
+ XDB::execute('DELETE s
+ FROM email_source_account AS s
+ INNER JOIN email_virtual_domains AS m ON (s.domain = m.id)
+ INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id)
+ WHERE s.email = {?} AND s.uid = {?} AND d.name = {?} AND type != \'forlife\'',
+ $email, $user->id(), $domain);
+ XDB::execute('UPDATE email_redirect_account AS r
+ INNER JOIN email_virtual_domains AS m ON (m.name = {?})
+ INNER JOIN email_virtual_domains AS d ON (d.aliasing = m.id)
+ SET r.rewrite = \'\'
+ WHERE r.uid = {?} AND r.rewrite = CONCAT({?}, \'@\', d.name)',
+ $domain, $user->id(), $email);
fix_bestalias($user);
- $page->trigSuccess("L'alias '$val' a été supprimé");
+ $page->trigSuccess("L'alias '$delete_alias' a été supprimé");
} else if (!Post::blank('best')) {
- XDB::execute("UPDATE aliases
+ $best_alias = Post::t('best');
+ // First delete the bestalias flag from all this user's emails.
+ XDB::execute("UPDATE email_source_account
SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ','))
WHERE uid = {?}", $user->id());
- XDB::execute("UPDATE aliases
+ // Then gives the bestalias flag to the given email.
+ list($email, $domain) = explode('@', $best_alias);
+ XDB::execute("UPDATE email_source_account
SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias')
- WHERE uid = {?} AND alias = {?}", $user->id(), $val);
+ WHERE uid = {?} AND email = {?}", $user->id(), $email);
+
// As having a non-null bestalias value is critical in
// plat/al's code, we do an a posteriori check on the
// validity of the bestalias.
// }}}
- $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
$page->assign('mlists', $listClient->get_all_user_lists($user->forlifeEmail()));
// Display active aliases.
- $page->assign('virtuals', $user->emailAliases());
- $page->assign('aliases', XDB::iterator("SELECT alias, type='a_vie' AS for_life,
- FIND_IN_SET('bestalias',flags) AS best, expire
- FROM aliases
- WHERE uid = {?} AND type != 'homonyme'
- ORDER BY type != 'a_vie'", $user->id()));
+ $page->assign('virtuals', $user->emailGroupAliases());
+ $aliases = XDB::iterator("SELECT CONCAT(s.email, '@', d.name) AS email, (s.type = 'forlife') AS forlife,
+ (s.email REGEXP '\\\\.[0-9]{2}$') AS hundred_year,
+ FIND_IN_SET('bestalias', s.flags) AS bestalias, s.expire,
+ (s.type = 'alias_aux') AS alias
+ FROM email_source_account AS s
+ INNER JOIN email_virtual_domains AS d ON (s.domain = d.id)
+ WHERE s.uid = {?}
+ ORDER BY !alias, s.email",
+ $user->id());
+ $page->assign('aliases', $aliases);
$page->assign('account_types', XDB::iterator('SELECT * FROM account_types ORDER BY type'));
$page->assign('skins', XDB::iterator('SELECT id, name FROM skins ORDER BY name'));
$page->assign('profiles', XDB::iterator('SELECT p.pid, p.hrpid, FIND_IN_SET(\'owner\', ap.perms) AS owner
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) {
return $infos;
}
- private static function formatSex(&$page, $sex, $line)
+ private static function formatSex($page, $sex, $line)
{
switch ($sex) {
case 'F':
- return PlUser::GENDER_FEMALE;
+ return 'female';
case 'M':
- return PlUser::GENDER_MALE;
+ return 'male';
default:
$page->trigError("La ligne $line n'a pas été ajoutée car le sexe $sex n'est pas pris en compte.");
return null;
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');
$nameTypes = array_flip($nameTypes);
if (Env::t('add_type') == 'promo') {
- $type = 'x';
$eduSchools = DirEnum::getOptions(DirEnum::EDUSCHOOLS);
$eduSchools = array_flip($eduSchools);
$eduDegrees = DirEnum::getOptions(DirEnum::EDUDEGREES);
$grad_year = $promotion + 3;
$promo = 'X' . $promotion;
$hrpromo = $promotion;
+ $type = 'x';
break;
case 'M':
$degreeid = $eduDegrees[Profile::DEGREE_M];
$fullName = $infos[1] . ' ' . $infos[0];
$directoryName = $infos[0] . ' ' . $infos[1];
$birthDate = self::formatBirthDate($infos[2]);
- $xorgId = Profile::getXorgId($infos[4]);
+ if ($type == 'x') {
+ $xorgId = Profile::getXorgId($infos[4]);
+ } else {
+ $xorgId = trim($infos[4]);
+ }
if (is_null($xorgId)) {
$page->trigError("La ligne $line n'a pas été ajoutée car le matricule École est mal renseigné.");
continue;
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);
}
}
- 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');
$this->load("homonyms.inc.php");
if ($target) {
- $user = User::getSilent($target);
- if (!$user || !($loginbis = select_if_homonyme($user))) {
+ $user = User::getSilentWithUID($target);
+ if (!$user || !($loginbis = select_if_homonym($user))) {
$target = 0;
} else {
$page->assign('user', $user);
$page->assign('op', $op);
$page->assign('target', $target);
- // on a un $target valide, on prepare les mails
+ // When we have a valid target, prepare emails.
if ($target) {
- // on examine l'op a effectuer
+ 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);
- switch_bestalias($user, $loginbis);
+ fix_bestalias($user);
$op = 'list';
$page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . '.');
break;
case 'correct':
S::assert_xsrf_token();
- switch_bestalias($user, $loginbis);
- XDB::execute("UPDATE aliases
- SET type = 'homonyme', expire=NOW()
- WHERE alias = {?}", $loginbis);
- XDB::execute('INSERT IGNORE INTO homonyms (homonyme_id, uid)
- VALUES ({?}, {?})', $target, $target);
+ 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);
$op = 'list';
$page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . ', alias supprimé.');
}
if ($op == 'list') {
- $res = XDB::iterator(
- "SELECT a.alias AS homonyme, s.alias AS forlife,
- IF(h.homonyme_id = s.uid, a.expire, NULL) AS expire,
- IF(h.homonyme_id = s.uid, a.type, NULL) AS type, ac.uid
- FROM aliases AS a
- LEFT JOIN homonyms AS h ON (h.homonyme_id = a.uid)
- INNER JOIN aliases AS s ON (s.uid = h.uid AND s.type = 'a_vie')
- INNER JOIN accounts AS ac ON (ac.uid = a.uid)
- WHERE a.type = 'homonyme' OR a.expire != ''
- ORDER BY a.alias, forlife");
- $hnymes = Array();
- while ($tab = $res->next()) {
- $hnymes[$tab['homonyme']][] = $tab;
- }
- $page->assign_by_ref('hnymes', $hnymes);
+ // Retrieves homonyms that are already been fixed.
+ $res = XDB::iterator('SELECT o.email AS homonym, f.email AS forlife, o.expire, f.uid
+ FROM email_source_other AS o
+ INNER JOIN homonyms_list AS h ON (o.hrmid = h.hrmid)
+ INNER JOIN email_source_account AS f ON (h.uid = f.uid AND f.type = \'forlife\')
+ WHERE o.expire IS NOT NULL
+ ORDER BY homonym, forlife');
+ $homonyms = array();
+ while ($item = $res->next()) {
+ $homonyms[$item['homonym']][] = $item;
+ }
+ $page->assign_by_ref('homonyms', $homonyms);
+
+ // Retrieves homonyms that needs to be fixed.
+ $res = XDB::iterator('SELECT e.email AS homonym, f.email AS forlife, e.expire, e.uid, (e.expire < NOW()) AS urgent
+ FROM email_source_account AS e
+ INNER JOIN homonyms_list AS l ON (e.uid = l.uid)
+ INNER JOIN homonyms_list AS h ON (l.hrmid = h.hrmid)
+ INNER JOIN email_source_account AS f ON (h.uid = f.uid AND f.type = \'forlife\')
+ WHERE e.expire IS NOT NULL
+ ORDER BY homonym, forlife');
+ $homonyms_to_fix = array();
+ while ($item = $res->next()) {
+ $homonyms_to_fix[$item['homonym']][] = $item;
+ }
+ $page->assign_by_ref('homonyms_to_fix', $homonyms_to_fix);
}
}
- 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');
$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');
$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);
$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');
$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');
$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');
$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');
$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');
$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');
$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');
$table_editor->apply($page, $action, $id);
}
+ private static function isCountryIncomplete(array &$item)
+ {
+ $warning = false;
+ foreach (array('worldRegion', 'country', 'capital', 'phonePrefix', 'licensePlate', 'countryPlain') as $field) {
+ if ($item[$field] == '') {
+ $item[$field . '_warning'] = true;
+ $warning = true;
+ }
+ }
+ if (is_null($item['belongsTo'])) {
+ foreach (array('nationality', 'nationalityEn') as $field) {
+ if ($item[$field] == '') {
+ $item[$field . '_warning'] = true;
+ $warning = true;
+ }
+ }
+ }
+ 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'] == '') {
+ $item['language_warning'] = true;
+ return true;
+ }
+ return false;
+ }
+
+ 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
+ // * isoquery
+
+ static $properties = array(
+ 'country' => array(
+ 'name' => 'pays',
+ 'isocode' => '3166',
+ 'table' => 'geoloc_countries',
+ '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')
+ ),
+ 'language' => array(
+ 'name' => 'langages',
+ 'isocode' => '639',
+ 'table' => 'profile_langskill_enum',
+ 'id' => 'iso_639_2b',
+ 'main_fields' => array('iso_639_2t', 'iso_639_1', 'language_en'),
+ 'other_fields' => array('language')
+
+ )
+ );
+
+ if (is_null($category) || !array_key_exists($category, $properties)) {
+ pl_redirect('admin');
+ }
+
+ $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']);
+ $page->assign('all_fields', array_merge($data['main_fields'], $data['other_fields']));
+
+ // First build the list provided by the iso codes.
+ $list = array();
+ exec('isoquery --iso=' . $data['isocode'], $list);
+
+ foreach ($list as $key => $item) {
+ $array = explode("\t", $item);
+ unset($list[$key]);
+ $list[$array[0]] = array();
+ foreach ($data['main_fields'] as $i => $field) {
+ $list[$array[0]][$field] = $array[$i + 1];
+ }
+ }
+ ksort($list);
+
+ // Retrieve all data from the database.
+ $db_list = XDB::rawFetchAllAssoc('SELECT *
+ FROM ' . $data['table'] . '
+ ORDER BY ' . $data['id'],
+ $data['id']);
+
+ // Sort both iso and database data into 5 categories:
+ // $missing: data from the iso list not in the database,
+ // $non_existing: data from the database not in the iso list,
+ // $erroneous: data that differ on main fields,
+ // $incomplete: data with empty fields in the data base,
+ // $remaining: remaining correct and complete data from the database.
+
+ $missing = $non_existing = $erroneous = $incomplete = $remaining = array();
+ foreach (array_keys($list) as $id) {
+ if (!array_key_exists($id, $db_list)) {
+ $missing[$id] = $list[$id];
+ }
+ }
+
+ foreach ($db_list as $id => $item) {
+ if (!array_key_exists($id, $list)) {
+ $non_existing[$id] = $item;
+ } else {
+ $error = false;
+ foreach ($data['main_fields'] as $field) {
+ if ($item[$field] != $list[$id][$field]) {
+ $item[$field . '_error'] = true;
+ $error = true;
+ }
+ }
+ if ($error == true) {
+ $erroneous[$id] = $item;
+ } elseif (call_user_func_array(array('self', 'is' . ucfirst($category) . 'Incomplete'), array(&$item))) {
+ $incomplete[$id] = $item;
+ } else {
+ $remaining[$id] = $item;
+ }
+ }
+ }
+
+ $page->assign('lists', array(
+ 'manquant' => $missing,
+ 'disparu' => $non_existing,
+ 'erroné' => $erroneous,
+ 'incomplet' => $incomplete,
+ 'restant' => $remaining
+ ));
+ }
+
function handler_accounts(PlPage $page)
{
$page->changeTpl('admin/accounts.tpl');
$page->setTitle('Administration - Comptes');
- $page->addJsLink('password.js');
if (Post::has('create_account')) {
S::assert_xsrf_token();
}
- 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');
$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',
$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');
}
}
- function handler_icons(&$page)
+ function handler_icons($page)
{
$page->changeTpl('admin/icons.tpl');
$dh = opendir('../htdocs/images/icons');
$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,
ORDER BY a.hruid'));
}
- function handler_jobs(&$page, $id = -1)
+ function handler_jobs($page, $id = -1)
{
$page->changeTpl('admin/jobs.tpl');
}
}
- function handler_profile(&$page)
+ function handler_profile($page)
{
$page->changeTpl('admin/profile.tpl');
projects / platal.git / blobdiff