X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=2e6570ce0a8bf35c1b78050630d8795d3dcaefcb;hb=9ec2213d47a69195843ab816c930597088ccaff4;hp=a462e790e76950d40488d8bbad6dca62facdcc0c;hpb=fa2056feddfcd83a1d053599af1c722b0cdbb2a3;p=platal.git
diff --git a/modules/platal.php b/modules/platal.php
index a462e79..2e6570c 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -1,6 +1,6 @@
$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
@@ -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),
+ 'review' => $this->make_hook('review', AUTH_PUBLIC),
'deconnexion.php' => $this->make_hook('exit', AUTH_PUBLIC),
);
}
@@ -63,6 +64,8 @@ class PlatalModule extends PLModule
{
if (S::logged()) {
pl_redirect('events');
+ } else if (!@$GLOBALS['IS_XNET_SITE']) {
+ pl_redirect('review');
}
}
@@ -84,10 +87,20 @@ class PlatalModule extends PLModule
$page->changeTpl('platal/changeLog.tpl');
$clog = pl_entities(file_get_contents(dirname(__FILE__).'/../ChangeLog'));
- require_once 'url_catcher.inc.php';
- $clog = url_catcher($clog);
+ $clog = preg_replace('/=+\s*/', '
', $clog);
+ // 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);
+ $clog = preg_replace("!(
(\\s|\n)*)?(\s|\n)*
((\\s|\n)*
)?!m", "", "$clog
");
$page->assign('ChangeLog', $clog);
}
@@ -140,7 +153,7 @@ class PlatalModule extends PLModule
SET redirecturl = {?} WHERE user_id = {?}',
$url, S::v('uid'));
$log->log('carva_add', 'http://'.Env::v('url'));
- $page->trig("Redirection activée vers $url");
+ $page->trigSuccess("Redirection activée vers $url");
} elseif (Env::v('submit') == "Supprimer") {
XDB::execute("UPDATE auth_user_quick
SET redirecturl = ''
@@ -148,7 +161,7 @@ class PlatalModule extends PLModule
S::v('uid'));
$log->log("carva_del", $url);
Post::kill('url');
- $page->trig('Redirection supprimée');
+ $page->trigSuccess('Redirection supprimée');
}
$res = XDB::query('SELECT redirecturl
@@ -166,21 +179,34 @@ class PlatalModule extends PLModule
if (Env::v('act_rss') == 'Activer') {
$this->__set_rss_state(true);
- $page->trig("Ton Fil RSS est activé.");
+ $page->trigSuccess("Ton Fil RSS est activé.");
}
}
function handler_password(&$page)
{
+ global $globals;
+
if (Post::has('response2')) {
require_once 'secure_hash.inc.php';
+ S::assert_xsrf_token();
$_SESSION['password'] = $password = Post::v('response2');
- XDB::execute('UPDATE auth_user_md5
- SET password={?}
- WHERE user_id={?}', $password,
- S::v('uid'));
+ XDB::execute('UPDATE auth_user_md5
+ SET password={?}
+ WHERE user_id={?}', $password,
+ S::v('uid'));
+
+ // If GoogleApps is enabled, and the user did choose to use synchronized passwords,
+ // updates the Google Apps password as well.
+ if ($globals->mailstorage->googleapps_domain) {
+ require_once 'googleapps.inc.php';
+ $account = new GoogleAppsAccount(S::v('uid'), S::v('forlife'));
+ if ($account->active() && $account->sync_password) {
+ $account->set_password($password);
+ }
+ }
$log =& S::v('log');
$log->log('passwd', '');
@@ -202,7 +228,7 @@ class PlatalModule extends PLModule
{
$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é');
@@ -211,21 +237,21 @@ class PlatalModule extends PLModule
$pass = Env::v('smtppass1');
$log = S::v('log');
- if (Env::v('op') == "Valider" && strlen($pass) >= 6
- && Env::v('smtppass1') == Env::v('smtppass2'))
+ 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é');
+ $page->trigSuccess('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é');
+ $page->trigSuccess('Compte SMTP et NNTP supprimé');
$log->log("passwd_del");
}
- $res = 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());
@@ -242,7 +268,7 @@ class PlatalModule extends PLModule
}
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');
+ $page->trigError('Date de naissance incorrecte ou incohérente');
return;
}
@@ -264,10 +290,19 @@ class PlatalModule extends PLModule
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)
+ $url = rand_url_id();
+ XDB::execute('INSERT INTO perte_pass (certificat,uid,created)
VALUES ({?},{?},NOW())', $url, $uid);
$res = XDB::query('SELECT email
FROM emails
@@ -282,15 +317,15 @@ class PlatalModule extends PLModule
$mails = implode(', ', $res->fetchColumn());
}
$mymail = new PlMailer();
- $mymail->setFrom('"Gestion des mots de passe" ');
+ $mymail->setFrom('"Gestion des mots de passe" mail->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 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\"
@@ -302,13 +337,14 @@ Adresse de secours : " . Post::v('email') : ""));
$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.
'.
+ $page->trigError('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;
XDB::execute('DELETE FROM perte_pass
WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > created');
@@ -322,11 +358,22 @@ Adresse de secours : " . Post::v('email') : ""));
$uid = $ligne["uid"];
if (Post::has('response2')) {
$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);
XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif);
+
+ // If GoogleApps is enabled, and the user did choose to use synchronized passwords,
+ // updates the Google Apps password as well.
+ if ($globals->mailstorage->googleapps_domain) {
+ require_once 'googleapps.inc.php';
+ $account = new GoogleAppsAccount($uid);
+ if ($account->active() && $account->sync_password) {
+ $account->set_password($password);
+ }
+ }
+
+ $logger = new CoreLogger($uid);
$logger->log("passwd","");
$page->changeTpl('platal/tmpPWD.success.tpl');
} else {
@@ -400,6 +447,31 @@ Adresse de secours : " . Post::v('email') : ""));
$page->changeTpl('platal/exit.tpl');
}
}
+
+ function handler_review(&$page, $action = null, $mode = null)
+ {
+ require_once 'wiki.inc.php';
+ require_once dirname(__FILE__) . '/platal/review.inc.php';
+ $dir = wiki_work_dir();
+ $dom = 'Review';
+ if (@$GLOBALS['IS_XNET_SITE']) {
+ $dom .= 'Xnet';
+ }
+ if (!is_dir($dir)) {
+ $page->kill("Impossible de trouver le wiki");
+ }
+ if (!file_exists($dir . '/' . $dom . '.Admin')) {
+ $page->kill("Impossible de trouver la page d'administration");
+ }
+ $conf = preg_grep('/^text=/', explode("\n", file_get_contents($dir . '/' . $dom . '.Admin')));
+ $conf = preg_split('/(text\=|\%0a)/', array_shift($conf), -1, PREG_SPLIT_NO_EMPTY);
+ $wiz = new PlWizard('Tour d\'horizon', 'core/plwizard.tpl', true);
+ foreach ($conf as $line) {
+ $list = preg_split('/\s*[*|]\s*/', $line, -1, PREG_SPLIT_NO_EMPTY);
+ $wiz->addPage('ReviewPage', $list[0], $list[1]);
+ }
+ $wiz->apply($page, 'review', $action, $mode);
+ }
}
// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: