X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fplatal.php;h=646656fe7f0925f6ef829ccbc06ba06f136e849c;hb=cab0809050d58f8484608e91f7555ebd69dcb451;hp=fe02deda2d9afcce385fd6b0d6e5b0822c0a3f48;hpb=8858cfc177511f7eba58876c5099b1253441203d;p=platal.git
diff --git a/modules/platal.php b/modules/platal.php
index fe02ded..646656f 100644
--- a/modules/platal.php
+++ b/modules/platal.php
@@ -19,14 +19,34 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *
***************************************************************************/
+function bugize($list)
+{
+ $list = split(',', $list);
+ $ans = array();
+
+ foreach ($list as $bug) {
+ $clean = str_replace('#', '', $bug);
+ $ans[] = "$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),
+ 'prefs/webredirect'
+ => $this->make_hook('webredir', AUTH_MDP),
'skin' => $this->make_hook('skin', AUTH_COOKIE),
// password related thingies
@@ -34,27 +54,50 @@ class PlatalModule extends PLModule
'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),
// happenings related thingies
'rss' => $this->make_hook('rss', AUTH_PUBLIC),
);
}
- function __set_rss_state($state)
+ function handler_index(&$page)
{
- global $globals;
+ if (S::logged()) {
+ 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));
+ echo $data;
+ exit;
+ }
+ function handler_changelog(&$page)
+ {
+ $page->changeTpl('changeLog.tpl');
+
+ $clog = htmlentities(file_get_contents(dirname(__FILE__).'/../ChangeLog'));
+ $clog = preg_replace('!(#[0-9]+(,[0-9]+)*)!e', 'bugize("\1")', $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');
}
}
@@ -68,12 +111,12 @@ class PlatalModule extends PLModule
if (Env::has('mail_fmt')) {
$fmt = Env::get('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');
+ redirect($globals->baseurl.'/preferences');
}
if (Env::has('rss')) {
@@ -81,14 +124,42 @@ class PlatalModule extends PLModule
}
$page->assign('prefs', $globals->hook->prefs());
+ }
- return PL_OK;
+ function handler_webredir(&$page)
+ {
+ $page->changeTpl('webredirect.tpl');
+
+ $page->assign('xorg_title','Polytechnique.org - Redirection de page WEB');
+
+ $log =& S::v('log');
+ $url = Env::get('url');
+
+ if (Env::get('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::get('url'));
+ $page->trig("Redirection activée vers $url");
+ } elseif (Env::get('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');
+ }
+
+ $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('filrss.tpl');
$page->assign('goback', Env::get('referer', 'login'));
@@ -97,25 +168,21 @@ class PlatalModule extends PLModule
$this->__set_rss_state(true);
$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');
- $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')) {
@@ -129,41 +196,35 @@ class PlatalModule extends PLModule
$page->changeTpl('motdepasse.tpl');
$page->addJsLink('javascript/motdepasse.js');
$page->assign('xorg_title','Polytechnique.org - Mon mot de passe');
-
- return PL_OK;
}
function handler_smtppass(&$page)
{
- global $globals;
-
$page->changeTpl('acces_smtp.tpl');
$page->assign('xorg_title','Polytechnique.org - Acces SMTP/NNTP');
- $uid = Session::getInt('uid');
+ $uid = S::v('uid');
$pass = Env::get('smtppass1');
- $log = Session::getMixed('log');
+ $log = S::v('log');
if (Env::get('op') == "Valider" && strlen($pass) >= 6
&& Env::get('smtppass1') == Env::get('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 = ""
+ 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());
-
- return PL_OK;
}
function handler_recovery(&$page)
@@ -173,7 +234,7 @@ class PlatalModule extends PLModule
$page->changeTpl('recovery.tpl');
if (!Env::has('login') || !Env::has('birth')) {
- return PL_OK;
+ return;
}
if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) {
@@ -186,7 +247,7 @@ class PlatalModule extends PLModule
// 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')
@@ -197,8 +258,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";
@@ -227,18 +288,14 @@ Mail envoy
} else {
$page->trig('Pas de résultat correspondant aux champs entrés dans notre base de données.');
}
-
- return PL_OK;
}
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');
@@ -249,18 +306,16 @@ Mail envoy
if (Post::has('response2')) {
$password = Post::get('response2');
$logger = new DiogenesCoreLogger($uid);
- $globals->xdb->query('UPDATE auth_user_md5 SET password={?}
+ 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');
} else {
$page->changeTpl('motdepasse.tpl');
$page->addJsLink('javascript/motdepasse.js');
}
-
- return PL_OK;
}
function handler_skin(&$page)
@@ -275,10 +330,10 @@ Mail envoy
$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
+ XDB::execute('UPDATE auth_user_quick
SET skin={?} WHERE user_id={?}',
Env::getInt('newskin'),
- Session::getInt('uid'));
+ S::v('uid'));
set_skin();
}
@@ -287,19 +342,60 @@ Mail envoy
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_by_ref('skins', XDB::iterator($sql));
}
- function handler_rss(&$page, $user = null, $hash = null)
+ function handler_exit(&$page, $level = null)
{
- global $globals;
+ 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;
+ S::kill('suid');
+ redirect($globals->baseurl.'/admin/utilisateurs.php?login='.$a4l);
+ } else {
+ redirect("events");
+ }
+ }
+ if ($level == 'forget' || $level == 'forgetall') {
+ setcookie('ORGaccess', '', time() - 3600, '/', '', 0);
+ Cookie::kill('ORGaccess');
+ if (isset($_SESSION['log']))
+ $_SESSION['log']->log("cookie_off");
+ }
+
+ if ($level == 'forgetuid' || $level == 'forgetall') {
+ setcookie('ORGuid', '', time() - 3600, '/', '', 0);
+ Cookie::kill('ORGuid');
+ setcookie('ORGdomain', '', time() - 3600, '/', '', 0);
+ Cookie::kill('ORGdomain');
+ }
+
+ if (isset($_SESSION['log'])) {
+ $ref = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '';
+ $_SESSION['log']->log('deconnexion',$ref);
+ }
+
+ XorgSession::destroy();
+
+ if (Get::has('redirect')) {
+ redirect(rawurldecode(Get::get('redirect')));
+ } else {
+ $page->changeTpl('exit.tpl');
+ }
+ }
+
+ function handler_rss(&$page, $user = null, $hash = null)
+ {
require_once 'rss.inc.php';
$uid = init_rss('rss.tpl', $user, $hash);
- $rss = $globals->xdb->iterator(
+ $rss = 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)
@@ -307,8 +403,6 @@ Mail envoy
WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
AND peremption >= NOW()', $uid);
$page->assign('rss', $rss);
-
- return PL_OK;
}
}