projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapts upgrade scripts to domain.
[platal.git]
/
modules
/
platal.php
diff --git
a/modules/platal.php
b/modules/platal.php
index
aacc560
..
3ebcd99
100644
(file)
--- a/
modules/platal.php
+++ b/
modules/platal.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-201
0
Polytechnique.org *
+ * Copyright (C) 2003-201
1
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,7
+21,7
@@
function bugize($list)
{
function bugize($list)
{
- $list =
split(',', $list
);
+ $list =
preg_split('/,/', Env::s('libs'), -1, PREG_SPLIT_NO_EMPTY
);
$ans = array();
foreach ($list as $bug) {
$ans = array();
foreach ($list as $bug) {
@@
-59,7
+59,7
@@
class PlatalModule extends PLModule
);
}
);
}
- function handler_index(
&
$page)
+ function handler_index($page)
{
// Include X-XRDS-Location response-header for Yadis discovery
global $globals;
{
// Include X-XRDS-Location response-header for Yadis discovery
global $globals;
@@
-73,14
+73,14
@@
class PlatalModule extends PLModule
}
}
}
}
- function handler_cacert(
&
$page)
+ function handler_cacert($page)
{
pl_cached_content_headers("application/x-x509-ca-cert");
readfile("/etc/ssl/xorgCA/cacert.pem");
exit;
}
{
pl_cached_content_headers("application/x-x509-ca-cert");
readfile("/etc/ssl/xorgCA/cacert.pem");
exit;
}
- function handler_changelog(
&
$page, $core = null)
+ function handler_changelog($page, $core = null)
{
$page->changeTpl('platal/changeLog.tpl');
{
$page->changeTpl('platal/changeLog.tpl');
@@
-129,7
+129,7
@@
class PlatalModule extends PLModule
}
}
}
}
- function handler_prefs(
&
$page)
+ function handler_prefs($page)
{
$page->changeTpl('platal/preferences.tpl');
$page->setTitle('Mes préférences');
{
$page->changeTpl('platal/preferences.tpl');
$page->setTitle('Mes préférences');
@@
-146,7
+146,7
@@
class PlatalModule extends PLModule
}
}
}
}
- function handler_webredir(
&
$page)
+ function handler_webredir($page)
{
$page->changeTpl('platal/webredirect.tpl');
$page->setTitle('Redirection de page WEB');
{
$page->changeTpl('platal/webredirect.tpl');
$page->setTitle('Redirection de page WEB');
@@
-156,8
+156,9
@@
class PlatalModule extends PLModule
$page->trigError('URL invalide');
} else {
$url = Env::t('url');
$page->trigError('URL invalide');
} else {
$url = Env::t('url');
- XDB::execute('REPLACE INTO carvas (uid, url)
- VALUES ({?}, {?})',
+ XDB::execute('INSERT INTO carvas (uid, url)
+ VALUES ({?}, {?})
+ ON DUPLICATE KEY UPDATE url = VALUES(url)',
S::i('uid'), $url);
S::logger()->log('carva_add', 'http://' . $url);
$page->trigSuccess("Redirection activée vers <a href='http://$url'>$url</a>");
S::i('uid'), $url);
S::logger()->log('carva_add', 'http://' . $url);
$page->trigSuccess("Redirection activée vers <a href='http://$url'>$url</a>");
@@
-184,7
+185,7
@@
class PlatalModule extends PLModule
$page->assign('bestalias', $res->fetchOneCell());
}
$page->assign('bestalias', $res->fetchOneCell());
}
- function handler_prefs_rss(
&
$page)
+ function handler_prefs_rss($page)
{
$page->changeTpl('platal/filrss.tpl');
{
$page->changeTpl('platal/filrss.tpl');
@@
-196,7
+197,7
@@
class PlatalModule extends PLModule
}
}
}
}
- function handler_password(
&
$page)
+ function handler_password($page)
{
global $globals;
{
global $globals;
@@
-227,11
+228,10
@@
class PlatalModule extends PLModule
}
$page->changeTpl('platal/password.tpl');
}
$page->changeTpl('platal/password.tpl');
- $page->addJsLink('password.js');
$page->setTitle('Mon mot de passe');
}
$page->setTitle('Mon mot de passe');
}
- function handler_smtppass(
&
$page)
+ function handler_smtppass($page)
{
$page->changeTpl('platal/acces_smtp.tpl');
$page->setTitle('Acces SMTP/NNTP');
{
$page->changeTpl('platal/acces_smtp.tpl');
$page->setTitle('Acces SMTP/NNTP');
@@
-265,7
+265,7
@@
class PlatalModule extends PLModule
$page->assign('actif', $res->fetchOneCell());
}
$page->assign('actif', $res->fetchOneCell());
}
- function handler_recovery(
&
$page)
+ function handler_recovery($page)
{
global $globals;
{
global $globals;
@@
-347,7
+347,7
@@
Adresse de secours : " . Post::v('email') : ""));
S::logger($user->id())->log('recovery', $mails);
}
S::logger($user->id())->log('recovery', $mails);
}
- function handler_tmpPWD(
&
$page, $certif = null)
+ function handler_tmpPWD($page, $certif = null)
{
global $globals;
// XXX: recovery requires data from the profile
{
global $globals;
// XXX: recovery requires data from the profile
@@
-386,11
+386,10
@@
Adresse de secours : " . Post::v('email') : ""));
$page->changeTpl('platal/tmpPWD.success.tpl');
} else {
$page->changeTpl('platal/password.tpl');
$page->changeTpl('platal/tmpPWD.success.tpl');
} else {
$page->changeTpl('platal/password.tpl');
- $page->addJsLink('password.js');
}
}
}
}
- function handler_skin(
&
$page)
+ function handler_skin($page)
{
global $globals;
{
global $globals;
@@
-419,12
+418,18
@@
Adresse de secours : " . Post::v('email') : ""));
$page->assign('skins', XDB::iterator($sql));
}
$page->assign('skins', XDB::iterator($sql));
}
- function handler_exit(
&
$page, $level = null)
+ function handler_exit($page, $level = null)
{
if (S::suid()) {
{
if (S::suid()) {
- S::logger()->log('suid_stop', S::user()->login() . " by " . S::suid('hruid'));
+ $old = S::user()->login();
+ S::logger()->log('suid_stop', $old . " by " . S::suid('hruid'));
Platal::session()->stopSUID();
Platal::session()->stopSUID();
- pl_redirect('admin/user/' . S::user()->login());
+ $target = S::s('suid_startpage');
+ S::kill('suid_startpage');
+ if (!empty($target)) {
+ http_redirect($target);
+ }
+ pl_redirect('admin/user/' . $old);
}
if ($level == 'forget' || $level == 'forgetall') {
}
if ($level == 'forget' || $level == 'forgetall') {
@@
-447,7
+452,7
@@
Adresse de secours : " . Post::v('email') : ""));
}
}
}
}
- function handler_review(
&
$page, $action = null, $mode = null)
+ function handler_review($page, $action = null, $mode = null)
{
// Include X-XRDS-Location response-header for Yadis discovery
global $globals;
{
// Include X-XRDS-Location response-header for Yadis discovery
global $globals;