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/platal-0.10.0'
[platal.git]
/
include
/
banana
/
hooks.inc.php
diff --git
a/include/banana/hooks.inc.php
b/include/banana/hooks.inc.php
index
4810703
..
d8cd9f1
100644
(file)
--- a/
include/banana/hooks.inc.php
+++ b/
include/banana/hooks.inc.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
7
Polytechnique.org *
+ * Copyright (C) 2003-200
9
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 *
@@
-76,7
+76,7
@@
function hook_platalRSS($group)
} else {
$group = '';
}
} else {
$group = '';
}
- return '/rss/' . $group . S::v('
forlife
') . '/' . S::v('core_rss_hash') . '/rss.xml';
+ return '/rss/' . $group . S::v('
hruid
') . '/' . S::v('core_rss_hash') . '/rss.xml';
}
function hook_platalMessageLink($params)
}
function hook_platalMessageLink($params)
@@
-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 ' ';
}
@@
-230,6
+229,9
@@
function get_banana_params(array &$get, $group = null, $action = null, $artid =
$action = 'read';
$group = S::v('banana_group');
$artid = S::i('banana_artid');
$action = 'read';
$group = S::v('banana_group');
$artid = S::i('banana_artid');
+ } else if ($action == 'message') {
+ $action = 'read';
+ $artid = S::i('banana_artid');
} else if ($group == 'subscribe' || $group == 'subscription') {
$group = null;
$action = null;
} else if ($group == 'subscribe' || $group == 'subscription') {
$group = null;
$action = null;
@@
-287,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;
}
}
@@
-308,7
+310,7
@@
class BananaHandler
return 'banana/index.tpl';
}
return 'banana/index.tpl';
}
- public function prepare(Pl
atal
Page &$page, $id)
+ public function prepare(PlPage &$page, $id)
{
}
{
}
@@
-320,7
+322,7
@@
class BananaHandler
function run_banana(&$page, $class, array $args)
{
function run_banana(&$page, $class, array $args)
{
- $banana = new $class(S::
v('forlife'
), $args);
+ $banana = new $class(S::
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');