X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=2a159d8ce8f3cc25716682a32370974890018b46;hb=d7dd70be3dd8f76ae6dc9fed7977e7aa7b603085;hp=73a05a6c336377e9ae1f0103fbb521eac707b67c;hpb=4da0b8d742e16d461eeb9b50c481f904e816c272;p=platal.git
diff --git a/modules/platal.php b/modules/platal.php
index 73a05a6..2a159d8 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -1,6 +1,6 @@
$bug";
+ }
+
+ return join(',', $ans);
+}
+
+
class PlatalModule extends PLModule
{
function handlers()
{
return array(
+ 'index' => $this->make_hook('index', AUTH_PUBLIC),
+ 'cacert.pem' => $this->make_hook('cacert', AUTH_PUBLIC),
+ 'changelog' => $this->make_hook('changelog', AUTH_PUBLIC),
+
// Preferences thingies
'prefs' => $this->make_hook('prefs', AUTH_COOKIE),
'prefs/rss' => $this->make_hook('prefs_rss', AUTH_COOKIE),
- 'skin' => $this->make_hook('skin', AUTH_COOKIE),
+ 'prefs/webredirect'
+ => $this->make_hook('webredir', AUTH_MDP),
+ 'prefs/skin' => $this->make_hook('skin', AUTH_COOKIE),
// password related thingies
- 'password' => $this->make_hook('password', AUTH_MDP),
- 'tmpPWD' => $this->make_hook('tmpPWD', AUTH_PUBLIC),
-
- // happenings related thingies
- 'rss' => $this->make_hook('rss', AUTH_PUBLIC),
+ 'password' => $this->make_hook('password', AUTH_MDP),
+ 'tmpPWD' => $this->make_hook('tmpPWD', AUTH_PUBLIC),
+ 'password/smtp' => $this->make_hook('smtppass', AUTH_MDP),
+ 'recovery' => $this->make_hook('recovery', AUTH_PUBLIC),
+ 'exit' => $this->make_hook('exit', AUTH_PUBLIC),
+ 'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC),
);
}
- function __set_rss_state($state)
+ function handler_index(&$page)
{
- global $globals;
+ if (S::logged()) {
+ pl_redirect('events');
+ }
+ }
+
+ function handler_cacert(&$page)
+ {
+ $data = file_get_contents("/etc/ssl/xorgCA/cacert.pem","r");
+ header("Pragma:");
+ header("Set-Cookie:");
+ header("Cache-Control:");
+ header("Expires:");
+ header("Content-Type: application/x-x509-ca-cert");
+ header("Content-Length: ".strlen($data));
+ echo $data;
+ exit;
+ }
+ function handler_changelog(&$page)
+ {
+ $page->changeTpl('platal/changeLog.tpl');
+
+ $clog = pl_entities(file_get_contents(dirname(__FILE__).'/../ChangeLog'));
+ // url catch only (not all wiki syntax)
+ $clog = preg_replace(array(
+ '/((?:https?|ftp):\/\/(?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/ui',
+ '/(\s|^)www\.((?:\.*,*[\w@~%$£µ&i#\-+=_\/\?;])*)/iu',
+ '/(?:mailto:)?([a-z0-9.\-+_]+@([\-.+_]?[a-z0-9])+)/i'),
+ array(
+ '\\0',
+ '\\1www.\\2',
+ '\\0'),
+ $clog);
+ $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $clog);
+ $clog = preg_replace('!vim:.*$!', '', $clog);
+ $page->assign('ChangeLog', $clog);
+ }
+
+ function __set_rss_state($state)
+ {
if ($state) {
$_SESSION['core_rss_hash'] = rand_url_id(16);
- $globals->xdb->execute('UPDATE auth_user_quick
+ XDB::execute('UPDATE auth_user_quick
SET core_rss_hash={?} WHERE user_id={?}',
- Session::get('core_rss_hash'),
- Session::getInt('uid'));
+ S::v('core_rss_hash'), S::v('uid'));
} else {
- $globals->xdb->execute('UPDATE auth_user_quick
+ XDB::execute('UPDATE auth_user_quick
SET core_rss_hash="" WHERE user_id={?}',
- Session::getInt('uid'));
- Session::kill('core_rss_hash');
+ S::v('uid'));
+ S::kill('core_rss_hash');
}
}
function handler_prefs(&$page)
{
- global $globals;
+ $page->changeTpl('platal/preferences.tpl');
+ $page->assign('xorg_title','Polytechnique.org - Mes préférences');
- $page->changeTpl('preferences.tpl');
- $page->assign('xorg_title','Polytechnique.org - Mes préférences');
-
- if (Env::has('mail_fmt')) {
- $fmt = Env::get('mail_fmt');
+ if (Post::has('mail_fmt')) {
+ $fmt = Post::v('mail_fmt');
if ($fmt != 'texte') $fmt = 'html';
- $globals->xdb->execute("UPDATE auth_user_quick
+ XDB::execute("UPDATE auth_user_quick
SET core_mail_fmt = '$fmt'
WHERE user_id = {?}",
- Session::getInt('uid'));
+ S::v('uid'));
$_SESSION['mail_fmt'] = $fmt;
- redirect('preferences');
}
- if (Env::has('rss')) {
- $this->__set_rss_state(Env::getBool('rss'));
+ if (Post::has('rss')) {
+ $this->__set_rss_state(Post::b('rss'));
}
+ }
- $page->assign('prefs', $globals->hook->prefs());
+ function handler_webredir(&$page)
+ {
+ $page->changeTpl('platal/webredirect.tpl');
+
+ $page->assign('xorg_title','Polytechnique.org - Redirection de page WEB');
+
+ $log =& S::v('log');
+ $url = Env::v('url');
+
+ if (Env::v('submit') == 'Valider' and Env::has('url')) {
+ XDB::execute('UPDATE auth_user_quick
+ SET redirecturl = {?} WHERE user_id = {?}',
+ $url, S::v('uid'));
+ $log->log('carva_add', 'http://'.Env::v('url'));
+ $page->trig("Redirection activée vers $url");
+ } elseif (Env::v('submit') == "Supprimer") {
+ XDB::execute("UPDATE auth_user_quick
+ SET redirecturl = ''
+ WHERE user_id = {?}",
+ S::v('uid'));
+ $log->log("carva_del", $url);
+ Post::kill('url');
+ $page->trig('Redirection supprimée');
+ }
- return PL_OK;
+ $res = XDB::query('SELECT redirecturl
+ FROM auth_user_quick
+ WHERE user_id = {?}',
+ S::v('uid'));
+ $page->assign('carva', $res->fetchOneCell());
}
function handler_prefs_rss(&$page)
{
- global $globals;
+ $page->changeTpl('platal/filrss.tpl');
- $page->changeTpl('filrss.tpl');
+ $page->assign('goback', Env::v('referer', 'login'));
- $page->assign('goback', Env::get('referer', 'login'));
-
- if (Env::get('act_rss') == 'Activer') {
+ if (Env::v('act_rss') == 'Activer') {
$this->__set_rss_state(true);
- $page->trig("Ton Fil RSS est activé.");
+ $page->trig("Ton Fil RSS est activé.");
}
-
- return PL_OK;
}
function handler_password(&$page)
{
- global $globals;
-
if (Post::has('response2')) {
require_once 'secure_hash.inc.php';
- $_SESSION['password'] = $password = Post::get('response2');
+ $_SESSION['password'] = $password = Post::v('response2');
- $globals->xdb->execute('UPDATE auth_user_md5
- SET password={?}
- WHERE user_id={?}', $password,
- Session::getInt('uid'));
+ XDB::execute('UPDATE auth_user_md5
+ SET password={?}
+ WHERE user_id={?}', $password,
+ S::v('uid'));
- $log =& Session::getMixed('log');
+ $log =& S::v('log');
$log->log('passwd', '');
- if (Cookie::get('ORGaccess')) {
+ if (Cookie::v('ORGaccess')) {
setcookie('ORGaccess', hash_encrypt($password), (time()+25920000), '/', '' ,0);
}
- $page->changeTpl('motdepasse.success.tpl');
+ $page->changeTpl('platal/motdepasse.success.tpl');
$page->run();
}
- $page->changeTpl('motdepasse.tpl');
- $page->addJsLink('javascript/motdepasse.js');
+ $page->changeTpl('platal/motdepasse.tpl');
+ $page->addJsLink('motdepasse.js');
$page->assign('xorg_title','Polytechnique.org - Mon mot de passe');
+ }
+
+ function handler_smtppass(&$page)
+ {
+ $page->changeTpl('platal/acces_smtp.tpl');
+ $page->assign('xorg_title','Polytechnique.org - Acces SMTP/NNTP');
+
+ require_once 'wiki.inc.php';
+ wiki_require_page('Xorg.SMTPSécurisé');
+ wiki_require_page('Xorg.NNTPSécurisé');
+
+ $uid = S::v('uid');
+ $pass = Env::v('smtppass1');
+ $log = S::v('log');
+
+ if (Env::v('op') == "Valider" && strlen($pass) >= 6
+ && Env::v('smtppass1') == Env::v('smtppass2'))
+ {
+ XDB::execute('UPDATE auth_user_md5 SET smtppass = {?}
+ WHERE user_id = {?}', $pass, $uid);
+ $page->trig('Mot de passe enregistré');
+ $log->log("passwd_ssl");
+ } elseif (Env::v('op') == "Supprimer") {
+ XDB::execute('UPDATE auth_user_md5 SET smtppass = ""
+ WHERE user_id = {?}', $uid);
+ $page->trig('Compte SMTP et NNTP supprimé');
+ $log->log("passwd_del");
+ }
- return PL_OK;
+ $res = XDB::query("SELECT IF(smtppass != '', 'actif', '')
+ FROM auth_user_md5
+ WHERE user_id = {?}", $uid);
+ $page->assign('actif', $res->fetchOneCell());
}
- function handler_tmpPWD(&$page, $certif = null)
+ function handler_recovery(&$page)
{
global $globals;
- $globals->xdb->execute('DELETE FROM perte_pass
+ $page->changeTpl('platal/recovery.tpl');
+
+ if (!Env::has('login') || !Env::has('birth')) {
+ return;
+ }
+
+ if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::v('birth'))) {
+ $page->trig('Date de naissance incorrecte ou incohérente');
+ return;
+ }
+
+ $birth = sprintf('%s-%s-%s',
+ substr(Env::v('birth'), 4, 4),
+ substr(Env::v('birth'), 2, 2),
+ substr(Env::v('birth'), 0, 2));
+
+ $mailorg = strtok(Env::v('login'), '@');
+
+ // paragraphe rajouté : si la date de naissance dans la base n'existe pas, on l'update
+ // avec celle fournie ici en espérant que c'est la bonne
+
+ $res = XDB::query(
+ "SELECT user_id, naissance
+ FROM auth_user_md5 AS u
+ INNER JOIN aliases AS a ON (u.user_id=a.id AND type != 'homonyme')
+ WHERE a.alias={?} AND u.perms IN ('admin','user') AND u.deces=0", $mailorg);
+ list($uid, $naissance) = $res->fetchOneRow();
+
+ if ($naissance == $birth) {
+ $res = XDB::query("SELECT COUNT(*)
+ FROM emails
+ WHERE uid = {?} AND flags != 'panne' AND flags != 'filter'", $uid);
+ $count = intval($res->fetchOneCell());
+ if ($count == 0) {
+ $page->assign('no_addr', true);
+ return;
+ }
+
+ $page->assign('ok', true);
+
+ $url = rand_url_id();
+ XDB::execute('INSERT INTO perte_pass (certificat,uid,created)
+ VALUES ({?},{?},NOW())', $url, $uid);
+ $res = XDB::query('SELECT email
+ FROM emails
+ WHERE uid = {?} AND email = {?}',
+ $uid, Post::v('email'));
+ if ($res->numRows()) {
+ $mails = $res->fetchOneCell();
+ } else {
+ $res = XDB::query('SELECT email
+ FROM emails
+ WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid);
+ $mails = implode(', ', $res->fetchColumn());
+ }
+ $mymail = new PlMailer();
+ $mymail->setFrom('"Gestion des mots de passe" mails->domain . '>');
+ $mymail->addTo($mails);
+ $mymail->setSubject('Ton certificat d\'authentification');
+ $mymail->setTxtBody("Visite la page suivante qui expire dans six heures :
+{$globals->baseurl}/tmpPWD/$url
+
+Si en cliquant dessus tu n'y arrives pas, copie intégralement l'adresse dans la barre de ton navigateur. Si tu n'as pas utilisé ce lien dans six heures, tu peux tout simplement recommencer cette procédure.
+
+--
+Polytechnique.org
+\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\"
+
+Mail envoyé à ".Env::v('login') . (Post::has('email') ? "
+Adresse de secours : " . Post::v('email') : ""));
+ $mymail->send();
+
+ // on cree un objet logger et on log l'evenement
+ $logger = $_SESSION['log'] = new CoreLogger($uid);
+ $logger->log('recovery', $mails);
+ } else {
+ $page->trig('Les informations que tu as rentrées ne permettent pas de récupérer ton mot de passe.
'.
+ 'Si tu as un homonyme, utilise prenom.nom.promo comme login');
+ }
+ }
+
+ function handler_tmpPWD(&$page, $certif = null)
+ {
+ XDB::execute('DELETE FROM perte_pass
WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > created');
- $res = $globals->xdb->query('SELECT uid FROM perte_pass WHERE certificat={?}', $certif);
+ $res = XDB::query('SELECT uid FROM perte_pass WHERE certificat={?}', $certif);
$ligne = $res->fetchOneAssoc();
if (!$ligne) {
- $page->changeTpl('index.tpl');
+ $page->changeTpl('platal/index.tpl');
$page->kill("Cette adresse n'existe pas ou n'existe plus sur le serveur.");
}
$uid = $ligne["uid"];
if (Post::has('response2')) {
- $password = Post::get('response2');
- $logger = new DiogenesCoreLogger($uid);
- $globals->xdb->query('UPDATE auth_user_md5 SET password={?}
+ $password = Post::v('response2');
+ $logger = new CoreLogger($uid);
+ XDB::query('UPDATE auth_user_md5 SET password={?}
WHERE user_id={?} AND perms IN("admin","user")',
$password, $uid);
- $globals->xdb->query('DELETE FROM perte_pass WHERE certificat={?}', $certif);
+ XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif);
$logger->log("passwd","");
- $page->changeTpl('tmpPWD.success.tpl');
+ $page->changeTpl('platal/tmpPWD.success.tpl');
} else {
- $page->changeTpl('motdepasse.tpl');
- $page->addJsLink('javascript/motdepasse.js');
+ $page->changeTpl('platal/motdepasse.tpl');
+ $page->addJsLink('motdepasse.js');
}
-
- return PL_OK;
}
function handler_skin(&$page)
{
global $globals;
- if (!$globals->skin->enable) {
- redirect('./');
- }
-
- $page->changeTpl('skins.tpl');
+ $page->changeTpl('platal/skins.tpl');
$page->assign('xorg_title','Polytechnique.org - Skins');
- if (Env::has('newskin')) { // formulaire soumis, traitons les données envoyées
- $globals->xdb->execute('UPDATE auth_user_quick
- SET skin={?} WHERE user_id={?}',
- Env::getInt('newskin'),
- Session::getInt('uid'));
+ if (Env::has('newskin')) { // formulaire soumis, traitons les données envoyées
+ XDB::execute('UPDATE auth_user_quick
+ SET skin={?} WHERE user_id={?}',
+ Env::i('newskin'), S::v('uid'));
+ S::kill('skin');
set_skin();
}
+ $res = XDB::query('SELECT id FROM skins WHERE skin_tpl={?}', S::v('skin'));
+ $page->assign('skin_id', $res->fetchOneCell());
+
$sql = "SELECT s.*,auteur,count(*) AS nb
FROM skins AS s
LEFT JOIN auth_user_quick AS a ON s.id=a.skin
WHERE skin_tpl != '' AND ext != ''
GROUP BY id ORDER BY s.date DESC";
- $page->assign_by_ref('skins', $globals->xdb->iterator($sql));
- return PL_OK;
+ $page->assign('skins', XDB::iterator($sql));
}
- function handler_rss(&$page, $user = null, $hash = null)
+ function handler_exit(&$page, $level = null)
{
- global $globals;
+ if (S::has('suid')) {
+ $a4l = S::v('forlife');
+ $suid = S::v('suid');
+ $log = S::v('log');
+ $log->log("suid_stop", S::v('forlife') . " by " . $suid['forlife']);
+ $_SESSION = $suid;
+ S::kill('suid');
+ pl_redirect('admin/user/' . $a4l);
+ }
- require_once 'rss.inc.php';
+ if ($level == 'forget' || $level == 'forgetall') {
+ setcookie('ORGaccess', '', time() - 3600, '/', '', 0);
+ Cookie::kill('ORGaccess');
+ if (isset($_SESSION['log']))
+ $_SESSION['log']->log("cookie_off");
+ }
- $uid = init_rss('rss.tpl', $user, $hash);
+ if ($level == 'forgetuid' || $level == 'forgetall') {
+ setcookie('ORGuid', '', time() - 3600, '/', '', 0);
+ Cookie::kill('ORGuid');
+ setcookie('ORGdomain', '', time() - 3600, '/', '', 0);
+ Cookie::kill('ORGdomain');
+ }
- $rss = $globals->xdb->iterator(
- 'SELECT e.id, e.titre, e.texte, e.creation_date
- FROM auth_user_md5 AS u
- INNER JOIN evenements AS e ON ( (e.promo_min = 0 || e.promo_min <= u.promo)
- AND (e.promo_max = 0 || e.promo_max >= u.promo) )
- WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
- AND peremption >= NOW()', $uid);
- $page->assign('rss', $rss);
+ if (isset($_SESSION['log'])) {
+ $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+ $_SESSION['log']->log('deconnexion',$ref);
+ }
- return PL_OK;
+ XorgSession::destroy();
+
+ if (Get::has('redirect')) {
+ http_redirect(rawurldecode(Get::v('redirect')));
+ } else {
+ $page->changeTpl('platal/exit.tpl');
+ }
}
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>