projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into fusionax
[platal.git]
/
modules
/
admin.php
diff --git
a/modules/admin.php
b/modules/admin.php
index
775d4ff
..
af06bef
100644
(file)
--- a/
modules/admin.php
+++ b/
modules/admin.php
@@
-72,11
+72,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(
@@
-130,7
+130,7
@@
class AdminModule extends PLModule
MONTH(MAX(start)), MONTH(MIN(start)),
DAYOFMONTH(MAX(start)),
DAYOFMONTH(MIN(start))
MONTH(MAX(start)), MONTH(MIN(start)),
DAYOFMONTH(MAX(start)),
DAYOFMONTH(MIN(start))
- FROM
logger
.sessions");
+ FROM
#logger#
.sessions");
list($ymax, $ymin, $mmax, $mmin, $dmax, $dmin) = $res->fetchOneRow();
if (($year < $ymin) || ($year == $ymin && $month < $mmin)) {
list($ymax, $ymin, $mmax, $mmin, $dmax, $dmin) = $res->fetchOneRow();
if (($year < $ymin) || ($year == $ymin && $month < $mmin)) {
@@
-168,7
+168,7
@@
class AdminModule extends PLModule
if ($year) {
$res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)),
MONTH(MAX(start)), MONTH(MIN(start))
if ($year) {
$res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)),
MONTH(MAX(start)), MONTH(MIN(start))
- FROM
logger
.sessions");
+ FROM
#logger#
.sessions");
list($ymax, $ymin, $mmax, $mmin) = $res->fetchOneRow();
if (($year < $ymin) || ($year > $ymax)) {
list($ymax, $ymin, $mmax, $mmin) = $res->fetchOneRow();
if (($year < $ymin) || ($year > $ymax)) {
@@
-198,7
+198,7
@@
class AdminModule extends PLModule
$years[0] = "----";
// retrieve available years
$years[0] = "----";
// retrieve available years
- $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM
logger
.sessions");
+ $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM
#logger#
.sessions");
list($max, $min) = $res->fetchOneRow();
for($i = intval($min); $i<=$max; $i++) {
list($max, $min) = $res->fetchOneRow();
for($i = intval($min); $i<=$max; $i++) {
@@
-258,16
+258,16
@@
class AdminModule extends PLModule
// we are viewing a session
$res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer
// we are viewing a session
$res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer
- FROM
logger
.sessions AS ls
- LEFT JOIN
aliases
AS a ON (a.id = ls.uid AND a.type='a_vie')
- LEFT JOIN
aliases
AS sa ON (sa.id = ls.suid AND sa.type='a_vie')
+ FROM
#logger#
.sessions AS ls
+ LEFT JOIN
#x4dat#.aliases
AS a ON (a.id = ls.uid AND a.type='a_vie')
+ LEFT JOIN
#x4dat#.aliases
AS sa ON (sa.id = ls.suid AND sa.type='a_vie')
WHERE ls.id = {?}", $arg);
$page->assign('session', $a = $res->fetchOneAssoc());
$res = XDB::iterator('SELECT a.text, e.data, e.stamp
WHERE ls.id = {?}", $arg);
$page->assign('session', $a = $res->fetchOneAssoc());
$res = XDB::iterator('SELECT a.text, e.data, e.stamp
- FROM
logger
.events AS e
- LEFT JOIN
logger
.actions AS a ON e.action=a.id
+ FROM
#logger#
.events AS e
+ LEFT JOIN
#logger#
.actions AS a ON e.action=a.id
WHERE e.session={?}', $arg);
while ($myarr = $res->next()) {
$page->append('events', $myarr);
WHERE e.session={?}', $arg);
while ($myarr = $res->next()) {
$page->append('events', $myarr);
@@
-317,8
+317,8
@@
class AdminModule extends PLModule
$where = $this->_makeWhere($year, $month, $day, $loguid);
$select = "SELECT s.id, s.start, s.uid,
a.alias as username
$where = $this->_makeWhere($year, $month, $day, $loguid);
$select = "SELECT s.id, s.start, s.uid,
a.alias as username
- FROM
logger
.sessions AS s
- LEFT JOIN
aliases
AS a ON (a.id = s.uid AND a.type='a_vie')
+ FROM
#logger#
.sessions AS s
+ LEFT JOIN
#x4dat#.aliases
AS a ON (a.id = s.uid AND a.type='a_vie')
$where
ORDER BY start DESC";
$res = XDB::iterator($select);
$where
ORDER BY start DESC";
$res = XDB::iterator($select);
@@
-332,9
+332,9
@@
class AdminModule extends PLModule
// attach events
$sql = "SELECT s.id, a.text
// attach events
$sql = "SELECT s.id, a.text
- FROM
logger
.sessions AS s
- LEFT JOIN
logger
.events AS e ON(e.session=s.id)
- INNER JOIN
logger
.actions AS a ON(a.id=e.action)
+ FROM
#logger#
.sessions AS s
+ LEFT JOIN
#logger#
.events AS e ON(e.session=s.id)
+ INNER JOIN
#logger#
.actions AS a ON(a.id=e.action)
$where";
$res = XDB::iterator($sql);
$where";
$res = XDB::iterator($sql);
@@
-360,7
+360,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.
@@
-380,7
+380,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'));
}
@@
-465,6
+465,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.
@@
-629,7
+630,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->login() . ' 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());
@@
-640,9
+641,9
@@
class AdminModule extends PLModule
// Forum ban update.
case "b_edit":
// Forum ban update.
case "b_edit":
- XDB::execute("DELETE FROM
forums
.innd WHERE uid = {?}", $user->id());
+ XDB::execute("DELETE FROM
#forums#
.innd WHERE uid = {?}", $user->id());
if (Env::v('write_perm') != "" || Env::v('read_perm') != "" || Env::v('commentaire') != "" ) {
if (Env::v('write_perm') != "" || Env::v('read_perm') != "" || Env::v('commentaire') != "" ) {
- XDB::execute("INSERT INTO
forums
.innd
+ XDB::execute("INSERT INTO
#forums#
.innd
SET ipmin = '0', ipmax = '4294967295',
write_perm = {?}, read_perm = {?},
comment = {?}, priority = '200', uid = {?}",
SET ipmin = '0', ipmax = '4294967295',
write_perm = {?}, read_perm = {?},
comment = {?}, priority = '200', uid = {?}",
@@
-654,7
+655,7
@@
class AdminModule extends PLModule
// Displays last login and last host information.
$res = XDB::query("SELECT start, host
// Displays last login and last host information.
$res = XDB::query("SELECT start, host
- FROM
logger
.sessions
+ FROM
#logger#
.sessions
WHERE uid = {?} AND suid = 0
ORDER BY start DESC
LIMIT 1", $user->id());
WHERE uid = {?} AND suid = 0
ORDER BY start DESC
LIMIT 1", $user->id());
@@
-689,7
+690,7
@@
class AdminModule extends PLModule
// Displays forum bans.
$res = XDB::query("SELECT write_perm, read_perm, comment
// Displays forum bans.
$res = XDB::query("SELECT write_perm, read_perm, comment
- FROM
forums
.innd
+ FROM
#forums#
.innd
WHERE uid = {?}", $user->id());
$bans = $res->fetchOneAssoc();
$page->assign('bans', $bans);
WHERE uid = {?}", $user->id());
$bans = $res->fetchOneAssoc();
$page->assign('bans', $bans);
@@
-893,9
+894,9
@@
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
- FROM auth_user_md5 AS u
- LEFT JOIN
logger.sessions
AS s ON (s.uid = u.user_id AND suid = 0)
+ "SELECT u.promo, u.nom, u.prenom, u.deces, u.hruid, DATE(MAX(s.start)) AS last
+ FROM
#x4dat#.
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
GROUP BY u.user_id
ORDER BY u.promo, u.nom");
WHERE perms IN ('admin', 'user') AND deces <> 0
GROUP BY u.user_id
ORDER BY u.promo, u.nom");
@@
-1042,7
+1043,7
@@
class AdminModule extends PLModule
function handler_logger_actions(&$page, $action = 'list', $id = null) {
$page->setTitle('Administration - Actions');
$page->assign('title', 'Gestion des actions de logger');
function handler_logger_actions(&$page, $action = 'list', $id = null) {
$page->setTitle('Administration - Actions');
$page->assign('title', 'Gestion des actions de logger');
- $table_editor = new PLTableEditor('admin/logger/actions','
logger
.actions','id');
+ $table_editor = new PLTableEditor('admin/logger/actions','
#logger#
.actions','id');
$table_editor->describe('text','intitulé',true);
$table_editor->describe('description','description',true);
$table_editor->apply($page, $action, $id);
$table_editor->describe('text','intitulé',true);
$table_editor->describe('description','description',true);
$table_editor->apply($page, $action, $id);
@@
-1123,7
+1124,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);
}
@@
-1173,10
+1173,10
@@
class AdminModule extends PLModule
IF(w.ip = s2.ip, s2.host, s2.forward_host),
IF(w.ip = s.ip, s.host, s.forward_host)),
w.mask, w.detection, w.state, u.hruid
IF(w.ip = s2.ip, s2.host, s2.forward_host),
IF(w.ip = s.ip, s.host, s.forward_host)),
w.mask, w.detection, w.state, u.hruid
- FROM
ip_watch
AS w
- LEFT JOIN
logger.sessions
AS s ON (s.ip = w.ip)
- LEFT JOIN
logger.sessions
AS s2 ON (s2.forward_ip = w.ip)
- LEFT JOIN
auth_user_md5
AS u ON (u.user_id = s.uid)
+ FROM
#x4dat#.ip_watch
AS w
+ LEFT JOIN
#logger#.sessions
AS s ON (s.ip = w.ip)
+ LEFT JOIN
#logger#.sessions
AS s2 ON (s2.forward_ip = w.ip)
+ LEFT JOIN
#x4dat#.auth_user_md5
AS u ON (u.user_id = s.uid)
GROUP BY w.ip, u.hruid
ORDER BY w.state, w.ip, u.hruid";
$it = Xdb::iterRow($sql);
GROUP BY w.ip, u.hruid
ORDER BY w.state, w.ip, u.hruid";
$it = Xdb::iterRow($sql);
@@
-1207,10
+1207,10
@@
class AdminModule extends PLModule
} elseif ($action == 'edit') {
$sql = "SELECT w.detection, w.state, w.last, w.description, w.mask,
u1.hruid AS edit, u2.hruid AS hruid, s.host
} elseif ($action == 'edit') {
$sql = "SELECT w.detection, w.state, w.last, w.description, w.mask,
u1.hruid AS edit, u2.hruid AS hruid, s.host
- FROM
ip_watch
AS w
- LEFT JOIN
auth_user_md5
AS u1 ON (u1.user_id = w.uid)
- LEFT JOIN
logger.sessions
AS s ON (w.ip = s.ip)
- LEFT JOIN
auth_user_md5
AS u2 ON (u2.user_id = s.uid)
+ FROM
#x4dat#.ip_watch
AS w
+ LEFT JOIN
#x4dat#.auth_user_md5
AS u1 ON (u1.user_id = w.uid)
+ LEFT JOIN
#logger#.sessions
AS s ON (w.ip = s.ip)
+ LEFT JOIN
#x4dat#.auth_user_md5
AS u2 ON (u2.user_id = s.uid)
WHERE w.ip = {?}
GROUP BY u2.hruid
ORDER BY u2.hruid";
WHERE w.ip = {?}
GROUP BY u2.hruid
ORDER BY u2.hruid";