From ff708d0b25f8e64c0ed7f81b9dc94e12972d3051 Mon Sep 17 00:00:00 2001 From: rurban Date: Fri, 17 Dec 2004 16:12:09 +0000 Subject: [PATCH] add working dynamic hyperwiki sidebar box (hyperapplet not yet), fix RPC wiki.listLinks interface: name=>page git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4296 96ab9672-09ca-45d6-a79d-3d69d39ca109 --- lib/CachedMarkup.php | 6 +++-- lib/XmlRpcServer.php | 26 +++++++++++++-------- themes/Sidebar/templates/body.tmpl | 8 +++---- themes/default/hwiki.prop | 26 +++++++++++++++++++++ themes/default/hyperapplet.php | 37 ++++++++++++++---------------- themes/default/hyperwiki.php | 16 +++++++++++++ 6 files changed, 83 insertions(+), 36 deletions(-) create mode 100644 themes/default/hwiki.prop create mode 100644 themes/default/hyperwiki.php diff --git a/lib/CachedMarkup.php b/lib/CachedMarkup.php index d292f157b..4a3d10cd9 100644 --- a/lib/CachedMarkup.php +++ b/lib/CachedMarkup.php @@ -1,5 +1,5 @@ * * This file is part of PhpWiki. @@ -245,6 +245,7 @@ class XmlRpc_LinkInfo { $this->page = $page; $this->type = $type; $this->href = $href; + //$this->pageref = str_replace("/RPC2.php", "/index.php", $href); } } @@ -301,7 +302,8 @@ class Cached_WikiLink extends Cached_Link { } function _getURL($basepage) { - return WikiURL($this->getPagename($basepage), false, 'abs_url'); + return WikiURL($this->getPagename($basepage)); + //return WikiURL($this->getPagename($basepage), false, 'abs_url'); } function expand($basepage, &$markup) { diff --git a/lib/XmlRpcServer.php b/lib/XmlRpcServer.php index d80bfc218..e5c30a366 100644 --- a/lib/XmlRpcServer.php +++ b/lib/XmlRpcServer.php @@ -1,5 +1,5 @@ * * LICENCE @@ -180,10 +180,10 @@ function short_string_decode ($str) { /** * Get an xmlrpc "No such page" error message */ -function NoSuchPage () +function NoSuchPage ($pagename='') { global $xmlrpcerruser; - return new xmlrpcresp(0, $xmlrpcerruser + 1, "No such page"); + return new xmlrpcresp(0, $xmlrpcerruser + 1, "No such page ".$pagename); } @@ -265,8 +265,11 @@ function getPage($params) { $revision = _getPageRevision($params); - if (! $revision) - return NoSuchPage(); + if (! $revision ) { + $ParamPageName = $params->getParam(0); + $pagename = short_string_decode($ParamPageName->scalarval()); + return NoSuchPage($pagename); + } return new xmlrpcresp(long_string($revision->getPackedContent())); } @@ -413,7 +416,7 @@ function listLinks($params) $pagename = short_string_decode($ParamPageName->scalarval()); $dbh = $request->getDbh(); if (! $dbh->isWikiPage($pagename)) - return NoSuchPage(); + return NoSuchPage($pagename); $page = $dbh->getPage($pagename); /* @@ -439,7 +442,7 @@ function listLinks($params) $use_abspath = USE_PATH_INFO && ! preg_match('/RPC2.php$/', VIRTUAL_PATH); $href = new xmlrpcval(WikiURL($currentname, $args, $use_abspath)); - $linkstruct[] = new xmlrpcval(array('name'=> $name, + $linkstruct[] = new xmlrpcval(array('page'=> $name, 'type'=> $type, 'href' => $href), "struct"); @@ -454,9 +457,12 @@ function listLinks($params) // We used to give an href for unknown pages that // included action=edit. I think that's probably the // wrong thing to do. - $linkstruct[] = new xmlrpcval(array('name'=> short_string($link->page), - 'type'=> new xmlrpcval($link->type), - 'href' => short_string($link->href)), + $linkstruct[] = new xmlrpcval(array(/*'name'=> short_string($link->page),*/ // wrong! + 'page'=> short_string($link->page), + 'type'=> new xmlrpcval($link->type, 'string'), + 'href' => short_string($link->href), + //'pageref' => short_string($link->pageref), + ), "struct"); } diff --git a/themes/Sidebar/templates/body.tmpl b/themes/Sidebar/templates/body.tmpl index 887f82bb6..b3c8c7481 100644 --- a/themes/Sidebar/templates/body.tmpl +++ b/themes/Sidebar/templates/body.tmpl @@ -1,5 +1,5 @@ getMoreAttr('body') ?>> @@ -29,12 +29,12 @@ if (!$HIDE_TOOLBARS) {
- +
-_findFile("hyperapplet.php")); ?> +_findFile("hyperapplet.php")); ?> +_findFile("hyperwiki.php")); ?> _findFile("clock.php")); ?>
-body; diff --git a/themes/default/hwiki.prop b/themes/default/hwiki.prop new file mode 100644 index 000000000..c54f26fff --- /dev/null +++ b/themes/default/hwiki.prop @@ -0,0 +1,26 @@ +; layout settings +hypergraph.visualnet.layout.class=hypergraph.visualnet.GenericMDSLayout +;hypergraph.visualnet.layout.class=hypergraph.visualnet.TreeLayout +hypergraph.visualnet.layout.expandingEnabled=false +hypergraph.visualnet.layout.initiallyExpanded=3 +hypergraph.visualnet.GenericMDSLayout.repulsingForce=1 +hypergraph.visualnet.GenericMDSLayout.connectedDisparity=0.3 +hypergraph.visualnet.TreeLayout.maxangle=180 +hypergraph.visualnet.TreeLayout.mindistance=1 +hypergraph.visualnet.TreeLayout.defaultSize=0.1 +; settings for the text. +hypergraph.hyperbolic.text.fontName=Arial +hypergraph.hyperbolic.text.size1=12 +hypergraph.hyperbolic.text.scale1=0.7 +hypergraph.hyperbolic.text.size2=10 +hypergraph.hyperbolic.text.scale2=0.3 +hypergraph.hyperbolic.text.size3=8 +hypergraph.hyperbolic.text.scale3=0.1 +hypergraph.hyperbolic.text.size4=0 +hypergraph.hyperbolic.text.color=#ff0000 +hypergraph.hyperbolic.line.color=#c0c0c0 +#hypergraph.hyperbolic.text.backgroundColor=#ffffff +hypergraph.hyperbolic.background.color=#f0f0f0 +; settings for HExplorerApplet +; hypergraph.applications.hexplorer.GraphPanel.target=contentFrame +hypergraph.applications.hexplorer.GraphPanel.target=_parent diff --git a/themes/default/hyperapplet.php b/themes/default/hyperapplet.php index dfdf0a828..4d55ba998 100644 --- a/themes/default/hyperapplet.php +++ b/themes/default/hyperapplet.php @@ -1,24 +1,21 @@ -" - width="160" height="360" > - 'xml')) ?>" > - -_finddata("hyperwiki.jar");?>" - width="100%" height="500">"> - - " /> - - */ -?> \ No newline at end of file + width="160" height="360"> + + + + " /> + + + \ No newline at end of file diff --git a/themes/default/hyperwiki.php b/themes/default/hyperwiki.php new file mode 100644 index 000000000..abd499e61 --- /dev/null +++ b/themes/default/hyperwiki.php @@ -0,0 +1,16 @@ + +" + width="162" height="240"> + + " /> + " /> + -- 2.45.0