projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Table editor fills the new entry form with the default values of the fields
[platal.git]
/
modules
/
platal.php
diff --git
a/modules/platal.php
b/modules/platal.php
index
7d72369
..
fbb7a65
100644
(file)
--- a/
modules/platal.php
+++ b/
modules/platal.php
@@
-39,7
+39,7
@@
class PlatalModule extends PLModule
{
return array(
'index' => $this->make_hook('index', AUTH_PUBLIC),
{
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
'changelog' => $this->make_hook('changelog', AUTH_PUBLIC),
// Preferences thingies
@@
-73,10
+73,10
@@
class PlatalModule extends PLModule
{
$data = file_get_contents("/etc/ssl/xorgCA/cacert.pem","r");
header("Pragma:");
{
$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("Set-Cookie:");
+
header("Cache-Control:");
+
header("Expires:");
+
header("Content-Type: application/x-x509-ca-cert");
header("Content-Length: ".strlen($data));
echo $data;
exit;
header("Content-Length: ".strlen($data));
echo $data;
exit;
@@
-191,6
+191,7
@@
class PlatalModule extends PLModule
}
$page->changeTpl('motdepasse.success.tpl');
}
$page->changeTpl('motdepasse.success.tpl');
+ $page->assign('now', strftime("%Y%m%d%H%M%S"));
$page->run();
}
$page->run();
}
@@
-256,7
+257,7
@@
class PlatalModule extends PLModule
$res = XDB::query(
"SELECT user_id, naissance
FROM auth_user_md5 AS u
$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();
WHERE a.alias={?} AND u.perms IN ('admin','user') AND u.deces=0", $mailorg);
list($uid, $naissance) = $res->fetchOneRow();
@@
-292,7
+293,8
@@
Mail envoy
$logger = $_SESSION['log'] = new CoreLogger($uid);
$logger->log('recovery', $emails);
} else {
$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.<br />'.
+ 'Si tu as un homonyme, utilise prenom.nom.promo comme login');
}
}
}
}
@@
-318,6
+320,7
@@
Mail envoy
XDB::query('DELETE FROM perte_pass WHERE certificat={?}', $certif);
$logger->log("passwd","");
$page->changeTpl('tmpPWD.success.tpl');
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('motdepasse.js');
} else {
$page->changeTpl('motdepasse.tpl');
$page->addJsLink('motdepasse.js');
@@
-401,10
+404,12
@@
Mail envoy
$uid = init_rss('rss.tpl', $user, $hash);
$rss = XDB::iterator(
$uid = init_rss('rss.tpl', $user, $hash);
$rss = XDB::iterator(
- 'SELECT e.id, e.titre, e.texte, e.creation_date
+ '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)
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);
WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
AND peremption >= NOW()', $uid);
$page->assign('rss', $rss);