Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11032/plugin
Modified Files:
ListPages.php MostPopular.php PageDump.php VisualWiki.php
Log Message:
loadsave: check if the dumped file will be accessible from outside.
and some other minor fixes. (cvsclient native not yet ready)
Index: ListPages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/ListPages.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -2 -b -p -d -r1.7 -r1.8
--- ListPages.php 25 Sep 2004 16:33:52 -0000 1.7
+++ ListPages.php 14 Oct 2004 19:19:34 -0000 1.8
@@ -73,5 +73,6 @@ extends WikiPlugin
else
$info = array();
-
+ // Fixme: if the ratings table does not exist it will break.
+ // check if Theme isa 'wikilens'?
if (in_array('top3recs', $info)) {
require_once('lib/wikilens/Buddy.php');
@@ -122,17 +123,4 @@ extends WikiPlugin
$pages_array = is_string($pages) ? explodePageList($pages) :
(is_array($pages) ? $pages : array());
$pagelist->addPageList($pages_array);
- /*
- if (is_string($exclude) and !empty($exclude)) {
- $exclude = explodePageList($exclude);
- // $argstr = preg_replace("/exclude=\S*\s/", "", $argstr);
- }
- $pages_array = is_string($pages) ? explodePageList($pages) :
(is_array($pages) ? $pages : array());
- foreach ($pages_array as $pagename) {
- if (empty($exclude) or !in_array($pagename, $exclude)) {
- $page = $dbi->getPage($pagename);
- $pagelist->addPage($page);
- }
- }
- */
return $pagelist;
}
@@ -153,4 +141,8 @@ class _PageList_Column_ListPages_count e
// $Log$
+// Revision 1.8 2004/10/14 19:19:34 rurban
+// loadsave: check if the dumped file will be accessible from outside.
+// and some other minor fixes. (cvsclient native not yet ready)
+//
// Revision 1.7 2004/09/25 16:33:52 rurban
// add support for all PageList options
Index: MostPopular.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/MostPopular.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -2 -b -p -d -r1.29 -r1.30
--- MostPopular.php 25 Sep 2004 16:33:52 -0000 1.29
+++ MostPopular.php 14 Oct 2004 19:19:34 -0000 1.30
@@ -80,5 +80,5 @@ extends WikiPlugin
}
$dbi->touch();
- $pages = $dbi->mostPopular($limit,$sortby);
+ $pages = $dbi->mostPopular($limit, $sortby);
$pagelist = new PageList($columns, $exclude, $args);
while ($page = $pages->next()) {
@@ -108,4 +108,8 @@ extends WikiPlugin
// $Log$
+// Revision 1.30 2004/10/14 19:19:34 rurban
+// loadsave: check if the dumped file will be accessible from outside.
+// and some other minor fixes. (cvsclient native not yet ready)
+//
// Revision 1.29 2004/09/25 16:33:52 rurban
// add support for all PageList options
Index: PageDump.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/PageDump.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -2 -b -p -d -r1.17 -r1.18
--- PageDump.php 16 Sep 2004 07:49:01 -0000 1.17
+++ PageDump.php 14 Oct 2004 19:19:34 -0000 1.18
@@ -282,5 +282,5 @@ _("PhpWiki developers should manually in
if(trim($array[$i]) != "zzzjunk") { //nasty, fixme
//trigger_error("'$array[$i]'");//debugging
- $return[] =$array[$i];
+ $return[] = $array[$i];
}
}
@@ -291,4 +291,8 @@ _("PhpWiki developers should manually in
// $Log$
+// Revision 1.18 2004/10/14 19:19:34 rurban
+// loadsave: check if the dumped file will be accessible from outside.
+// and some other minor fixes. (cvsclient native not yet ready)
+//
// Revision 1.17 2004/09/16 07:49:01 rurban
// use the page charset instead if the global one on download
Index: VisualWiki.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/VisualWiki.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -2 -b -p -d -r1.16 -r1.17
--- VisualWiki.php 12 Oct 2004 15:34:47 -0000 1.16
+++ VisualWiki.php 14 Oct 2004 19:19:34 -0000 1.17
@@ -4,5 +4,5 @@ rcs_id('$Id$');
Copyright (C) 2002 Johannes Große (Johannes Große)
- This file is (not yet) part of PhpWiki.
+ This file is part of PhpWiki.
PhpWiki is free software; you can redistribute it and/or modify
@@ -45,16 +45,14 @@ elseif (isWindows()) {
$dotbin = 'dot';
define('VISUALWIKIFONT', 'Arial');
-} else { // other os
- $dotbin = '/usr/local/bin/dot';
- // sf.net specials
- if ($_SERVER["SERVER_NAME"] == 'phpwiki.sourceforge.net') {
+} elseif ($_SERVER["SERVER_NAME"] == 'phpwiki.sourceforge.net') { // sf.net
hack
$dotbin = '/home/groups/p/ph/phpwiki/bin/dot';
define('VISUALWIKIFONT', 'luximr');
- } else {
+} else { // other os
+ $dotbin = '/usr/local/bin/dot';
// Name of the Truetypefont - Helvetica is probably easier to read
define('VISUALWIKIFONT', 'Helvetica');
//define('VISUALWIKIFONT', 'Times');
//define('VISUALWIKIFONT', 'Arial');
- }
+
// The default font paths do not find your fonts, set the path here:
//$fontpath = "/usr/X11R6/lib/X11/fonts/TTF/";
@@ -599,4 +597,5 @@ extends WikiPluginCached
*/
function execute($cmd, $until = false) {
+ // cmd must redirect stderr to stdout though!
$errstr = exec($cmd); //, $outarr, $returnval); // normally 127
//$errstr = join('',$outarr);
@@ -636,5 +635,4 @@ extends WikiPluginCached
function invokeDot($argarray) {
global $dotbin;
- //$cacheparams = $GLOBALS['CacheParams'];
$tempfiles = $this->tempnam('VisualWiki');
$gif = $argarray['imgtype'];
@@ -824,4 +822,8 @@ function interpolate($a, $b, $pos) {
// $Log$
+// Revision 1.17 2004/10/14 19:19:34 rurban
+// loadsave: check if the dumped file will be accessible from outside.
+// and some other minor fixes. (cvsclient native not yet ready)
+//
// Revision 1.16 2004/10/12 15:34:47 rurban
// redirect stderr to display the failing msg
-------------------------------------------------------
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
|
