projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Serves javascript file from a per-version directory, to prevent cross-version caching...
[platal.git]
/
modules
/
admin.php
diff --git
a/modules/admin.php
b/modules/admin.php
index
73ae584
..
cb96fed
100644
(file)
--- a/
modules/admin.php
+++ b/
modules/admin.php
@@
-71,11
+71,11
@@
class AdminModule extends PLModule
if (Env::has('del')) {
$crc = Env::v('crc');
XDB::execute("UPDATE postfix_mailseen SET release = 'del' WHERE crc = {?}", $crc);
if (Env::has('del')) {
$crc = Env::v('crc');
XDB::execute("UPDATE postfix_mailseen SET release = 'del' WHERE crc = {?}", $crc);
- $page->trigSuccess($crc
." verra tous ses emails supprimés
!");
+ $page->trigSuccess($crc
. " verra tous ses emails supprimés
!");
} elseif (Env::has('ok')) {
$crc = Env::v('crc');
XDB::execute("UPDATE postfix_mailseen SET release = 'ok' WHERE crc = {?}", $crc);
} elseif (Env::has('ok')) {
$crc = Env::v('crc');
XDB::execute("UPDATE postfix_mailseen SET release = 'ok' WHERE crc = {?}", $crc);
- $page->trigSuccess($crc
." a le droit de passer
!");
+ $page->trigSuccess($crc
. " a le droit de passer
!");
}
$sql = XDB::iterator(
}
$sql = XDB::iterator(
@@
-359,7
+359,7
@@
class AdminModule extends PLModule
require_once("emails.inc.php");
if (S::has('suid')) {
require_once("emails.inc.php");
if (S::has('suid')) {
- $page->kill("Déjà en SUID
!!!");
+ $page->kill("Déjà en SUID
!!!");
}
// Loads the user identity using the environment.
}
// Loads the user identity using the environment.
@@
-379,7
+379,7
@@
class AdminModule extends PLModule
return;
}
return;
}
- // Handles specific requests (AX sync, su
,
...).
+ // Handles specific requests (AX sync, su...).
if(Env::has('logs_button') && $registered) {
pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m'));
}
if(Env::has('logs_button') && $registered) {
pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m'));
}
@@
-464,6
+464,7
@@
class AdminModule extends PLModule
// Checks for alias' user validity.
if (!preg_match('/[-a-z0-9\.]+/s', $alias)) {
$page->trigError("'$alias' n'est pas un alias valide");
// Checks for alias' user validity.
if (!preg_match('/[-a-z0-9\.]+/s', $alias)) {
$page->trigError("'$alias' n'est pas un alias valide");
+ break;
}
// Eventually adds the alias to the right domain.
}
// Eventually adds the alias to the right domain.
@@
-587,9
+588,9
@@
class AdminModule extends PLModule
$mailer->send();
$globals->updateNbIns();
$mailer->send();
$globals->updateNbIns();
- $page->trigSuccess("
Update was successful
.");
+ $page->trigSuccess("
La mise à jour a été faite avec succès
.");
} else {
} else {
- $page->trigError("
Update failed, please double check your value
s.");
+ $page->trigError("
La mise à jour a échoué. S'il te plaît, vérifie les valeur
s.");
}
// Checks for changes, and updates other tables of plat/al.
}
// Checks for changes, and updates other tables of plat/al.
@@
-628,7
+629,7
@@
class AdminModule extends PLModule
require_once('user.func.inc.php');
user_clear_all_subs($user->id());
$globals->updateNbIns();
require_once('user.func.inc.php');
user_clear_all_subs($user->id());
$globals->updateNbIns();
- $page->trigSuccess(
"'" . $user->id() . "' a été désinscrit !"
);
+ $page->trigSuccess(
$user->login() . ' a été désinscrit !'
);
$mailer = new PlMailer("admin/useredit.mail.tpl");
$mailer->assign("admin", S::user()->login());
$mailer = new PlMailer("admin/useredit.mail.tpl");
$mailer->assign("admin", S::user()->login());
@@
-892,7
+893,7
@@
class AdminModule extends PLModule
$page->setTitle('Administration - Décédés');
$res = XDB::iterator(
$page->setTitle('Administration - Décédés');
$res = XDB::iterator(
- "SELECT u.promo, u.nom, u.prenom, u.deces, u.
matricule_ax, u.
hruid, DATE(MAX(s.start)) AS last
+ "SELECT u.promo, u.nom, u.prenom, u.deces, u.hruid, DATE(MAX(s.start)) AS last
FROM auth_user_md5 AS u
LEFT JOIN logger.sessions AS s ON (s.uid = u.user_id AND suid = 0)
WHERE perms IN ('admin', 'user') AND deces <> 0
FROM auth_user_md5 AS u
LEFT JOIN logger.sessions AS s ON (s.uid = u.user_id AND suid = 0)
WHERE perms IN ('admin', 'user') AND deces <> 0
@@
-1122,7
+1123,6
@@
class AdminModule extends PLModule
}
$page->changeTpl('admin/wiki.tpl');
}
$page->changeTpl('admin/wiki.tpl');
- $page->addJsLink('jquery.js');
$page->assign('wiki_pages', $wiki_tree);
$page->assign('perms_opts', $perms);
}
$page->assign('wiki_pages', $wiki_tree);
$page->assign('perms_opts', $perms);
}