INNER JOIN emails AS e2 ON(e1.email = e2.email AND e1.uid!=e2.uid AND
(e1.uid<e2.uid OR NOT FIND_IN_SET('active', e2.flags))
)
- INNER JOIN emails_watch AS w ON(w.email = e1.email AND w.state = 'pending')
+ INNER JOIN email_watch AS w ON(w.email = e1.email AND w.state = 'pending')
INNER JOIN aliases AS a1 ON(a1.id=e1.uid AND a1.type='a_vie')
INNER JOIN aliases AS a2 ON(a2.id=e2.uid AND a2.type='a_vie')
INNER JOIN auth_user_md5 AS u1 ON(a1.id=u1.user_id)
INNER JOIN emails AS e2 ON(e1.email = e2.email AND e1.uid!=e2.uid AND
(e1.uid<e2.uid OR NOT FIND_IN_SET('active', e2.flags))
)
- INNER JOIN emails_watch AS w ON(w.email = e1.email AND w.state != 'safe')
+ INNER JOIN email_watch AS w ON(w.email = e1.email AND w.state != 'safe')
INNER JOIN aliases AS a1 ON(a1.id=e1.uid AND a1.type='a_vie')
INNER JOIN aliases AS a2 ON(a2.id=e2.uid AND a2.type='a_vie')
INNER JOIN auth_user_md5 AS u1 ON(a1.id=u1.user_id)
FROM emails AS e1
INNER JOIN emails AS e2 ON (e1.email = e2.email AND e1.uid != e2.uid
AND (e1.uid < e2.uid OR NOT FIND_IN_SET('active', e2.flags)))
- LEFT JOIN emails_watch AS w ON (e1.email = w.email)
+ LEFT JOIN email_watch AS w ON (e1.email = w.email)
INNER JOIN aliases AS a1 ON (a1.id = e1.uid AND a1.type = 'a_vie')
INNER JOIN aliases AS a2 ON (a2.id = e2.uid AND a2.type = 'a_vie')
INNER JOIN auth_user_md5 AS u1 ON (a1.id = u1.user_id)
. "https://www.polytechnique.org/admin/emails/duplicated";
echo "\n\n";
- $sql = "INSERT IGNORE INTO emails_watch (email, state, detection, last)
+ $sql = "INSERT IGNORE INTO email_watch (email, state, detection, last)
VALUES " . join(", ", $insert);
XDB::execute($sql);
if (XDB::errno() != 0) {
while ($old = $resRobot->next()) {
$res = XDB::query(
"SELECT u.hruid
- FROM homonymes AS h
+ FROM homonyms AS h
INNER JOIN auth_user_md5 AS u USING (user_id)
WHERE homonyme_id = {?}",
$old['id']);
function check_email($email, $message)
{
$res = XDB::query("SELECT state, description
- FROM emails_watch
+ FROM email_watch
WHERE state != 'safe' AND email = {?}", $email);
if ($res->numRows()) {
send_warning_mail($message);
public function commit()
{
- if (XDB::execute("INSERT INTO evenements
+ if (XDB::execute("INSERT INTO announces
SET user_id = {?}, creation_date=NOW(), titre={?}, texte={?},
peremption={?}, promo_min={?}, promo_max={?}, flags=CONCAT(flags,',valide,wiki')",
$this->user->id(), $this->titre, $this->texte,
$this->peremption, $this->pmin, $this->pmax)) {
$eid = XDB::insertId();
if ($this->img) {
- XDB::execute("INSERT INTO evenements_photo
+ XDB::execute("INSERT INTO announce_photos
SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}",
XDB::insertId(), $this->imgtype, $this->imgx, $this->imgy, $this->img);
}
$globals->banana->event_reply,
$this->titre, MiniWiki::wikiToText($this->texte, false, 0, 80));
if ($post != -1) {
- XDB::execute("UPDATE evenements
+ XDB::execute("UPDATE announces
SET creation_date = creation_date, post_id = {?}
WHERE id = {?}", $post, $eid);
}
switch_bestalias($this->user, $this->loginbis);
if (!$this->warning) {
XDB::execute("UPDATE aliases SET type = 'homonyme', expire = NOW() WHERE alias = {?}", $this->loginbis);
- XDB::execute("REPLACE INTO homonymes (homonyme_id, user_id) VALUES({?}, {?})", $this->user->id(), $this->user->id());
+ XDB::execute("REPLACE INTO homonyms (homonyme_id, user_id) VALUES({?}, {?})", $this->user->id(), $this->user->id());
}
return true;
public function commit()
{
- $sql = 'INSERT INTO survey_surveys
+ $sql = 'INSERT INTO surveys
SET questions={?},
title={?},
description={?},
XDB::execute("UPDATE aliases
SET type = 'homonyme', expire=NOW()
WHERE alias = {?}", $loginbis);
- XDB::execute("REPLACE INTO homonymes (homonyme_id,user_id)
+ XDB::execute("REPLACE INTO homonyms (homonyme_id,user_id)
VALUES ({?}, {?})", $target, $target);
send_robot_homonyme($user, $loginbis);
$op = 'list';
IF(h.homonyme_id = s.id, a.type, NULL) AS type,
ac.uid AS user_id
FROM aliases AS a
- LEFT JOIN homonymes AS h ON (h.homonyme_id = a.id)
+ LEFT JOIN homonyms AS h ON (h.homonyme_id = a.id)
INNER JOIN aliases AS s ON (s.id = h.user_id AND s.type='a_vie')
INNER JOIN accounts AS ac ON (ac.uid = a.id)
WHERE a.type = 'homonyme' OR a.expire != ''
{
$page->setTitle('Administration - Coupures');
$page->assign('title', 'Gestion des coupures');
- $table_editor = new PLTableEditor('admin/downtime','coupures','id');
+ $table_editor = new PLTableEditor('admin/downtime','downtimes','id');
$table_editor->describe('debut','date',true);
$table_editor->describe('duree','durée',false);
$table_editor->describe('resume','résumé',true);
$homonyme = XDB::query(
"SELECT alias
FROM aliases
- INNER JOIN homonymes ON (id = homonyme_id)
+ INNER JOIN homonyms ON (id = homonyme_id)
WHERE user_id = {?} AND type = 'homonyme'", $user->id());
$page->assign('homonyme', $homonyme->fetchOneCell());
switch (Post::v('action')) {
case 'create':
if (trim(Post::v('emailN')) != '') {
- Xdb::execute('INSERT IGNORE INTO emails_watch (email, state, detection, last, uid, description)
+ Xdb::execute('INSERT IGNORE INTO email_watch (email, state, detection, last, uid, description)
VALUES ({?}, {?}, CURDATE(), NOW(), {?}, {?})',
trim(Post::v('emailN')), Post::v('stateN'), S::i('uid'), Post::v('descriptionN'));
};
break;
case 'edit':
- Xdb::execute('UPDATE emails_watch
+ Xdb::execute('UPDATE email_watch
SET state = {?}, last = NOW(), uid = {?}, description = {?}
WHERE email = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), Post::v('emailN'));
break;
default:
if ($action == 'delete' && !is_null($email)) {
- Xdb::execute('DELETE FROM emails_watch WHERE email = {?}', $email);
+ Xdb::execute('DELETE FROM email_watch WHERE email = {?}', $email);
}
}
if ($action != 'create' && $action != 'edit') {
if ($action == 'list') {
$sql = "SELECT w.email, w.detection, w.state, a.alias AS forlife
- FROM emails_watch AS w
+ FROM email_watch AS w
LEFT JOIN emails AS e USING(email)
LEFT JOIN aliases AS a ON (a.id = e.uid AND a.type = 'a_vie')
ORDER BY w.state, w.email, a.alias";
} elseif ($action == 'edit') {
$sql = "SELECT w.detection, w.state, w.last, w.description,
a1.alias AS edit, a2.alias AS forlife
- FROM emails_watch AS w
+ FROM email_watch AS w
LEFT JOIN aliases AS a1 ON (a1.id = w.uid AND a1.type = 'a_vie')
LEFT JOIN emails AS e ON (w.email = e.email)
LEFT JOIN aliases AS a2 ON (a2.id = e.uid AND a2.type = 'a_vie')
// Hide the read event, and reload the page to get to the next event.
if ($action == 'read' && $eid) {
XDB::execute('DELETE ev.*
- FROM evenements_vus AS ev
- INNER JOIN evenements AS e ON e.id = ev.evt_id
+ FROM announce_read AS ev
+ INNER JOIN announces AS e ON e.id = ev.evt_id
WHERE peremption < NOW()');
- XDB::execute('REPLACE INTO evenements_vus VALUES({?},{?})',
+ XDB::execute('REPLACE INTO announce_read VALUES({?},{?})',
$eid, S::v('uid'));
pl_redirect('events#'.$pound);
}
// Unhide the requested event, and reload the page to display it.
if ($action == 'unread' && $eid) {
- XDB::execute('DELETE FROM evenements_vus
+ XDB::execute('DELETE FROM announce_read
WHERE evt_id = {?} AND user_id = {?}',
$eid, S::v('uid'));
pl_redirect('events#newsid'.$eid);
e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY) AS news,
e.peremption < DATE_ADD(CURDATE(), INTERVAL 2 DAY) AS end,
ev.user_id IS NULL AS nonlu, e.promo_min, e.promo_max
- FROM evenements AS e
- LEFT JOIN evenements_photo AS p ON (e.id = p.eid)
- LEFT JOIN evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
+ FROM announces AS e
+ LEFT JOIN announce_photos AS p ON (e.id = p.eid)
+ LEFT JOIN announce_read AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
WHERE FIND_IN_SET('valide', e.flags) AND peremption >= NOW()
ORDER BY important DESC, news DESC, end DESC, e.peremption, e.creation_date DESC",
S::i('uid'));
function handler_photo(&$page, $eid = null, $valid = null)
{
if ($eid && $eid != 'valid') {
- $res = XDB::query("SELECT * FROM evenements_photo WHERE eid = {?}", $eid);
+ $res = XDB::query("SELECT * FROM announce_photos WHERE eid = {?}", $eid);
if ($res->numRows()) {
$photo = $res->fetchOneAssoc();
pl_cached_dynamic_content_headers("image/" . $photo['attachmime']);
if (Post::v('action') == 'Pas d\'image' && $eid) {
S::assert_xsrf_token();
$upload->rm();
- XDB::execute("DELETE FROM evenements_photo WHERE eid = {?}", $eid);
+ XDB::execute("DELETE FROM announce_photos WHERE eid = {?}", $eid);
$action = 'edit';
} elseif (Post::v('action') == 'Supprimer l\'image' && $eid) {
S::assert_xsrf_token();
$page->trigError("L'intervalle de promotions $promo_min -> $promo_max n'est pas valide");
$action = 'edit';
} else {
- $res = XDB::query('SELECT flags FROM evenements WHERE id = {?}', $eid);
+ $res = XDB::query('SELECT flags FROM announces WHERE id = {?}', $eid);
$flags = new PlFlagSet($res->fetchOneCell());
$flags->addFlag('wiki');
if (Post::v('important')) {
$flags->rmFlag('important');
}
- XDB::execute('UPDATE evenements
+ XDB::execute('UPDATE announces
SET creation_date = creation_date,
titre={?}, texte={?}, peremption={?}, promo_min={?}, promo_max={?},
flags = {?}
Post::v('promo_min'), Post::v('promo_max'),
$flags, $eid);
if ($upload->exists() && list($x, $y, $type) = $upload->imageInfo()) {
- XDB::execute('REPLACE INTO evenements_photo
+ XDB::execute('REPLACE INTO announce_photos
SET eid = {?}, attachmime = {?}, x = {?}, y = {?}, attach = {?}',
$eid, $type, $x, $y, $upload->getContents());
$upload->rm();
if ($action == 'edit') {
$res = XDB::query('SELECT titre, texte, peremption, promo_min, promo_max, FIND_IN_SET(\'important\', flags),
attach IS NOT NULL
- FROM evenements AS e
- LEFT JOIN evenements_photo AS p ON(e.id = p.eid)
+ FROM announces AS e
+ LEFT JOIN announce_photos AS p ON(e.id = p.eid)
WHERE id={?}', $eid);
list($titre, $texte, $peremption, $promo_min, $promo_max, $important, $img) = $res->fetchOneRow();
$page->assign('titre',$titre);
switch ($action) {
case 'delete':
S::assert_xsrf_token();
- XDB::execute('DELETE from evenements
+ XDB::execute('DELETE from announces
WHERE id = {?}', $eid);
break;
case "archive":
S::assert_xsrf_token();
- XDB::execute('UPDATE evenements
+ XDB::execute('UPDATE announces
SET creation_date = creation_date, flags = CONCAT(flags,",archive")
WHERE id = {?}', $eid);
break;
case "unarchive":
S::assert_xsrf_token();
- XDB::execute('UPDATE evenements
+ XDB::execute('UPDATE announces
SET creation_date = creation_date, flags = REPLACE(flags,"archive","")
WHERE id = {?}', $eid);
$action = 'archives';
case "valid":
S::assert_xsrf_token();
- XDB::execute('UPDATE evenements
+ XDB::execute('UPDATE announces
SET creation_date = creation_date, flags = CONCAT(flags,",valide")
WHERE id = {?}', $eid);
break;
case "unvalid":
S::assert_xsrf_token();
- XDB::execute('UPDATE evenements
+ XDB::execute('UPDATE announces
SET creation_date = creation_date, flags = REPLACE(flags,"valide", "")
WHERE id = {?}', $eid);
break;
FIND_IN_SET('valide', e.flags) AS fvalide,
FIND_IN_SET('archive', e.flags) AS farch,
FIND_IN_SET('wiki', e.flags) AS wiki
- FROM evenements AS e
+ FROM announces AS e
WHERE ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags)
ORDER BY FIND_IN_SET('valide',e.flags), e.peremption DESC";
$page->assign('evs', XDB::iterator($sql));
$events = XDB::iterator('SELECT e.id, e.titre AS title, e.texte, e.creation_date AS publication, e.post_id,
p.attachmime IS NOT NULL AS photo, FIND_IN_SET(\'wiki\', e.flags) AS wiki,
e.user_id, e.promo_min, e.promo_max
- FROM evenements AS e
- LEFT JOIN evenements_photo AS p ON (p.eid = e.id)
+ FROM announces AS e
+ LEFT JOIN announce_photos AS p ON (p.eid = e.id)
WHERE FIND_IN_SET("valide", e.flags) AND peremption >= NOW()');
$data = array();
while ($e = self::nextEvent($events, $user)) {
e.id, e.titre, UNIX_TIMESTAMP(e.creation_date) AS creation_date,
IF(u.nom_usage = "", u.nom, u.nom_usage) AS nom, u.prenom, u.promo,
ev.user_id IS NULL AS nonlu, e.user_id
- FROM evenements AS e
- LEFT JOIN evenements_vus AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
+ FROM announces AS e
+ LEFT JOIN announce_read AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
WHERE FIND_IN_SET("valide", e.flags) AND peremption >= NOW()
ORDER BY e.creation_date DESC', S::i('uid'));
$page->assign('event_count', XDB::query("SELECT FOUND_ROWS()")->fetchOneCell());
$page->assign('ok', true);
$url = rand_url_id();
- XDB::execute('INSERT INTO perte_pass (certificat,uid,created)
+ XDB::execute('INSERT INTO account_lost_passwords (certificat,uid,created)
VALUES ({?},{?},NOW())', $url, $user->id());
$res = XDB::query('SELECT email
FROM emails
{
global $globals;
// XXX: recovery requires data from the profile
- XDB::execute('DELETE FROM perte_pass
+ XDB::execute('DELETE FROM account_lost_passwords
WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > created');
$res = XDB::query('SELECT uid
- FROM perte_pass WHERE certificat={?}', $certif);
+ FROM account_lost_passwords WHERE certificat={?}', $certif);
$ligne = $res->fetchOneAssoc();
if (!$ligne) {
$page->changeTpl('platal/index.tpl');
SET password={?}
WHERE uid = {?} AND state = \'active\'',
$password, $uid);
- XDB::query('DELETE FROM perte_pass
+ XDB::query('DELETE FROM account_lost_passwords
WHERE certificat={?}', $certif);
// If GoogleApps is enabled, and the user did choose to use synchronized passwords,
// Check if the given email is known as dangerous.
$res = XDB::query("SELECT w.state, w.description
- FROM emails_watch AS w
+ FROM email_watch AS w
WHERE w.email = {?} AND w.state != 'safe'",
Post::v('email'));
$email_banned = false;
list($h_id, $h_type, $expire) = $res->fetchOneRow();
if ($h_type != 'homonyme' and empty($expire)) {
XDB::execute('UPDATE aliases SET expire=ADDDATE(NOW(),INTERVAL 1 MONTH) WHERE alias={?}', $mailorg);
- XDB::execute('REPLACE INTO homonymes (homonyme_id,user_id) VALUES ({?},{?})', $h_id, $h_id);
- XDB::execute('REPLACE INTO homonymes (homonyme_id,user_id) VALUES ({?},{?})', $h_id, $uid);
+ XDB::execute('REPLACE INTO homonyms (homonyme_id,user_id) VALUES ({?},{?})', $h_id, $h_id);
+ XDB::execute('REPLACE INTO homonyms (homonyme_id,user_id) VALUES ({?},{?})', $h_id, $uid);
$res = XDB::query("SELECT alias FROM aliases WHERE id={?} AND expire IS NULL", $h_id);
$als = $res->fetchColumn();
$res = XDB::query("SELECT debut,
TIME_FORMAT(duree,'%kh%i') AS duree,
resume, description, services
- FROM coupures
+ FROM downtimes
WHERE id = {?}", $cp_id);
$cp = $res->fetchOneAssoc();
}
} else {
$beginning_date = date("Ymd", time() - 3600*24*21) . "000000";
$sql = "SELECT id, debut, resume, services
- FROM coupures where debut > '$beginning_date' order by debut desc";
+ FROM downtimes where debut > '$beginning_date' order by debut desc";
$page->assign('coupures', XDB::iterator($sql));
$res = XDB::iterator("SELECT host, text
FROM mx_watch
return null;
}
$sql = 'SELECT id, title, end, mode
- FROM survey_surveys
+ FROM surveys
WHERE '.$where.'
ORDER BY end DESC;';
if ($tpl) {
public static function retrieveSurvey($sid)
{
$sql = 'SELECT questions, title, description, end, mode, promos
- FROM survey_surveys
+ FROM surveys
WHERE id={?}';
$res = XDB::query($sql, $sid);
$data = $res->fetchOneAssoc();
public static function retrieveSurveyInfo($sid)
{
$sql = 'SELECT title, description, end, mode, promos
- FROM survey_surveys
+ FROM surveys
WHERE id={?}';
$res = XDB::query($sql, $sid);
return $res->fetchOneAssoc();
public function updateSurvey()
{
if ($this->valid) {
- $sql = 'UPDATE survey_surveys
+ $sql = 'UPDATE surveys
SET questions={?},
title={?},
description={?},
public static function deleteSurvey($sid)
{
$sql = 'DELETE s.*, v.*, a.*
- FROM survey_surveys AS s
+ FROM surveys AS s
LEFT JOIN survey_votes AS v
ON v.survey_id=s.id
LEFT JOIN survey_answers AS a
copyTable('#groupex#.membres_sub_requests', 'group_member_sub_requests');
copyTable('#x4dat#.groupesx_auth'), 'group_auth');
+copyTable('#x4dat#.axletter', 'axletter');
+copyTable('#x4dat#.axletter_ins', 'axletter_ins');
+copyTable('#x4dat#.axletter_rights', 'axletter_rights');
+
+copyTable('#x4dat#.newsletter', 'newsletter');
+copyTable('#x4dat#.newsletter_art', 'newsletter_art');
+copyTable('#x4dat#.newsletter_cat', 'newsletter_cat');
+copyTable('#x4dat#.newsletter_ins', 'newsletter_ins');
+
+copyTable('#x4dat#.openid_trusted', 'openid_trusted');
+
+copyTable('#x4dat#.evenements', 'announces');
+copyTable('#x4dat#.evenements_photo', 'announce_photos');
+copyTable('#x4dat#.evenements_vus', 'announce_read');
+
+copyTable('#x4dat#.gapps_accounts', 'gapps_accounts');
+copyTable('#x4dat#.gapps_nicknames', 'gapps_nicknames');
+copyTable('#x4dat#.gapps_queue', 'gapps_queue');
+copyTable('#x4dat#.gapps_reporting', 'gapps_reporting');
+
+copyTable('#x4dat#.contacts', 'contacts');
+copyTable('#x4dat#.coupures', 'downtimes');
+copyTable('#x4dat#.emails_watch', 'email_watch');
+copyTable('#x4dat#.homonymes', 'homonyms');
+copyTable('#x4dat#.ip_watch', 'ip_watch');
+copyTable('#x4dat#.mx_watch', 'mx_watch');
+copyTable('#x4dat#.ml_moderate', 'ml_moderate');
+
+copyTable('#x4dat#.postfix_blacklist', 'postfix_blacklist');
+copyTable('#x4dat#.postfix_mailseen', 'postfix_mailseen');
+copyTable('#x4dat#.postfix_whitelist', 'postfix_whitelist');
+
copyTable('#x4dat#.photo', 'profile_photos');
-copyTable('#x4dat#.search_autocomplete', 'search_autocomplete');
copyTable('#x4dat#.register_marketing', 'register_marketing');
+copyTable('#x4dat#.register_pending', 'register_pending');
+copyTable('#x4dat#.register_subs', 'register_subs');
+copyTable('#x4dat#.register_mstats', 'register_mstats');
+
+copyTable('#x4dat#.reminder', 'reminder');
+copyTable('#x4dat#.reminder_type', 'reminder_type');
+
+copyTable('#x4dat#.requests', 'requests');
+copyTable('#x4dat#.requests_answers', 'requests_answers');
+copyTable('#x4dat#.requests_hidden', 'requests_hidden');
+
+copyTable('#x4dat#.search_autocomplete', 'search_autocomplete');
+copyTable('#x4dat#.search_name', 'search_name');
+
+copyTable('#x4dat#.skins', 'skins');
+copyTable('#x4dat#.tips', 'tips');
+
+copyTable('#x4dat#.survey_surveys', 'surveys');
+copyTable('#x4dat#.survey_anwsers', 'survey_anwsers');
+copyTable('#x4dat#.survey_votes', 'survey_votes');
+
copyTable('#x4dat#.watch_profile', 'watch_profile');
+copyTable('#x4dat#.perte_pass', 'account_lost_passwords');
-// Should be renamed to geoloc_country
copyTable('#x4dat#.geoloc_pays', 'geoloc_pays');
+copyTable('#x4dat#.aliases', 'aliases');
+copyTable('#x4dat#.virtual', 'virtual');
+copyTable('#x4dat#.virtual_domains', 'virtual_domains');
+copyTable('#x4dat#.virtual_redirect', 'virtual_redirect');
+
+copyTable('#x4dat#.watch_nonins', 'watch_nonins');
+copyTable('#x4dat#.watch_promo', 'watch_promo');
+copyTable('#x4dat#.watch_profile', 'watch_profile');
+
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>
projects / platal.git / commitdiff