X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=fbb7a6537cf00abee4d045f99533461400716ccc;hb=1d10d3fd659fa8eb7c663d6bb599bc8bbc0feeb3;hp=9e2f0f2d78c37f62dcb582510b818490d77f6505;hpb=fd8f77de8bc10d40395990e3f8e96e0b4a186b46;p=platal.git
diff --git a/modules/platal.php b/modules/platal.php
index 9e2f0f2..fbb7a65 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -39,15 +39,15 @@ class PlatalModule extends PLModule
{
return array(
'index' => $this->make_hook('index', AUTH_PUBLIC),
- 'cacert.pem' => $this->make_hook('cacert', 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),
+ 'prefs' => $this->make_hook('prefs', AUTH_COOKIE),
+ 'prefs/rss' => $this->make_hook('prefs_rss', AUTH_COOKIE),
'prefs/webredirect'
- => $this->make_hook('webredir', AUTH_MDP),
- 'skin' => $this->make_hook('skin', AUTH_COOKIE),
+ => $this->make_hook('webredir', AUTH_MDP),
+ 'prefs/skin' => $this->make_hook('skin', AUTH_COOKIE),
// password related thingies
'password' => $this->make_hook('password', AUTH_MDP),
@@ -55,6 +55,7 @@ class PlatalModule extends PLModule
'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),
// happenings related thingies
'rss' => $this->make_hook('rss', AUTH_PUBLIC),
@@ -63,16 +64,20 @@ class PlatalModule extends PLModule
function handler_index(&$page)
{
- if (logged()) {
- redirect("events");
+ if (S::logged()) {
+ pl_redirect('events');
}
}
function handler_cacert(&$page)
{
- $data = file_get_contents('/etc/ssl/xorgCA/cacert.pem');
- header('Content-Type: application/x-x509-ca-cert');
- header('Content-Length: '.strlen($data));
+ $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;
}
@@ -83,95 +88,84 @@ class PlatalModule extends PLModule
$clog = htmlentities(file_get_contents(dirname(__FILE__).'/../ChangeLog'));
$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)
{
- global $globals;
-
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('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($globals->baseurl.'/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)
{
- global $globals;
-
$page->changeTpl('webredirect.tpl');
$page->assign('xorg_title','Polytechnique.org - Redirection de page WEB');
- $log =& Session::getMixed('log');
- $url = Env::get('url');
+ $log =& S::v('log');
+ $url = Env::v('url');
- if (Env::get('submit') == 'Valider' and Env::has('url')) {
- $globals->xdb->execute('UPDATE auth_user_quick
+ if (Env::v('submit') == 'Valider' and Env::has('url')) {
+ XDB::execute('UPDATE auth_user_quick
SET redirecturl = {?} WHERE user_id = {?}',
- $url, Session::getInt('uid'));
- $log->log('carva_add', 'http://'.Env::get('url'));
+ $url, S::v('uid'));
+ $log->log('carva_add', 'http://'.Env::v('url'));
$page->trig("Redirection activée vers $url");
- } elseif (Env::get('submit') == "Supprimer") {
- $globals->xdb->execute("UPDATE auth_user_quick
+ } elseif (Env::v('submit') == "Supprimer") {
+ XDB::execute("UPDATE auth_user_quick
SET redirecturl = ''
WHERE user_id = {?}",
- Session::getInt('uid'));
+ S::v('uid'));
$log->log("carva_del", $url);
Post::kill('url');
$page->trig('Redirection supprimée');
}
- $res = $globals->xdb->query('SELECT redirecturl
+ $res = XDB::query('SELECT redirecturl
FROM auth_user_quick
WHERE user_id = {?}',
- Session::getInt('uid'));
+ S::v('uid'));
$page->assign('carva', $res->fetchOneCell());
}
function handler_prefs_rss(&$page)
{
- global $globals;
-
$page->changeTpl('filrss.tpl');
- $page->assign('goback', Env::get('referer', 'login'));
+ $page->assign('goback', Env::v('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é.");
}
@@ -179,60 +173,57 @@ class PlatalModule extends PLModule
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
+ XDB::execute('UPDATE auth_user_md5
SET password={?}
WHERE user_id={?}', $password,
- Session::getInt('uid'));
+ 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->assign('now', strftime("%Y%m%d%H%M%S"));
$page->run();
}
$page->changeTpl('motdepasse.tpl');
- $page->addJsLink('javascript/motdepasse.js');
+ $page->addJsLink('motdepasse.js');
$page->assign('xorg_title','Polytechnique.org - Mon mot de passe');
}
function handler_smtppass(&$page)
{
- global $globals;
-
$page->changeTpl('acces_smtp.tpl');
$page->assign('xorg_title','Polytechnique.org - Acces SMTP/NNTP');
- $uid = Session::getInt('uid');
- $pass = Env::get('smtppass1');
- $log = Session::getMixed('log');
+ $uid = S::v('uid');
+ $pass = Env::v('smtppass1');
+ $log = S::v('log');
- if (Env::get('op') == "Valider" && strlen($pass) >= 6
- && Env::get('smtppass1') == Env::get('smtppass2'))
+ if (Env::v('op') == "Valider" && strlen($pass) >= 6
+ && Env::v('smtppass1') == Env::v('smtppass2'))
{
- $globals->xdb->execute('UPDATE auth_user_md5 SET smtppass = {?}
+ 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::get('op') == "Supprimer") {
- $globals->xdb->execute('UPDATE auth_user_md5 SET smtppass = ""
+ } 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");
}
- $res = $globals->xdb->query("SELECT IF(smtppass != '', 'actif', '')
+ $res = XDB::query("SELECT IF(smtppass != '', 'actif', '')
FROM auth_user_md5
WHERE user_id = {?}", $uid);
$page->assign('actif', $res->fetchOneCell());
@@ -248,20 +239,25 @@ class PlatalModule extends PLModule
return;
}
- if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) {
- $page->trig_run('Date de naissance incorrecte ou incohérente');
+ 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::get('birth'),4,4), substr(Env::get('birth'),2,2), substr(Env::get('birth'),0,2));
- $mailorg = strtok(Env::get('login'), '@');
+ $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 = $globals->xdb->query(
+ $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')
+ 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();
@@ -269,8 +265,8 @@ class PlatalModule extends PLModule
$page->assign('ok', true);
$url = rand_url_id();
- $globals->xdb->execute('INSERT INTO perte_pass (certificat,uid,created) VALUES ({?},{?},NOW())', $url, $uid);
- $res = $globals->xdb->query('SELECT email FROM emails WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid);
+ XDB::execute('INSERT INTO perte_pass (certificat,uid,created) VALUES ({?},{?},NOW())', $url, $uid);
+ $res = XDB::query('SELECT email FROM emails WHERE uid = {?} AND NOT FIND_IN_SET("filter", flags)', $uid);
$mails = implode(', ', $res->fetchColumn());
require_once "diogenes/diogenes.hermes.inc.php";
@@ -285,30 +281,29 @@ Si en cliquant dessus tu n'y arrives pas, copie int
--
Polytechnique.org
-\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\"".(Post::get('email') ? "
+\"Le portail des élèves & anciens élèves de l'Ecole polytechnique\"".(Post::v('email') ? "
Adresse de secours :
- ".Post::get('email') : "")."
+ ".Post::v('email') : "")."
-Mail envoyé à ".Env::get('login'));
+Mail envoyé à ".Env::v('login'));
$mymail->send();
// on cree un objet logger et on log l'evenement
- $logger = $_SESSION['log'] = new DiogenesCoreLogger($uid);
+ $logger = $_SESSION['log'] = new CoreLogger($uid);
$logger->log('recovery', $emails);
} else {
- $page->trig('Pas de résultat correspondant aux champs entrés dans notre base de données.');
+ $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)
{
- global $globals;
-
- $globals->xdb->execute('DELETE FROM perte_pass
+ 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');
@@ -317,17 +312,18 @@ Mail envoy
$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->assign('now', strftime("%Y%m%d%H%M%S"));
} else {
$page->changeTpl('motdepasse.tpl');
- $page->addJsLink('javascript/motdepasse.js');
+ $page->addJsLink('motdepasse.js');
}
}
@@ -335,42 +331,41 @@ Mail envoy
{
global $globals;
- if (!$globals->skin->enable) {
- redirect('./');
- }
-
$page->changeTpl('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'));
+ 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));
+ $page->assign_by_ref('skins', XDB::iterator($sql));
}
function handler_exit(&$page, $level = null)
{
- if (Session::has('suid')) {
- if (Session::has('suid')) {
- $a4l = Session::get('forlife');
- $suid = Session::getMixed('suid');
- $log = Session::getMixed('log');
- $log->log("suid_stop", Session::get('forlife') . " by " . $suid['forlife']);
+ if (S::has('suid')) {
+ 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;
- Session::kill('suid');
- redirect($globals->baseurl.'/admin/utilisateurs.php?login='.$a4l);
+ S::kill('suid');
+ pl_redirect('admin/utilisateurs.php', 'login='.$a4l);
} else {
- redirect("events");
+ pl_redirect('events');
}
}
@@ -396,7 +391,7 @@ Mail envoy
XorgSession::destroy();
if (Get::has('redirect')) {
- redirect(rawurldecode(Get::get('redirect')));
+ http_redirect(rawurldecode(Get::v('redirect')));
} else {
$page->changeTpl('exit.tpl');
}
@@ -404,17 +399,17 @@ Mail envoy
function handler_rss(&$page, $user = null, $hash = null)
{
- global $globals;
-
require_once 'rss.inc.php';
$uid = init_rss('rss.tpl', $user, $hash);
- $rss = $globals->xdb->iterator(
- 'SELECT e.id, e.titre, e.texte, e.creation_date
+ $rss = XDB::iterator(
+ 'SELECT e.id, e.titre, e.texte, e.creation_date,
+ IF(u2.nom_usage = "", u2.nom, u2.nom_usage) AS nom, u2.prenom, u2.promo
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) )
+ AND (e.promo_max = 0 || e.promo_max >= u.promo) )
+ INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = e.user_id)
WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
AND peremption >= NOW()', $uid);
$page->assign('rss', $rss);