projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/platal-0.10.2'
[platal.git]
/
include
/
banana
/
hooks.inc.php
diff --git
a/include/banana/hooks.inc.php
b/include/banana/hooks.inc.php
index
e475b27
..
149aff2
100644
(file)
--- a/
include/banana/hooks.inc.php
+++ b/
include/banana/hooks.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-20
08
Polytechnique.org *
+ * Copyright (C) 2003-20
10
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 *
@@
-186,8
+186,8
@@
function hook_getXFace($headers)
}
if (isset($headers['x-face'])) {
$res = XDB::query("SELECT p.uid
}
if (isset($headers['x-face'])) {
$res = XDB::query("SELECT p.uid
- FROM
forums
.profils AS p
- INNER JOIN
aliases
AS a ON (p.uid = a.id)
+ FROM
#forums#
.profils AS p
+ INNER JOIN
#x4dat#.aliases
AS a ON (p.uid = a.id)
WHERE FIND_IN_SET('xface', p.flags) AND a.alias = {?}",
$login);
if ($res->numRows()) {
WHERE FIND_IN_SET('xface', p.flags) AND a.alias = {?}",
$login);
if ($res->numRows()) {
@@
-200,8
+200,7
@@
function hook_getXFace($headers)
function hook_makeJs($src)
{
function hook_makeJs($src)
{
- global $page;
- $page->addJsLink("$src.js");
+ Platal::page()->addJsLink("$src.js");
return ' ';
}
return ' ';
}
@@
-210,7
+209,7
@@
function make_Organization()
global $globals;
$perms = S::v('perms');
$group = $globals->asso('nom');
global $globals;
$perms = S::v('perms');
$group = $globals->asso('nom');
- if (S::
has_perms
()) {
+ if (S::
admin
()) {
return "Administrateur de Polytechnique.org";
} else if ($group && $perms->hasFlag('groupadmin')) {
return "Animateur de $group";
return "Administrateur de Polytechnique.org";
} else if ($group && $perms->hasFlag('groupadmin')) {
return "Animateur de $group";
@@
-290,12
+289,12
@@
class PlatalBananaPage extends BananaPage
protected function prepare()
{
$tpl = parent::prepare();
protected function prepare()
{
$tpl = parent::prepare();
- global $wiz
, $page
;
- $wiz = new PlWizard('Banana',
'core/plwizard.tpl'
, true, false);
+ global $wiz;
+ $wiz = new PlWizard('Banana',
PlPage::getCoreTpl('plwizard.tpl')
, true, false);
foreach ($this->pages as $name=>&$mpage) {
$wiz->addPage($this->handler, $mpage['text'], $name);
}
foreach ($this->pages as $name=>&$mpage) {
$wiz->addPage($this->handler, $mpage['text'], $name);
}
- $wiz->apply(
$page
, $this->base, $this->page);
+ $wiz->apply(
Platal::page()
, $this->base, $this->page);
return $tpl;
}
}
return $tpl;
}
}
@@
-311,11
+310,13
@@
class BananaHandler
return 'banana/index.tpl';
}
return 'banana/index.tpl';
}
- public function prepare(Pl
atal
Page &$page, $id)
+ public function prepare(PlPage &$page, $id)
{
}
{
}
- public function process()
+ public function success() { }
+
+ public function process(&$success)
{
return PlWizard::CURRENT_PAGE;
}
{
return PlWizard::CURRENT_PAGE;
}
@@
-323,7
+324,8
@@
class BananaHandler
function run_banana(&$page, $class, array $args)
{
function run_banana(&$page, $class, array $args)
{
- $banana = new $class(S::user(), $args);
+ $user = S::user();
+ $banana = new $class($user, $args);
$page->assign('banana', $banana->run());
$page->addCssInline($banana->css());
$page->addCssLink('banana.css');
$page->assign('banana', $banana->run());
$page->addCssInline($banana->css());
$page->addCssLink('banana.css');