[phpwiki-checkins] CVS: phpwiki/lib/plugin AllPages.php,1.25,1.26 WikiForm.php,1.12,1.13

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17611/plugin

Modified Files:
	AllPages.php WikiForm.php 
Log Message:
add DEFAULT_DUMP_DIR and HTML_DUMP_DIR constants, for easier cmdline dumps,
fixed dumping buttons locally (images/buttons/),
support pages arg for dumphtml,
optional directory arg for dumpserial + dumphtml,
fix a AllPages warning,
show dump warnings/errors on DEBUG,
don't warn just ignore on wikilens pagelist columns, if not loaded.
RateIt pagelist column is called "rating", not "ratingwidget" (Dan?)


Index: AllPages.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/AllPages.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -2 -b -p -d -r1.25 -r1.26
--- AllPages.php	14 Jun 2004 11:31:38 -0000	1.25
+++ AllPages.php	21 Jun 2004 16:22:32 -0000	1.26
@@ -80,4 +80,5 @@ extends WikiPlugin
             if (! $request->getArg('count'))  $args['count'] = $dbi->numPages(false,$exclude);
             else $args['count'] = $request->getArg('count');
+            $pages = false;
         }
         if (empty($args['count']) and is_array($pages))
@@ -115,4 +116,14 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.26  2004/06/21 16:22:32  rurban
+// add DEFAULT_DUMP_DIR and HTML_DUMP_DIR constants, for easier cmdline dumps,
+// fixed dumping buttons locally (images/buttons/),
+// support pages arg for dumphtml,
+// optional directory arg for dumpserial + dumphtml,
+// fix a AllPages warning,
+// show dump warnings/errors on DEBUG,
+// don't warn just ignore on wikilens pagelist columns, if not loaded.
+// RateIt pagelist column is called "rating", not "ratingwidget" (Dan?)
+//
 // Revision 1.25  2004/06/14 11:31:38  rurban
 // renamed global $Theme to $WikiTheme (gforge nameclash)

Index: WikiForm.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/WikiForm.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -2 -b -p -d -r1.12 -r1.13
--- WikiForm.php	18 Apr 2004 01:11:52 -0000	1.12
+++ WikiForm.php	21 Jun 2004 16:22:32 -0000	1.13
@@ -63,5 +63,5 @@ extends WikiPlugin
             $input['name'] = 'source';
             if (!$default)
-                $input['value'] = '/tmp/wikidump';
+                $input['value'] = DEFAULT_DUMP_DIR;
             if (!$buttontext)
                 $buttontext = _("Load File");
@@ -77,5 +77,5 @@ extends WikiPlugin
             $input['name'] = 'directory';
             if (!$default)
-                $input['value'] = '/tmp/wikidump';
+                $input['value'] = DUMP_DIR;
             if (!$buttontext)
                 $buttontext = _("Dump Pages");
@@ -85,5 +85,5 @@ extends WikiPlugin
             $input['name'] = 'directory';
             if (!$default)
-                $input['value'] = '/tmp/wikidumphtml';
+                $input['value'] = HTML_DUMP_DIR;
             if (!$buttontext)
                 $buttontext = _("Dump Pages as XHTML");
@@ -121,4 +121,14 @@ extends WikiPlugin
 
 // $Log$
+// Revision 1.13  2004/06/21 16:22:32  rurban
+// add DEFAULT_DUMP_DIR and HTML_DUMP_DIR constants, for easier cmdline dumps,
+// fixed dumping buttons locally (images/buttons/),
+// support pages arg for dumphtml,
+// optional directory arg for dumpserial + dumphtml,
+// fix a AllPages warning,
+// show dump warnings/errors on DEBUG,
+// don't warn just ignore on wikilens pagelist columns, if not loaded.
+// RateIt pagelist column is called "rating", not "ratingwidget" (Dan?)
+//
 // Revision 1.12  2004/04/18 01:11:52  rurban
 // more numeric pagename fixes.