This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 569713a978d40855dd92e61ff239e29984c0d203 (commit)
via 39b3588f4486becf18a2e749cd8e64654be9d6e7 (commit)
from cb7bdb05d002fd81103abc1ed4197dc1eddc13c1 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 569713a978d40855dd92e61ff239e29984c0d203
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jul 4 13:35:52 2014 +0200
wiki: allow DebugGroupInfo, DebugAuthInfo and DebugBackendInfo for
Fusionforge
diff --git a/src/plugins/wiki/www/lib/IniConfig.php
b/src/plugins/wiki/www/lib/IniConfig.php
index 03afcf8..3c838bb 100644
--- a/src/plugins/wiki/www/lib/IniConfig.php
+++ b/src/plugins/wiki/www/lib/IniConfig.php
@@ -700,18 +700,18 @@ function fixup_static_configs($file)
$AllAllowedPlugins[] = 'WikiFormRich';
$AllAllowedPlugins[] = 'WikiPoll';
$AllAllowedPlugins[] = 'YouTube';
+ $AllAllowedPlugins[] = 'DebugGroupInfo';
+ $AllAllowedPlugins[] = 'DebugAuthInfo';
+ $AllAllowedPlugins[] = 'DebugBackendInfo';
// The FUSIONFORGE theme omits them
if (!(defined('FUSIONFORGE') and FUSIONFORGE)) {
$AllAllowedPlugins[] = 'AnalyseAccessLogSql';
- $AllAllowedPlugins[] = 'DebugAuthInfo';
- $AllAllowedPlugins[] = 'DebugBackendInfo';
$AllAllowedPlugins[] = 'CacheTest';
$AllAllowedPlugins[] = 'CategoryPage';
$AllAllowedPlugins[] = 'FoafViewer';
$AllAllowedPlugins[] = 'FrameInclude';
$AllAllowedPlugins[] = 'GraphViz';
- $AllAllowedPlugins[] = 'DebugGroupInfo';
$AllAllowedPlugins[] = 'HtmlConverter';
$AllAllowedPlugins[] = 'JabberPresence';
$AllAllowedPlugins[] = 'ListPages';
commit 39b3588f4486becf18a2e749cd8e64654be9d6e7
Author: Marc-Etienne Vargenau <[email protected]>
Date: Fri Jul 4 13:35:13 2014 +0200
wiki: use correct headers hierarchy
diff --git a/src/plugins/wiki/www/lib/plugin/DebugAuthInfo.php
b/src/plugins/wiki/www/lib/plugin/DebugAuthInfo.php
index 8d54069..bcf3ef8 100644
--- a/src/plugins/wiki/www/lib/plugin/DebugAuthInfo.php
+++ b/src/plugins/wiki/www/lib/plugin/DebugAuthInfo.php
@@ -56,7 +56,7 @@ class WikiPlugin_DebugAuthInfo
$this->disabled("! user->isAdmin");
}
- $html = HTML(HTML::h3(fmt("General Auth Settings")));
+ $html = HTML(HTML::h2(fmt("General Auth Settings")));
$table = HTML::table(array('class' => 'bordered'));
$table->pushContent($this->show_hash("AUTH DEFINES",
$this->buildConstHash(
@@ -89,7 +89,7 @@ class WikiPlugin_DebugAuthInfo
unset($DBAuthParams['dummy']);
$table->pushContent($this->show_hash("\$DBAuthParams[]",
$DBAuthParams));
$html->pushContent($table);
- $html->pushContent(HTML(HTML::h3(fmt("Personal Auth Settings for
“%s”", $userid))));
+ $html->pushContent(HTML(HTML::h2(fmt("Personal Auth Settings for
“%s”", $userid))));
if (!$user) {
$html->pushContent(HTML::p(fmt("No userid")));
} else {
@@ -131,9 +131,9 @@ class WikiPlugin_DebugAuthInfo
if ($heading)
$rows[] = HTML::tr(array(
- 'style' => 'color:#000;background-color:#ffcccc'),
+ 'style' => 'color:black; background-color:#ffcccc'),
HTML::td(array('colspan' => 2,
- 'style' => 'color:#000'),
+ 'style' => 'color:black'),
$heading));
if (is_object($hash))
$hash = obj2hash($hash);
@@ -162,12 +162,11 @@ class WikiPlugin_DebugAuthInfo
}
}
$rows[] = HTML::tr(HTML::td(array('class' => 'align-right',
- 'bgcolor' => '#ccc',
- 'style' => 'color:#000000'),
+ 'style' => 'color:black; background-color:#ccc'),
HTML(HTML::raw(' '), $key,
HTML::raw(' '))),
- HTML::td(array('bgcolor' => '#fff',
- 'style' => 'color:#000000'),
+ HTML::td(array(
+ 'style' => 'color:black; background-color:white'),
$val ? $val : HTML::raw(' '))
);
//if (empty($seen[$key])) $seen[$key] = 1;
diff --git a/src/plugins/wiki/www/lib/plugin/DebugBackendInfo.php
b/src/plugins/wiki/www/lib/plugin/DebugBackendInfo.php
index 63bc4b7..b262d36 100644
--- a/src/plugins/wiki/www/lib/plugin/DebugBackendInfo.php
+++ b/src/plugins/wiki/www/lib/plugin/DebugBackendInfo.php
@@ -41,6 +41,16 @@ class WikiPlugin_DebugBackendInfo
{
$args = $this->getArgs($argstr, $request);
extract($args);
+ if (empty($userid) or $userid == $request->_user->UserName()) {
+ $user = $request->_user;
+ $userid = $user->UserName();
+ } else {
+ $user = WikiUser($userid);
+ }
+ if (!$user->isAdmin() and !(DEBUG && _DEBUG_LOGIN)) {
+ $request->_notAuthorized(WIKIAUTH_ADMIN);
+ $this->disabled("! user->isAdmin");
+ }
if (empty($page))
return $this->error("page missing");
@@ -49,7 +59,7 @@ class WikiPlugin_DebugBackendInfo
$this->readonly_pagemeta = array();
$this->hidden_pagemeta = array('_cached_html');
- $html = HTML(HTML::h3(fmt("Querying backend directly for “%s”",
+ $html = HTML(HTML::h2(fmt("Querying backend directly for “%s”",
$page)));
$table = HTML::table(array('class' => 'bordered'));
@@ -159,20 +169,20 @@ class WikiPlugin_DebugBackendInfo
$rows = array();
if ($heading)
$rows[] = HTML::tr(array(
- 'style' => 'color:#000;background-color:#ffcccc'),
+ 'style' => 'color:black; background-color:#ffcccc'),
HTML::td(array('colspan' => 2,
- 'style' => 'color:#000'),
+ 'style' => 'color:black'),
$heading));
if (!is_array($hash)) return array();
ksort($hash);
foreach ($hash as $key => $val) {
if ($this->chunk_split and is_string($val)) $val =
chunk_split($val);
$rows[] = HTML::tr(HTML::td(array('class' => 'align-right',
- 'style' => 'color:#000;background-color:#ccc'),
+ 'style' => 'color:black; background-color:#ccc'),
HTML(HTML::raw(' '), $key,
HTML::raw(' '))),
HTML::td(array(
- 'style' => 'color:#000;background-color:#fff'),
+ 'style' => 'color:black; background-color:white'),
$this->_showvalue($key, $val, $prefix))
);
}
diff --git a/src/plugins/wiki/www/lib/plugin/DebugGroupInfo.php
b/src/plugins/wiki/www/lib/plugin/DebugGroupInfo.php
index 0770fc5..9d9b349 100644
--- a/src/plugins/wiki/www/lib/plugin/DebugGroupInfo.php
+++ b/src/plugins/wiki/www/lib/plugin/DebugGroupInfo.php
@@ -48,7 +48,7 @@ class WikiPlugin_DebugGroupInfo
foreach ($allGroups as $g) {
$members = $group->getMembersOf($g);
- $output->pushContent(HTML::h3($g . " - members: " .
+ $output->pushContent(HTML::h2($g . " - members: " .
sizeof($members) . " - isMember: " . ($group->isMember($g)
? "yes" : "no")
));
foreach ($members as $m) {
-----------------------------------------------------------------------
Summary of changes:
src/plugins/wiki/www/lib/IniConfig.php | 6 +++---
src/plugins/wiki/www/lib/plugin/DebugAuthInfo.php | 15 +++++++--------
.../wiki/www/lib/plugin/DebugBackendInfo.php | 20 +++++++++++++++-----
src/plugins/wiki/www/lib/plugin/DebugGroupInfo.php | 2 +-
4 files changed, 26 insertions(+), 17 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
